Display colonists/cargo messages when upgrading.

scripts.cpp

@@ -347,7 +347,8 @@ void ScriptExplore::init() {
     director.galaxy.config["prefer_ports"] = "Y";
     prefer_ports = true;
   } else {
-    prefer_ports = startswith(json_str(director.galaxy.config["prefer_ports"]), "Y");
+    prefer_ports =
+        startswith(json_str(director.galaxy.config["prefer_ports"]), "Y");
   }
   if (!director.galaxy.meta["help"].contains("prefer_ports")) {
     director.galaxy.meta["help"]["prefer_ports"] =
@@ -357,11 +358,13 @@ void ScriptExplore::init() {
     director.galaxy.config["use_nearest_unknown"] = "Y";
     use_nearest_unknown = true;
   } else {
-    use_nearest_unknown = startswith(json_str(director.galaxy.config["use_nearest_unknown"]), "Y");
+    use_nearest_unknown = startswith(
+        json_str(director.galaxy.config["use_nearest_unknown"]), "Y");
   }
   if (!director.galaxy.meta["help"].contains("use_nearest_unknown")) {
     director.galaxy.meta["help"]["use_nearest_unknown"] =
-        "Explorer will find nearest unknown when out of known sectors to explore";
+        "Explorer will find nearest unknown when out of known sectors to "
+        "explore";
   }
   BUGZ_LOG(warning) << "Prefer Ports: " + prefer_ports;
 }
