C++17 for transform (utils). TradeScript progress.

CMakeLists.txt

@@ -25,8 +25,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 ##############
 # C++ Standard
 ##############
-set(CMAKE_CXX_STANDARD   14)
-# set(CMAKE_CXX_STANDARD   17)
+# set(CMAKE_CXX_STANDARD   14)
+# C++17 gives me transform
+set(CMAKE_CXX_STANDARD   17)
 set(CMAKE_CXX_EXTENSIONS ON)
 
 ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK)

director.cpp

@@ -267,12 +267,12 @@ void Director::build_menu(void) {
       "\x1b[32;40mGREEN\x1b[30;42m\xdb\xb2\xb1\xb0 \x1b[0m : ";
   md->lazy = true;
   md->menu = {{"C", "Configure"},
-              // {"D", "Display Report"},
+              {"D", "Display Report"},
               {"E", "Export Data/Save"},
               {"I", "Information"},
               {"P", "Port CIM"},
               {"W", "Warp CIM"},
-              {"T", "Trading Report"},
+              {"T", "Trading Report (same as D)"},
               {"S", "Scripts"},
               {"X", "eXit"}};
   md->setNotify([this]() { this->menu_choice(); });
@@ -339,6 +339,7 @@ void Director::menu_choice(void) {
           config_edit();
           return;
           break;
+        case 'D':
         case 'T':  // display trading report
         {
           auto pptv = galaxy.find_best_trades();
@@ -419,7 +420,7 @@ void Director::menu_choice(void) {
       /*
       std::string text = str(
           boost::format("Back from Menu [%1%] was selected.\n\r") %
-      md->input); 
+      md->input);
       to_client(text);
       */
 
@@ -463,7 +464,8 @@ void Director::scripts_done(void) {
         case 'T':  // Trade
           script = std::make_shared<ScriptTrader>(*this);
           ScriptTrader *ts = static_cast<ScriptTrader *>(&((*script)));
-          chain = script;
+          ts->setNotify( [this](){ this->proxy_deactivate(); } );
+
           // Set parameters
           auto found = galaxy.find_trades(current_sector, false);
           if (found.empty()) {
@@ -473,9 +475,16 @@ void Director::scripts_done(void) {
             proxy_deactivate();
             return;
           }
+          // sort first?
+          galaxy.sort_port_pair_type(found);
+
+          BUGZ_LOG(fatal) << "Found " << found.size() << " possible trade(s).";
+          BUGZ_LOG(fatal) << found[0].s1 << "," << found[0].s2 << " : "
+                          << found[0].type;
           ts->port[0] = found[0].s1;
           ts->port[1] = found[0].s2;
           ts->type = found[0].type;
+          chain = script;
           chain->activate();
           return;
           break;
@@ -799,7 +808,7 @@ void Director::SL_portline(const std::string &line) {
   SL: [C  Shield Points   :    116 credits per point                100]
   SL: []
    */
-  BUGZ_LOG(info) << "portline : " << line;
+  // BUGZ_LOG(info) << "portline : " << line;
   if (in(line, "%")) {
     // size_t pos = line.find('%');
     // if (pos != line.npos) {
@@ -807,10 +816,12 @@ void Director::SL_portline(const std::string &line) {
     std::string work = line;
     replace(work, "Fuel Ore", "Fuel");
     auto parts = split(work);
+    /*
     BUGZ_LOG(fatal) << "portline split:";
     for (auto const p : parts) {
       BUGZ_LOG(fatal) << p;
     }
+    */
     // BUGZ_LOG(fatal) << "portline split : [" << parts << "]";
   }
 }
@@ -837,6 +848,8 @@ void Director::SL_infoline(const std::string &line) {
     if (state == 2) {
       SL_parser = nullptr;
 
+      // clear out the existing ship data
+      galaxy.meta["ship"] = YAML::Node();
       // process the parsed information in meta["info"]
       if (galaxy.meta["info"]["Total Holds"]) {
         std::string work = galaxy.meta["info"]["Total Holds"].as<std::string>();
@@ -845,36 +858,59 @@ void Director::SL_infoline(const std::string &line) {
         int total_holds = stoi(parts[0]);
         BUGZ_LOG(fatal) << "total holds: " << total_holds;
         auto contents = split(parts[1]);
+
         for (auto const &hold : contents) {
           auto hold_amount = split(hold, "=");
           BUGZ_LOG(fatal) << hold_amount[0] << " with " << hold_amount[1];
+          std::string key = hold_amount[0];
+          str_tolower(key);
+          // equipment = e
+          // organics = o
+          // fuel = f
+          // colonists = c
+          // empty = empty
+          if (key != "empty" ) {
+            key = key[0];
+          }
+          galaxy.meta["ship"]["holds"][key] = stoi(hold_amount[1]);
         }
+        galaxy.meta["ship"]["holds"]["total"] = total_holds;       
       }
+
       if (galaxy.meta["info"]["Turns to Warp"]) {
         int warp_turns = galaxy.meta["info"]["Turns to Warp"].as<int>();
         BUGZ_LOG(fatal) << "Turns to Warp: " << warp_turns;
+        galaxy.meta["ship"]["warp_turns"] = warp_turns;
       }
-      if (galaxy.meta["info"]["Turns left"]) {
-        int turns = galaxy.meta["info"]["Turns left"].as<int>();
-        BUGZ_LOG(fatal) << "Turns left: " << turns;
-      }
+
       if (galaxy.meta["info"]["LongRange Scan"]) {
         std::string scanner_text =
             galaxy.meta["info"]["LongRange Scan"].as<std::string>();
         char scanner = scanner_text[0];
         BUGZ_LOG(fatal) << "Scanner: " << scanner;
+        galaxy.meta["ship"]["scanner"] = scanner;
+      }
+
+      // turns isn't ship specific
+      if (galaxy.meta["info"]["Turns left"]) {
+        int turns = galaxy.meta["info"]["Turns left"].as<int>();
+        BUGZ_LOG(fatal) << "Turns left: " << turns;
+        galaxy.meta["turns"] = turns;
       }
+
       if (galaxy.meta["info"]["Current Sector"]) {
         int sector = galaxy.meta["info"]["Current Sector"].as<int>();
         BUGZ_LOG(fatal) << "Sector: " << sector;
         // it should already be sector ...
         current_sector = sector;
       }
+
       if (galaxy.meta["info"]["Credits"]) {
         std::string credit_text =
             galaxy.meta["info"]["Credits"].as<std::string>();
         replace(credit_text, ",", "");
         int credits = stoi(credit_text);
+        galaxy.meta["credits"] = credits;
         BUGZ_LOG(fatal) << "Credits: " << credits;
       }
     }

galaxy.cpp

@@ -471,8 +471,11 @@ std::vector<port_pair_type> Galaxy::find_trades(sector_type sector,
     auto possible_port = ports.find(s);
     if (possible_port == ports.end()) continue;
 
+    if (possible_port->second.type == 0) continue;
+    
     // calculate trade type
     // int t = trade_type(port->second.type, possible_port->second.type);
+    BUGZ_LOG(trace) << "find_trades: Port " << sector << "," << port->second.type << " " << s << possible_port->second.type;
     trade_type_result ttr =
         trade_type_info(port->second.type, possible_port->second.type);
     if ((ttr.type == 0) || (ttr.type == 4)) continue;

scripts.cpp

@@ -10,25 +10,130 @@ ScriptTrader::~ScriptTrader() { BUGZ_LOG(fatal) << "~ScriptTrader()"; }
 
 void ScriptTrader::activate(void) {
   // ok, lookup port1 port2
+  BUGZ_LOG(fatal) << "ScriptTrader::activate " << port[0] << " & " << port[1];
   auto port_info = director.galaxy.ports.find(port[0]);
-
   int port0_type = port_info->second.type;
   port_info = director.galaxy.ports.find(port[1]);
   int port1_type = port_info->second.type;
+  BUGZ_LOG(fatal) << port0_type << " and " << port1_type;
   auto ttr = trade_type_info(port0_type, port1_type);
   trades = ttr.trades;
   // Ok, what do we do first here?
   // I - Info
+  state = 1;
   to_server("I");
 }
 
-void ScriptTrader::deactivate(void) {}
+void ScriptTrader::deactivate(void) { notify(); }
 
 void ScriptTrader::server_line(const std::string &line,
                                const std::string &raw_line) {
-  if (line == "<Info>") {
-  }
+  // FUTURE:  powering up weapons check
 }
 
-void ScriptTrader::server_prompt(const std::string &prompt){};
-void ScriptTrader::client_input(const std::string &cinput){};
+void ScriptTrader::server_prompt(const std::string &prompt) {
+  // FUTURE:  check for "Surrender/Attack"
+
+  if (at_command_prompt(prompt)) {
+    if (state == 1) {
+      // Ok, decision time!
+      if (director.galaxy.meta["ship"]["holds"]["c"]) {
+        // holds contain colonists
+        to_client("ScriptTrader FAIL: holds contain colonists.");
+        deactivate();
+        return;
+      }
+
+      // Which port to trade with first?  examine trades
+      BUGZ_LOG(fatal) << "trades: " << trades;
+      BUGZ_LOG(fatal) << "port0:" << text_from_buysell(port_buysell[0]);
+      BUGZ_LOG(fatal) << "port1:" << text_from_buysell(port_buysell[1]);
+
+      // Do we have what they are buying?
+      bool have_buy = false;
+      char foe[4] = "foe";
+      int active_buy = 0;
+      int active_sell = 0;
+
+      for (int x = 0; x < 3; ++x) {
+        if (trades.foe[x]) {
+          // this is what they will be trading...
+
+          if (director.galaxy.meta["ship"]["holds"][foe[x]]) {
+            // key exists ...
+            have_buy = true;
+            // which port is buying?
+            if (port_buysell[0].foe[x]) {
+              active_buy = 0;
+            } else {
+              active_buy = 1;
+            }
+          }
+
+          if (port_buysell[0].foe[x]) {
+            active_sell = 0;
+          } else {
+            active_sell = 1;
+          }
+        }
+      }
+
+      if (have_buy) {
+        BUGZ_LOG(fatal) << "have_buy: port " << active_buy;
+        active_port = port[active_buy];
+      } else {
+        // which port is selling?
+
+        // if they aren't buying what I have in my holds, should I check to see
+        // if my holds are full?  This could be the "not buying" what I'm
+        // setting bug!
+
+        BUGZ_LOG(fatal) << "!have_buy: port " << active_sell;
+        active_port = port[active_sell];
+      }
+
+      state = 2;
+      if (director.current_sector == active_port) {
+        // begin state 3
+        state = 3;
+        to_client("Trade...\n\r");
+        to_server("PT");
+        return;
+      } else {
+        // initiate move
+        std::string move = std::to_string(active_port);
+        to_client("Moving...\n\r");
+        move.append("\r");
+        to_server(move);
+        return;
+      }
+
+      // for now...
+      deactivate();
+    }
+    if (state == 3) {
+      if (director.current_sector == active_port) {
+        // We're here
+        state = 3;
+        to_server("PT");
+        return;
+      } else {
+        // we failed to move to where we wanted to go?!
+        BUGZ_LOG(fatal) << "Expecting: " << active_port << " but got "
+                        << director.current_sector;
+        deactivate();
+        return;
+      }
+    }
+  }
+
+  if (state == 3) {
+    if (in(prompt, " to sell ")) {
+      // always sell everything
+      to_server("\r");
+      return;
+    }
+
+  }
+}
+void ScriptTrader::client_input(const std::string &cinput) { deactivate(); };

scripts.h

@@ -11,6 +11,18 @@ public:
   ScriptTrader(Director &);
   ~ScriptTrader();  
 
+  /**
+   * internal state
+   * 
+   * 1 = <Info> query.
+   * 2 = move to active port
+   * 3 = trade
+   * 4 = if (burnt), stop, otherwise toggle active_port and state = 2
+   * 
+   * 
+   */
+  int state;
+  int active_port; // port trading with
   // information from the find_best_trades function + others.
   int port[2];
   int active;

utils.cpp

@@ -143,4 +143,15 @@ bool at_command_prompt(const std::string &prompt) {
   if (startswith(prompt, "Command ["))
     if (endswith(prompt, "] (?=Help)? : ")) return true;
   return false;
-}
+}
+
+#include <algorithm>
+#include <cctype>
+
+void str_toupper(std::string &str) {
+  std::transform(str.begin(), str.end(), str.begin(), ::toupper);
+}
+
+void str_tolower(std::string &str) {
+  std::transform(str.begin(), str.end(), str.begin(), ::tolower);
+}

utils.h

@@ -23,5 +23,7 @@ std::string repr(const std::string &source);
 
 bool file_exists(const std::string &name);
 bool at_command_prompt(const std::string &prompt);
+void str_toupper(std::string &text);
+void str_tolower(std::string &text);
 
 #endif