Merge branch 'master' into conan_build

director.cpp

@@ -34,6 +34,9 @@ Director::Director() {
   SF_warpline = [this](const std::string &s) { this->SL_warpline(s); };
   SF_infoline = [this](const std::string &s) { this->SL_infoline(s); };
   SF_densityline = [this](const std::string &s) { this->SL_densityline(s); };
+  SF_computer_portline = [this](const std::string &s) {
+    this->SL_computer_portline(s);
+  };
   build_menu();
 }
 
@@ -212,14 +215,18 @@ void Director::server_line(const std::string &line,
     if (startswith(line, " Items     Status  Trading % of max OnBoard"))
       SL_parser = SF_portline;
     */
-    if (in(line, "==>"))
-      SL_parser = SF_densityline;
-    if (startswith(line, "Sector  : "))
-      SL_parser = SF_sectorline;
-    if (line == ": ")
-      SL_parser = SF_cimline;
-    if (line == "<Info>")
-      SL_parser = SF_infoline;
+    if (endswith(line, "Relative Density Scan")) SL_parser = SF_densityline;
+    if (startswith(line, "Sector  : ")) SL_parser = SF_sectorline;
+    if (line == ": ") SL_parser = SF_cimline;
+    if (line == "<Info>") SL_parser = SF_infoline;
+    if (startswith(line, "What sector is the port in? [")) {
+      // Computer Port Report
+      // SL: [What sector is the port in? [611] 4]
+      size_t pos = line.rfind(' ');
+
+      computer_port_sector = stoi(line.substr(pos));
+      SL_parser = SF_computer_portline;
+    }
   }
 
   if (SL_parser) {
@@ -468,7 +475,10 @@ MenuDispatch *Director::init_scripts_menu(void) {
     md->menu_options_color = "\x1b[1;32;40m";
     md->lazy = false;
     md->menu_prompt = " SCRIPT : ";
-    md->menu = {{"!", "Terror"}, {"T", "Trade"}, {"U", "Upgrade Planet Pants"}};
+    md->menu = {{"!", "Terror"},
+                {"T", "Trade"},
+                {"S", "Safe Move"},
+                {"U", "Upgrade Planet Pants"}};
     md->setNotify([this]() { this->scripts_done(); });
     return md;
   }
@@ -499,32 +509,28 @@ void Director::scripts_done(void) {
               "No Trades found.  Port burnt (CONFIG: lower burnt_percent?) "
               "or no ports around.\n\r");
           proxy_deactivate();
+          return; }
+        } break;
+        case 'S': {
+          script = std::make_shared<MoveDispatch>(*this);
+          MoveDispatch *md = static_cast<MoveDispatch *>(&((*script)));
+          md->setNotify([this]() { this->proxy_deactivate(); });
+          md->move_to = 1;
+          chain = script;
+          chain->activate();
           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;
-      case '!': {
-        auto best = galaxy.find_closest(current_sector);
-        if (best.type != 0) {
-          std::string text =
-              str(boost::format("Best/Closest: %1% with %2% & %3%\n\r") %
-                  best.type % best.s1 % best.s2);
-          to_client(text);
-        } else {
-          to_client("I don't see any best trades.\n\r");
-        }
-      } break;
+        } break;
+        case '!': {
+          auto best = galaxy.find_closest(current_sector);
+          if (best.type != 0) {
+            std::string text =
+                str(boost::format("Best/Closest: %1% with %2% & %3%\n\r") %
+                    best.type % best.s1 % best.s2);
+            to_client(text);
+          } else {
+            to_client("I don't see any best trades.\n\r");
+          }
+        } break;
       }
     }
   }