@@ -444,17 +447,17 @@ void ScriptExplore::input_notify() {
 
 bool has_port(const density d) {
   int den = d.density;
-  if(d.navhaz <= 5) {
+  if (d.navhaz <= 5) {
     den -= 21 * d.navhaz;
   }
   return den == 100 || den == 101;
 }
 
 bool sort_ports(const density a, const density b) {
-  if(has_port(a) && has_port(b)) {
-      return a.warps > b.warps;
+  if (has_port(a) && has_port(b)) {
+    return a.warps > b.warps;
   } else {
-    if((has_port(a) && !has_port(b)) || (!has_port(a) && has_port(b))) {
+    if ((has_port(a) && !has_port(b)) || (!has_port(a) && has_port(b))) {
       return has_port(a);
     }
     return a.warps > b.warps;
@@ -462,7 +465,7 @@ bool sort_ports(const density a, const density b) {
 }
 
 bool sort_warps(const density a, const density b) {
-  if((has_port(a) && !has_port(b)) || (!has_port(a) && has_port(b))) {
+  if ((has_port(a) && !has_port(b)) || (!has_port(a) && has_port(b))) {
     return has_port(a) && a.warps > b.warps;
   }
   return a.warps > b.warps;
@@ -481,8 +484,10 @@ void ScriptExplore::next() {
   density best_sector;
   best_sector.sector = 0;
   std::array<density, 6> sectors = ds.d;
-  for(int x = 0; x < 6; ++x) {
-    if(sectors[x].known || !density_clear(sectors[x].sector, sectors[x].density, sectors[x].navhaz)) {
+  for (int x = 0; x < 6; ++x) {
+    if (sectors[x].known ||
+        !density_clear(sectors[x].sector, sectors[x].density,
+                       sectors[x].navhaz)) {
       sectors[x].sector = 0;
       sectors[x].density = 0;
       sectors[x].warps = 0;
@@ -491,25 +496,23 @@ void ScriptExplore::next() {
       sectors[x].anomaly = false;
     }
   }
-  if(prefer_ports) {
+  if (prefer_ports) {
     std::sort(sectors.begin(), sectors.end(), sort_ports);
   } else {
     std::sort(sectors.begin(), sectors.end(), sort_warps);
   }
-  for(int x = 0; x < 6; ++x) {
-    BUGZ_LOG(trace) << "["
-                   << sectors[x].sector << ", "
-                   << sectors[x].density << ", "
-                   << sectors[x].warps << ", "
-                   << sectors[x].anomaly << ", "
-                   << sectors[x].known << "]";
+  for (int x = 0; x < 6; ++x) {
+    BUGZ_LOG(trace) << "[" << sectors[x].sector << ", " << sectors[x].density
+                    << ", " << sectors[x].warps << ", " << sectors[x].anomaly
+                    << ", " << sectors[x].known << "]";
   }
   BUGZ_LOG(warning) << "Best Sector: " << sectors[0].sector;
   best_sector = sectors[0];
-  for(int x = 1; x < 6; ++x) {
-    if(sectors[x].sector != 0 && sectors[x].sector != best_sector.sector) {
+  for (int x = 1; x < 6; ++x) {
+    if (sectors[x].sector != 0 && sectors[x].sector != best_sector.sector) {
       unknown_warps.push(sectors[x].sector);
-      BUGZ_LOG(info) << "Added " << sectors[x].sector << " to unknown_warps (" << unknown_warps.size() << ")";
+      BUGZ_LOG(info) << "Added " << sectors[x].sector << " to unknown_warps ("
+                     << unknown_warps.size() << ")";
     }
   }
   if (target != 0) {
@@ -530,8 +533,9 @@ void ScriptExplore::next() {
         std::string message = "Finding nearest unexplored";
         ANSIColor alert(COLOR::WHITE, COLOR::RED, ATTR::BOLD);
         to_client("     " + alert() + message + reset() + "\n\r");
-        best_sector.sector = director.galaxy.find_nearest_unexplored(director.current_sector);
-        if(best_sector.sector == 0) {
+        best_sector.sector =
+            director.galaxy.find_nearest_unexplored(director.current_sector);
+        if (best_sector.sector == 0) {
           to_client("No unknown warps in the galaxy!");
           deactivate();
           return;
@@ -1005,12 +1009,10 @@ void ScriptPlanet::server_prompt(const std::string &prompt) {
         return;
       }
 
-
       // ending here for now. (not in citadel)
       // to_server("Q");
       // deactivate();
       // return;
-      
     }
   } else if (state == 14) {
     if (prompt == "Land on which planet <Q to abort> ? ") {
@@ -1177,25 +1179,62 @@ SL: [ -------  ---------  ---------  ---------  ---------  ---------
         return;
       }
     }
+  } else if (state == 9) {
+    bool output = false;
+
+    if (startswith(line, "How many groups of Colonist")) output = true;
+    if (startswith(line, "The Colonists file aboard your ship")) output = true;
+
+    if (output) {
+      // output to client
+      std::string work = raw_line;
+      work += "\n\r";
+      to_client(work);
+    }
   } else if (state == 11) {
     // SL: [How many groups of Colonists do you want to leave ([125] on board)
     // ? ]
+    bool output = false;
+
     if (startswith(line, "How many groups of Colonists do you want to leave")) {
       std::string work = line.substr(line.find('[') + 1);
       int amount = sstoi(work);
       total_population += amount;
+      output = true;
       BUGZ_LOG(fatal) << "Population now: " << total_population;
     }
+
+    if (startswith(line, "The Colonists disembark")) output = true;
+
+    if (output) {
+      // output to client
+      std::string work = raw_line;
+      work += "\n\r";
+      to_client(work);
+    }
   } else if (state == 15) {
+    bool output = false;
+
     // SL: [How many holds of Organics do you want to leave ([250] on board) ? ]
     if (startswith(line, "How many holds of ") &&
         endswith(line, "] on board) ? ")) {
       std::string work = line.substr(line.find('[') + 1);
       int amount_moved = sstoi(work);
       amount[current_product] += amount_moved;
+      output = true;
+
       BUGZ_LOG(fatal) << "Planet " << current_product << " +" << amount_moved
                       << " = " << amount[current_product];
     }
+
+    if (startswith(line, "You unload the ")) output = true;
+
+    if (output) {
+      // output to client
+      std::string work = raw_line;
+      work += "\n\r";
+      to_client(work);
+    }
   }
 }