Fixed bug where Move would fail if moving to current.

This caused the Trader to hang up.  I need to look into
Trader to see if I can stop it from calling Move when
already there.

dispatchers.cpp

@@ -413,6 +413,7 @@ void CIMDispatch::server_line(const std::string &line,
 
 MoveDispatch::MoveDispatch(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "MoveDispatch()";
+  use_express = false;
 }
 
 MoveDispatch::~MoveDispatch() { BUGZ_LOG(warning) << "~MoveDispatch()"; }
@@ -423,12 +424,25 @@ void MoveDispatch::activate(void) {
   starting = director.current_sector;
   BUGZ_LOG(fatal) << "MoveDispatch::activate()";
   BUGZ_LOG(warning) << "Moving from " << starting << " to " << move_to;
-  // Start with density scan
-  to_server("SD");
-  state = 1;
+
+  if (starting == move_to) {
+    success = true;
+    deactivate();
+    return;
+  }
+
+  // Start with density scan -- unless express
   warp_lane.clear();
   warp_pos = 0;
-  use_express = false;
+
+  if (use_express) {
+    std::string command = str(boost::format("M%1%\r") % move_to);
+    to_server(command);
+    state = 3;
+  } else {
+    to_server("SD");
+    state = 1;
+  }
 
   // build final string to match against
   at_destination = "Auto Warping to sector ";
@@ -530,41 +544,41 @@ void MoveDispatch::server_line(const std::string &line,
 
 /*
 bool MoveDispatch::density_clear(density d) {  // int sector, int density) {
-  */ 
- /*
-  http://wiki.classictw.com/index.php?title=Gypsy%27s_Big_Dummy%27s_Guide_to_TradeWars_Text#Trader_Information
-  Density Readings:
-    0 = Empty Sector or Ferrengi Dreadanought
-    1 = Marker Beacon
-    2 = Limpet Type 2 Tracking Mine
-    5 = Fighter (per Fighter)
-   10 = Armid Type 1 Mine
-   21 = Navigation Hazard (Per 1 Percent)
-   21 = Destroyed Ship     (Due to 1 Percent Nav-Haz)
-   38 = Unmanned Ship
-   40 = Manned Ship, Alien or Ferrengi Assault Trader
-   50 = Destroyed Starport (After 25 Percent Nav-Haz Clears)
-  100 = Starport or Ferrengi Battle Cruiser
-  210 = Destroyed Planet   (Due to 10 Percent Nav-Haz)
-  462 = Federation Starship under Admiral Nelson
-  489 = Federation Starship under Captain Zyrain
-  500 = Planet
-  512 = Federation Starship under Admiral Clausewitz
-  575 = Destroyed Port (Before 25% Nav-Haz Clears)
-  */ 
- /*
-  if (d.sector == 0) return false;
-
-  switch (d.density) {
-    case 0:
-    case 1:
-    case 100:
-    case 101:
-      return true;
-  }
-  // special case for sector 1:
-  if ((d.sector == 1) && (d.density == 601)) return true;
-  return false;
+  */
+/*
+ http://wiki.classictw.com/index.php?title=Gypsy%27s_Big_Dummy%27s_Guide_to_TradeWars_Text#Trader_Information
+ Density Readings:
+   0 = Empty Sector or Ferrengi Dreadanought
+   1 = Marker Beacon
+   2 = Limpet Type 2 Tracking Mine
+   5 = Fighter (per Fighter)
+  10 = Armid Type 1 Mine
+  21 = Navigation Hazard (Per 1 Percent)
+  21 = Destroyed Ship     (Due to 1 Percent Nav-Haz)
+  38 = Unmanned Ship
+  40 = Manned Ship, Alien or Ferrengi Assault Trader
+  50 = Destroyed Starport (After 25 Percent Nav-Haz Clears)
+ 100 = Starport or Ferrengi Battle Cruiser
+ 210 = Destroyed Planet   (Due to 10 Percent Nav-Haz)
+ 462 = Federation Starship under Admiral Nelson
+ 489 = Federation Starship under Captain Zyrain
+ 500 = Planet
+ 512 = Federation Starship under Admiral Clausewitz
+ 575 = Destroyed Port (Before 25% Nav-Haz Clears)
+ */
+/*
+ if (d.sector == 0) return false;
+
+ switch (d.density) {
+   case 0:
+   case 1:
+   case 100:
+   case 101:
+     return true;
+ }
+ // special case for sector 1:
+ if ((d.sector == 1) && (d.density == 601)) return true;
+ return false;
 } */
 
 void MoveDispatch::server_prompt(const std::string &prompt) {
@@ -582,8 +596,8 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
         // Yes! we found the sector in the scan!
         if (!density_clear(d.sector, d.density, d.navhaz)) {
           BUGZ_LOG(fatal) << "Failed density check on single move.";
-          why_failed = str(boost::format("Sector %1% has density %2%.") % move_to %
-                           d.density);  
+          why_failed = str(boost::format("Sector %1% has density %2%.") %
+                           move_to % d.density);
           success = false;
           deactivate();
           return;
@@ -615,14 +629,15 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
         int density =
             director.galaxy.meta["density"][to_check]["density"].as<int>();
         */
-        if (density_clear(d.sector, d.density, d.navhaz)) {  // to_check, density)) {
+        if (density_clear(d.sector, d.density,
+                          d.navhaz)) {  // to_check, density)) {
           to_server("S");
           ++warp_pos;
         } else {
           to_server("N");
           BUGZ_LOG(fatal) << "density_clear(" << to_check << ") : false";
-          why_failed = str(boost::format("Sector %1% has density %2%.") % to_check %
-                           d.density);
+          why_failed = str(boost::format("Sector %1% has density %2%.") %
+                           to_check % d.density);
           success = false;
           deactivate();
         }
@@ -644,8 +659,8 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
       } else {
         to_server("Y");
         BUGZ_LOG(fatal) << "Stopped by density: " << to_check;
-        why_failed =
-            str(boost::format("Sector %1% has density %2%.") % to_check % d.density);
+        why_failed = str(boost::format("Sector %1% has density %2%.") %
+                         to_check % d.density);
         success = 0;
         deactivate();
       }
@@ -932,9 +947,13 @@ void TraderDispatch::server_prompt(const std::string &prompt) {
 
       int credits = json_int(director.galaxy.meta["credits"]);
 
-      if (credits < (total * 75) ) {
-        BUGZ_LOG(fatal) << "FAIL: credits < " << total * 75 << " have " << credits;
-        std::string message = str(boost::format( "ScriptTrader FAIl: You need at least %1% credits to trade.\n\r") % (total * 75));
+      if (credits < (total * 75)) {
+        BUGZ_LOG(fatal) << "FAIL: credits < " << total * 75 << " have "
+                        << credits;
+        std::string message =
+            str(boost::format("ScriptTrader FAIl: You need at least %1% "
+                              "credits to trade.\n\r") %
+                (total * 75));
         to_client(message);
         why_failed = "Low credits.";
         success = false;

scripts.cpp

@@ -591,6 +591,7 @@ void ScriptPlanet::init() {
   move = std::make_shared<MoveDispatch>(director);
   md = static_cast<MoveDispatch *>(&(*move));
   md->setNotify([this]() { this->move_notify(); });
+  md->use_express = true;
   trader = std::make_shared<TraderDispatch>(director);
   td = static_cast<TraderDispatch *>(&(*trader));
   td->setNotify([this]() { this->trade_notify(); });
@@ -731,6 +732,7 @@ void ScriptPlanet::input_notify() {
 
 void ScriptPlanet::move_notify() {
   director.chain = us;
+
   if (md->success) {
     // Ok, we're here
     if (state == 4) {
@@ -779,6 +781,8 @@ void ScriptPlanet::move_notify() {
 }
 
 void ScriptPlanet::trade_notify() {
+  director.chain = us;
+  
   if (td->success) {
     if (state == 13) {
       // Ok, we have what we came from, return to the planet.
@@ -899,6 +903,7 @@ void ScriptPlanet::server_prompt(const std::string &prompt) {
         if (current_product == -1) {
           // I think we have everything.
           BUGZ_LOG(fatal) << "I think we've got it...";
+          to_server("CUY");
           deactivate();
           return;
         } else {
@@ -991,6 +996,7 @@ void ScriptPlanet::server_prompt(const std::string &prompt) {
       if (current_product == -1) {
         // I think we have everything.
         BUGZ_LOG(fatal) << "I think we've got it...";
+        to_server("CUY");
         deactivate();
         return;
       } else {
@@ -1046,13 +1052,18 @@ SL: [ -------  ---------  ---------  ---------  ---------  ---------
         population[pos] = sstoi(parts[1]);
         to_make_one[pos] = sstoi(parts[2]);
         total_population += population[pos];
-        amount[pos] = sstoi(parts[3]);
+        amount[pos] = sstoi(parts[4]);
         // What do we have on-board the ship?
         ship[pos] = sstoi(parts[5]);
+        BUGZ_LOG(fatal) << pos << " : pop " << population[pos] << " 2M1 "
+                        << to_make_one[pos] << " amount " << amount[pos]
+                        << " ship: " << ship[pos];
       }
     }
   } else if (state == 6) {
-    if (startswith(line, "You may not upgrade while")) {
+    // [Be patient, your Citadel is not yet finished.]
+    if ((line == "Be patient, your Citadel is not yet finished.") ||
+        (startswith(line, "You may not upgrade while"))) {
       // We're already upgrading!
       std::string work = raw_line;
       work += "\n\r";
@@ -1077,9 +1088,9 @@ SL: [ -------  ---------  ---------  ---------  ---------  ---------
     SL: [                   150 units of Equipment and]
     SL: [                     2 days to construct.]
     */
-    if (line ==
-        "Citadel construction on this type of planet requires the "
-        "following:") {
+    if ((line == "Citadel construction on this type of planet requires the "
+                 "following:") ||
+        (endswith(line, " construction on this type of planet requires"))) {
       state = 7;
     }
   } else if (state == 7) {

session.cpp

@@ -412,6 +412,7 @@ void Session::server_read(void) {
         } else {
           if (!server_prompt.empty()) {
             BUGZ_LOG(info) << "2C: [" << server_prompt << "]";
+            to_client(server_prompt);
             server_prompt.clear();
           }
           BUGZ_LOG(warning) << "S: read_failed: socket.shutdown()";