@@ -819,6 +825,7 @@ void Director::SL_sectorline(const std::string &line) {
       sector_warps sw;
       auto warps = split(temp);
       sw.sector = current_sector;
+      // what if there is only one warp?
       for (auto const &w : warps) {
         sw.add(stoi(w));
       }
@@ -834,49 +841,57 @@ void Director::SL_densityline(const std::string &line) {
     SL_parser = nullptr;
     return;
   }
+
+  /*
   // Ensure this really is a density scan and not something else
-  if (!in(line, "Sector") || !in(line, "Warps") ||
-      !in(line, "NavHaz") || !in(line, "Anom")) {
+  if (!in(line, "Sector") || !in(line, "Warps") || !in(line, "NavHaz") ||
+      !in(line, "Anom")) {
     BUGZ_LOG(fatal) << "densityline: Invalid line.";
     SL_parser = nullptr;
     return;
   }
+  if (not galaxy.meta["density"]) {
+    galaxy.meta["density"] = YAML::Node();
+  }
+  */
+
   /*
    0         1   2                3  4     5 6    7      8     9     10   11 12
   "Sector    55  ==>              0  Warps : 4    NavHaz :     0%    Anom : No"
   "Sector ( 223) ==>              0  Warps : 3    NavHaz :     0%    Anom : No"
   */
-  std::string work = line;
-  replace(work, ":", "");
-  bool known = !in(work, "(");
-  replace(work, "(", "");
-  replace(work, ")", "");
-  replace(work, "%", "");
-  // Cleaned up
-  /*
-   0      1  2   3 4     5 6      7 8    9
-  "Sector 55 ==> 0 Warps 4 NavHaz 0 Anom No"
-  "Sector 223 ==> 0 Warps 3 NavHaz 0 Anom No"
-  */
-  std::vector<std::string> dense = split(work);
-  // Parse our data
-  int sector = std::stoi(dense.at(1));
-  int density = std::stoi(dense.at(3));
-  int warps = std::stoi(dense.at(5));
-  int navhaz = std::stoi(dense.at(7));
-  bool anom = in(dense.at(9), "Yes");
-  // Commit data
-  BUGZ_LOG(warning) << "densityline: {sector=" << sector
-                    << " density=" << density << " warps=" << warps
-                    << " navhaz=" << navhaz << " anom=" << anom
-                    << " known=" << known << "}";
-  galaxy.meta["density"][sector]["density"] = density;
-  galaxy.meta["density"][sector]["warps"] = warps;
-  galaxy.meta["density"][sector]["navhaz"] = navhaz;
-  galaxy.meta["density"][sector]["anom"] = anom;
-  galaxy.meta["density"][sector]["known"] = known;
-  // Add a check to see if density is greater than 500
-  // Add datetime stamp
+  if (in(line, "==>")) {
+    std::string work = line;
+    replace(work, ":", "");
+    bool known = !in(work, "(");
+    replace(work, "(", "");
+    replace(work, ")", "");
+    replace(work, "%", "");
+    auto dense = split(work);
+    // Parse our data
+    int sector = std::stoi(dense.at(1));
+    int density = std::stoi(dense.at(3));
+    int warps = std::stoi(dense.at(5));
+    int navhaz = std::stoi(dense.at(7));
+    bool anom = in(dense.at(9), "Yes");
+    // Commit data
+    BUGZ_LOG(warning) << "densityline: {sector=" << sector
+                      << " density=" << density << " warps=" << warps
+                      << " navhaz=" << navhaz << " anom=" << anom
+                      << " known=" << known << "}";
+    /*
+    if (galaxy.meta["density"][sector]) {
+      galaxy.meta["density"][sector] = YAML::Node();
+    }
+    */
+    galaxy.meta["density"][sector]["density"] = density;
+    galaxy.meta["density"][sector]["warps"] = warps;
+    galaxy.meta["density"][sector]["navhaz"] = navhaz;
+    galaxy.meta["density"][sector]["anom"] = anom;
+    galaxy.meta["density"][sector]["known"] = known;
+    // Add a check to see if density is greater than 500
+    // Add datetime stamp
+  }
 }
 
 void Director::SL_portline(const std::string &line) {
@@ -1056,4 +1071,62 @@ void Director::SL_infoline(const std::string &line) {
     galaxy.meta["info"][key] = value;
     BUGZ_LOG(fatal) << "Info: " << key << " : " << value;
   }
-}
+}
+
+void Director::SL_computer_portline(const std::string &line) {
+  if (startswith(line, "What sector is the port in?"))
+    computer_port_done = false;
+
+  if (line == "I have no information about a port in that sector.") {
+    computer_port_sector = 0;
+    SL_parser = nullptr;
+    return;
+  }
+
+  if (!computer_port_done) {
+    if (in(line, "Fuel Ore")) computer_port_done = true;
+    if (in(line, "Cargo holds")) {
+      // If I want to scan the class type 0 ports:
+      // computer_port_done = true;
+      // otherwise:
+      SL_parser = nullptr;
+      return;
+    }
+  }
+
+  if (computer_port_done) {
+    if (line.empty()) {
+      SL_parser = nullptr;
+      return;
+    }
+
+    // scan for items of interest
+    // SL: [Fuel Ore   Buying     810    100%       0]
+    // SL: [Organics   Buying     856     57%       0]
+    // SL: [Equipment  Selling    922     44%       0]
+    std::string work = line;
+    replace(work, "Fuel Ore", "Fuel");
+    replace(work, "%", "");
+    auto parts = split(work);
+
+    char c = tolower(parts[0][0]);
+    int pos;
+    char foe[4] = "foe";
+
+    for (pos = 0; pos < 3; ++pos) {
+      if (c == foe[pos]) break;
+    }
+
+    int amount = stoi(parts[2]);
+    int percent = stoi(parts[3]);
+
+    // update port
+    auto port = galaxy.ports.find(computer_port_sector);
+    if (port != galaxy.ports.end()) {
+      BUGZ_LOG(info) << "COM PORT " << computer_port_sector << " " << c << " "
+                     << amount << " " << percent;
+      port->second.amount[pos] = amount;
+      port->second.percent[pos] = percent;
+    }
+  }
+}

