Fixed save sequence. Show what aborted.

galaxy.cpp

@@ -384,6 +384,13 @@ void Galaxy::save(void) {
       std::chrono::system_clock::now();
   meta["save_time"] = std::chrono::system_clock::to_time_t(now);  // time_t
 
+  /*   // testing sequence code
+  meta["sequence"]["part"].push_back(1);
+  meta["sequence"]["part"].push_back(2);
+  meta["sequence"]["part"].push_back(3);
+  meta["sequence"]["smeg"].push_back(0);
+  */
+
   // meta:
   fout << "meta:" << std::endl;
   ++depth;
@@ -405,7 +412,17 @@ void Galaxy::save(void) {
         yaml_out(of, yaml_depth + 1, data.second);
       } else if (data.second.Type() == YAML::NodeType::Sequence) {
         // sequence
-        BUGZ_LOG(fatal) << "Ignoring Sequence... " << data.first;
+        BUGZ_LOG(fatal) << "Outputting Sequence... " << data.first;
+        of << yaml_spacer << data.first << ": [";
+        bool first = true;
+        for( auto const &seq : data.second) {
+          if (! first) 
+            of << ", ";
+          else
+            first = false;
+          of << seq;
+        }
+        of << "]" << std::endl;
       } else {
         BUGZ_LOG(fatal) << "Unsupported NodeType: " << data.second.Type();
       }
@@ -796,6 +813,12 @@ trade_type_result Galaxy::trade_type_info(sector_type port1, sector_type port2,
   int matches = 0;  // or pos.size();
   std::vector<int> pos;
 
+  // If we don't know how many holds the ship has, default to 300.
+  int max_holds = 300;
+  if (meta["ship"]["holds"]["total"]) {
+    max_holds = meta["ship"]["holds"]["total"].as<int>();
+  }
+
   // find which FOE are flipped.  Save index pos.
   for (int x = 0; x < 3; ++x) {
     inv2.foe[x] = (bsp1.foe[x] == inv2.foe[x]);
@@ -807,6 +830,10 @@ trade_type_result Galaxy::trade_type_info(sector_type port1, sector_type port2,
         BUGZ_LOG(fatal) << "Marking Port 1: " << x << " (burnt)";
         inv2.foe[x] = false;
       }
+      if (p1->second.amount[x] < max_holds) {
+        BUGZ_LOG(fatal) << "Marking Port 1: " << x << " (burnt/amount)";
+        inv2.foe[x] = false;
+      }
     } else {
       BUGZ_LOG(fatal) << "Port 1 : unknown / skip burnt checks";
     }
@@ -815,6 +842,10 @@ trade_type_result Galaxy::trade_type_info(sector_type port1, sector_type port2,
         BUGZ_LOG(fatal) << "Marking Port 2: " << x << " (burnt)";
         inv2.foe[x] = false;
       }
+      if (p2->second.amount[x] < max_holds) {
+        BUGZ_LOG(fatal) << "Marking Port 2: " << x << " (burnt/amount)";
+        inv2.foe[x] = false;
+      }
     } else {
       BUGZ_LOG(fatal) << "Port 2 : unknown / skip burnt checks";
     }

scripts.cpp

@@ -100,6 +100,7 @@ void ScriptTerror::input_notify(void) {
 void ScriptTerror::move_notify(void) {
   BUGZ_LOG(fatal) << "move_notify()";
   if (md->aborted) {
+    to_client("Move cancel.\n\r");
     deactivate();
     return;
   }
@@ -124,6 +125,7 @@ void ScriptTerror::move_notify(void) {
 void ScriptTerror::trade_notify(void) {
   // Done trading -- maybe! :P
   if (td->aborted) {
+    to_client("Trade cancel.\n\r");
     deactivate();
     return;
   }