director.h

@@ -85,15 +85,20 @@ class Director {
   std::string config_item;  // current item being edited
 
   StringFunc SL_parser;
-  StringFunc SF_cimline, SF_sectorline, SF_portline, SF_warpline, SF_infoline, SF_densityline;
+  StringFunc SF_cimline, SF_sectorline, SF_portline, SF_warpline, SF_infoline,
+      SF_densityline, SF_computer_portline;
 
   void SL_cimline(const std::string &line);
   void SL_thiefline(const std::string &line);
   void SL_sectorline(const std::string &line);
   void SL_portline(const std::string &line);
+  void SL_computer_portline(const std::string &line);
   void SL_warpline(const std::string &line);
   void SL_infoline(const std::string &line);
   void SL_densityline(const std::string &line);
+
+  int computer_port_sector;
+  bool computer_port_done;
 };
 
 #include "dispatchers.h"

dispatchers.cpp

@@ -325,7 +325,7 @@ void MenuDispatch::help(void) {
     // just the menu
     mbox.textcolor = menu_options_color;
     to_client(mbox.top());
-    for (auto const menu_item : menu) {
+    for (auto const &menu_item : menu) {
       std::string text = " ";
       text.append(menu_item.first);
       text.append(" - ");
@@ -344,7 +344,7 @@ void MenuDispatch::help(void) {
     to_client(mbox.row(title));
     to_client(mbox.middle());
     mbox.textcolor = menu_options_color;
-    for (auto const menu_item : menu) {
+    for (auto const &menu_item : menu) {
       std::string text = " ";
       text.append(menu_item.first);
       text.append(" - ");
@@ -455,7 +455,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
       // enter
       if (instant) return;
 
-      for (auto const mnu : menu) {
+      for (auto const &mnu : menu) {
         if (mnu.first == input) {
           to_client("\x1b[0m\n\r");
           deactivate();
@@ -510,7 +510,7 @@ void MenuDispatch::client_input(const std::string &cinput) {
       }
 
       if (instant) {
-        for (auto const mnu : menu) {
+        for (auto const &mnu : menu) {
           if (mnu.first == input) {
             to_client("\x1b[0m\n\r");
             deactivate();
@@ -548,6 +548,163 @@ void CIMDispatch::server_line(const std::string &line,
   }
 }
 
+MoveDispatch::MoveDispatch(Director &d) : Dispatch(d) {
+  BUGZ_LOG(warning) << "MoveDispatch()";
+}
+
+// sector_type move_to;
+
+void MoveDispatch::activate(void) {
+  starting = director.current_sector;
+  BUGZ_LOG(warning) << "Moving from " << starting << " to " << move_to;
+  // Start with density scan
+  to_server("SD");
+  state = 1;
+  warp_lane.clear();
+  warp_pos = 0;
+
+  // build final string to match against
+  at_destination = "Auto Warping to sector ";
+  at_destination.append(std::to_string(move_to));
+}
+
+void MoveDispatch::deactivate(void) { notify(); }
+
+// optional here
+void MoveDispatch::server_line(const std::string &line,
+                               const std::string &raw_line) {
+  if (state == 1) {
+    if (endswith(line, "Relative Density Scan")) {
+      state = 2;
+    }
+  }
+
+  if ((state != 2) && (state != 5)) {
+    // hide the density scan part
+    std::string temp = raw_line;
+    temp.append("\n\r");
+    to_client(temp);
+  }
+
+  if (state == 3) {
+    if (line == "You are already in that sector!") {
+      success = true;
+      deactivate();
+      return;
+    }
+
+    if (line == "That Warp Lane is not adjacent.") {
+      // ok!  Parse out the path that we need to take...
+    }
+    // [611 > 612 > 577 > 543 > 162 > 947 > 185 > 720 > 894 > 3 > 1]
+    // multiple lines possible here?  Yes.
+    // [344 > 23328 > 2981 > 10465 > 14016 > 8979 > 1916 > 18734 > 5477 > 131 >
+    // 27464 >] watch for <Move> it contains >
+    if ((line != "<Move>") && in(line, ">")) {
+      bool more = false;
+      std::string work = line;
+
+      if (endswith(work, " >")) {
+        more = true;
+        work = work.substr(0, work.length() - 2);
+      }
+
+      replace(work, " > ", " ");
+      replace(work, "(", "");
+      replace(work, ")", "");
+      auto warps = split(work);
+      for (auto const &w : warps) {
+        BUGZ_LOG(fatal) << "lane: " << w;
+        warp_lane.push_back(stoi(w));
+      }
+
+      if (!more) state = 4;
+    }
+  }
+  if (state == 4) {
+    if (line == at_destination) {
+      // [Auto Warping to sector 1]
+      state = 6;
+    }
+  }
+}
+
+bool MoveDispatch::density_clear(int sector, int density) {
+  switch (density) {
+    case 0:
+    case 1:
+    case 100:
+    case 101:
+      return true;
+  }
+  // special case for sector 1:
+  if ((sector == 1) && (density == 601))
+    return true;
+  return false;
+}
+
+void MoveDispatch::server_prompt(const std::string &prompt) {
+  BUGZ_LOG(fatal) << "server_prompt: " << prompt;
+
+  if (state == 2) {
+    if (at_command_prompt(prompt)) {
+      // Ok, density is done
+      // BUG:  If the sector is adjacent, this doesn't check density!
+      std::string command = str(boost::format("M%1%\r") % move_to);
+      to_server(command);
+      state = 3;
+    }
+  } else if (state == 3) {
+    if (at_command_prompt(prompt)) {
+      // this happens when the sector is adject to current_sector.
+      BUGZ_LOG(fatal) << "Are we there yet?";
+      success = true;
+      deactivate();
+      return;
+    }
+  
+  } else if (state == 4) {
+    if (prompt == "Engage the Autopilot? (Y/N/Single step/Express) [Y] ") {
+      int to_check = warp_lane[warp_pos + 1];
+      // check density scan
+      int density =
+          director.galaxy.meta["density"][to_check]["density"].as<int>();
+      if (density_clear(to_check, density)) {
+        to_server("S");
+        ++warp_pos;
+      }
+    }
+    if (prompt == "Stop in this sector (Y,N,E,I,R,S,D,P,?) (?=Help) [N] ? ") {
+      state = 5;
+      to_server("SD");
+    }
+  } else if (state == 5) {
+    // finished scan
+    if (prompt == "Stop in this sector (Y,N,E,I,R,S,D,P,?) (?=Help) [N] ? ") {
+      int to_check = warp_lane[warp_pos + 1];
+      int density =
+          director.galaxy.meta["density"][to_check]["density"].as<int>();
+      if (density_clear(to_check, density)) {
+        to_server("N");
+        ++warp_pos;
+        state = 4;
+      } else {
+        to_server("Y");
+        BUGZ_LOG(fatal) << "Stopped by density: " << density;
+        success = 0;
+        deactivate();
+      }
+    }
+  } else if (state == 6) {
+    if (at_command_prompt(prompt)) {
+      // We're done!
+      success = 1;
+      deactivate();
+    }
+  }
+}
+void MoveDispatch::client_input(const std::string &input) {}
+
 /*
  * CoreDispatch:  This is an example class that does dispatch.
  * Copy this and make changes from there...

dispatchers.h

@@ -113,56 +113,41 @@ class MenuDispatch : public Dispatch {
   void client_input(const std::string &cinput) override;
 };
 
-#ifdef NOMORE
-// This was the original idea, but we've lost our "Main Dispatch" at this point
-// I might bring this back, as a way to test the Input and Menu parts.
-
-/**
- * The main/first proxy Dispatcher.
- *
- * Don't follow this as an example.  On disable,
- * it resets everything back to nothing active.
- * (Which is likely not what you want.)
- *
- */
-
-class MainDispatch : public Dispatch {
- private:
-  InputDispatch id;
-  MenuDispatch md;
-
+class CIMDispatch : public Dispatch {
  public:
-  MainDispatch(Director &);
-  ~MainDispatch();
-
+  CIMDispatch(Director &);
+  int count;
+  
   void activate(void) override;
   void deactivate(void) override;
 
-  void have_input(void);
-  void menu_choice(void);
-
+  // optional here
   void server_line(const std::string &line, const std::string &raw_line) override;
-  void server_prompt(const std::string &prompt) override;
-  // void client_input(const std::string &input);
-
- private:
-  int count;
-  std::string old_prompt;
 };
-#endif
 
-class CIMDispatch : public Dispatch {
+class MoveDispatch : public Dispatch {
  public:
-  CIMDispatch(Director &);
-  int count;
-  
+  MoveDispatch(Director &);
+  sector_type move_to;
+  sector_type starting;
+  int state;
+  int success;
+  int warp_pos;
+  std::string at_destination;
+  std::vector<int> warp_lane;
+
   void activate(void) override;
   void deactivate(void) override;
 
   // optional here
   void server_line(const std::string &line, const std::string &raw_line) override;
+  void server_prompt(const std::string &prompt) override;
+  void client_input(const std::string &input) override;
+ private:
+  bool density_clear(int sector, int density);  
 };
 
+
 class CoreDispatch : public Dispatch {
  public:
   CoreDispatch(Director &);

scripts.cpp

@@ -54,8 +54,8 @@ void ScriptTrader::activate(void) {
       // director.galaxy.config["trade_end_empty"] = "N";
     }
   } else {
-      trade_end_empty = false;
-      director.galaxy.config["trade_end_empty"] = "N";
+    trade_end_empty = false;
+    director.galaxy.config["trade_end_empty"] = "N";
   }
 }
 
@@ -325,9 +325,12 @@ void ScriptTrader::server_prompt(const std::string &prompt) {
           if (pos != director.galaxy.ports.end()) {
             // We'll find the port.  Really.
 
-            for (int x = 0; x < 3; ++x) {
-              if (trades.foe[x]) {
-                if (pos->second.percent[x] < stop_percent) burnt = true;
+            if (!pos->second.unknown()) {
+              // port isn't unknown, so check to see if it's burnt
+              for (int x = 0; x < 3; ++x) {
+                if (trades.foe[x]) {
+                  if (pos->second.percent[x] < stop_percent) burnt = true;
+                }
               }
             }
           }
@@ -394,11 +397,14 @@ void ScriptTrader::server_prompt(const std::string &prompt) {
       if (pos != director.galaxy.ports.end()) {
         // We'll find the port.  Really.
 
-        for (int x = 0; x < 3; ++x) {
-          if (trades.foe[x]) {
-            BUGZ_LOG(fatal) << x << " % " << (int)pos->second.percent[x] << " "
-                            << stop_percent;
-            if (pos->second.percent[x] < stop_percent) burnt = true;
+        if (!pos->second.unknown()) {
+          // port isn't unknown, check to see if burnt
+          for (int x = 0; x < 3; ++x) {
+            if (trades.foe[x]) {
+              BUGZ_LOG(fatal) << x << " % " << (int)pos->second.percent[x]
+                              << " " << stop_percent;
+              if (pos->second.percent[x] < stop_percent) burnt = true;
+            }
           }
         }
       }

test-director.cpp

@@ -25,7 +25,9 @@ TEST(director, director_debugging) {
   dir.to_client = [&client](const std::string line) { client.push_back(line); };
   dir.to_server = [&server](const std::string line) { server.push_back(line); };
 
+  // activating the game gets this over to dir.galaxy.username.
   dir.username = "test";
+
   // should I setup galaxy-N-test.yaml ?  Probably yes.
   std::string lines[] = {
       "TradeWars Game Server                                     Copyright (C) "
@@ -58,18 +60,14 @@ TEST(director, director_debugging) {
 
 TEST(director, director_galaxy_save) {
   Director dir;
-  /*
-  std::vector<std::string> client;
-  std::vector<std::string> server;
-  dir.to_client = [&client](const std::string line) { client.push_back(line); };
-  dir.to_server = [&server](const std::string line) { server.push_back(line); };
-  */
-  dir.username = "test";
-  dir.game = 'Z';
+
+  dir.galaxy.username = "test";
+  dir.galaxy.game = 'Z';
+  // This causes a YAML::Node Sequence 
   dir.galaxy.meta["trade"][10963][0] = 1;
   dir.galaxy.save();
-  EXPECT_TRUE(1) << "No execption, this is good!";
-  GTEST_COUT << "We're still alive, good!" << std::endl;
+
+  EXPECT_TRUE(1) << "No exception, this is good!";
 }
 
 TEST(director, director_parsing_density) {
@@ -158,16 +156,16 @@ TEST(director, director_parsing_density) {
   for (auto sector : sectors) {
     // GTEST_COUT << "Testing Sector " << sector << std::endl;
     EXPECT_EQ(dir.galaxy.meta["density"][sector]["density"].as<int>(),
-              sector_data[sector]["density"].as<int>());
+              sector_data[sector]["density"].as<int>()) << "Sector " << sector << " density";
     EXPECT_EQ(dir.galaxy.meta["density"][sector]["warps"].as<int>(),
-              sector_data[sector]["warps"].as<int>());
+              sector_data[sector]["warps"].as<int>()) << "Sector " << sector << " warps";
     EXPECT_EQ(dir.galaxy.meta["density"][sector]["navhaz"].as<int>(),
-              sector_data[sector]["navhaz"].as<int>());
+              sector_data[sector]["navhaz"].as<int>()) << "Sector " << sector << " navhaz";
     EXPECT_EQ(dir.galaxy.meta["density"][sector]["anom"].as<bool>(),
-              sector_data[sector]["anom"].as<bool>());
+              sector_data[sector]["anom"].as<bool>()) << "Sector " << sector << " anom";
     EXPECT_EQ(dir.galaxy.meta["density"][sector]["known"].as<bool>(),
-              sector_data[sector]["known"].as<bool>());
+              sector_data[sector]["known"].as<bool>()) << "Sector " << sector << " known";
   }
 }
 
-} // namespace
+} // namespace