Merge branch 'master' into conan_build

director.cpp

@@ -38,6 +38,7 @@ Director::Director() {
   SF_computer_portline = [this](const std::string &s) {
     this->SL_computer_portline(s);
   };
+  SF_planetline = [this](const std::string &s) { this->SL_planetline(s); };
   build_menu();
 }
 
@@ -91,7 +92,7 @@ void Director::client_input(const std::string &input) {
 
     if (at_planet_prompt(prompt)) {
       // future:  If activated at planet menu, activate the planet upgrade
-      // script!
+      // script!  (Maybe).  If I can figure out what planet it is/and where.
       to_client("\n\r\x1b[0mFUTURE:  Activate the planet upgrade script.\n\r");
       to_client(current_raw_prompt);
       return;
@@ -111,6 +112,7 @@ void Director::server_line(const std::string &line,
   // check for if we entered game/left game
 
   if (line.find("TradeWars Game Server   ") != std::string::npos) {
+    // Inject our proxy activation message
     to_client("\rTradeWars Proxy v2++ READY (~ or ESC to activate)\n\r");
     /*
     There's a delay here when I save the game data.
@@ -200,6 +202,16 @@ void Director::server_line(const std::string &line,
     if (line == "<Port>") {
       SL_parser = SF_portline;
     }
+
+    if (line ==
+            "                           Corporate Planet Scan                  "
+            "            " ||
+        line ==
+            "                           Personal Planet Scan                   "
+            "           ") {
+      SL_parser = SF_planetline;
+    }
+
     /*
     if (startswith(line, " Items     Status  Trading % of max OnBoard"))
       SL_parser = SF_portline;
@@ -379,10 +391,10 @@ void Director::menu_choice(void) {
           int line = 0;
           std::string display_line;
 
-          ANSIColor by{1, 33};
-          ANSIColor cyan{36};
-          ANSIColor bg{1, 32};
-          ANSIColor bb{1, 34};
+          ANSIColor by{1, 33};  // yellow
+          ANSIColor cyan{36};   // cyan
+          ANSIColor bg{1, 32};  // bright green
+          ANSIColor bb{1, 34};  // bright blue
 
           for (auto const &ppt : pptv) {
             output =
@@ -499,6 +511,8 @@ MenuDispatch *Director::init_scripts_menu(void) {
                 {"T", "Trade"},
                 {"S", "Safe Move"},
                 {"C", "Closest Trade"},
+                {"N", "Nearest Unexplored"},
+                {"V", "Voyager Explorer"},
                 {"U", "Upgrade Planet Pants"},
                 {"X", "Exit Scripts"}};
     md->setNotify([this]() { this->scripts_done(); });
@@ -581,6 +595,26 @@ void Director::scripts_done(void) {
             to_client("I don't see any best trades.\n\r");
           }
         } break;
+        case 'N': {
+          sector_type s = galaxy.find_nearest_unexplored(current_sector);
+          if (s != 0) {
+            std::string text = str(boost::format("Sector: %1%\n\r") % s);
+            to_client(text);
+          } else {
+            to_client("I don't see any unexplored.\n\r");
+          }
+        } break;
+        case 'V': {
+          script = std::make_shared<ScriptVoyager>(*this);
+          ScriptVoyager *sv = static_cast<ScriptVoyager *>(&(*script));
+          sv->setNotify([this]() {
+            script.reset();
+            this->proxy_deactivate();
+          });
+          chain = script;
+          chain->activate();
+          return;
+        } break;
         case 'Q':
           chain = main_menu;
           main_menu->activate();
@@ -1212,3 +1246,53 @@ void Director::SL_computer_portline(const std::string &line) {
     }
   }
 }
+
+void Director::SL_planetline(const std::string &line) {
+  if (line == "Corporate command [TL=00:00:00]:[344] (?=Help)? Q" ||
+      line == "Computer command [TL=00:00:00]:[344] (?=Help)? Q") {
+    SL_parser = nullptr;
+    return;
+  }
+
+  if (in(line, "Class ") && (in(line, "Level ") || (endswith(line, "No Citadel")))) {
+    int level;
+    char c;
+    sector_type sector;
+    int number;
+    std::string name;
+    std::string work = line;
+    size_t pos = work.find('#');
+    std::string temp = work.substr(0, pos);
+    trim(temp);
+    sector = sstoi(temp);
+    work = work.substr(pos + 1);
+    number = sstoi(work);
+    pos = work.find(' ');
+    work = work.substr(pos + 1);
+    trim(work);
+    if (endswith(work, "No Citadel")) {
+      level = 0;
+    } else {
+      pos = work.rfind("Level ");
+      temp = work.substr(pos + 6);
+      level = sstoi(temp);
+    }
+    pos = work.rfind("Class ");
+    temp = work.substr(pos + 6);
+    c = temp[0];
+    work = work.substr(0, pos);
+    trim(work);
+    name = work;
+    BUGZ_LOG(warning) << (int)sector << " # " << number << " Class " << c
+                      << " Level " << level << " name: [" << name << "]";
+  }
+
+  /*
+  SL: [   344   #4    Enjoy the Silence        Class M, Earth Type Level 3] SL:
+  [   ---   (4M)            1T   64   25   14T   693   277         2T 10M] SL: [
+  344   #5    High There!              Class L, Mountainous          Level 2]
+  SL: [   ---   (5M)            2T    0    6   25T   100   112         2T 6M]
+  ...
+  SL: [   ---   (9M)            3T   64   31   39T   793   389         4T ---]
+  */
+}

director.h

@@ -86,7 +86,7 @@ class Director {
 
   StringFunc SL_parser;
   StringFunc SF_cimline, SF_sectorline, SF_portline, SF_warpline, SF_infoline,
-      SF_densityline, SF_computer_portline;
+      SF_densityline, SF_computer_portline, SF_planetline;
 
   void SL_cimline(const std::string &line);
   void SL_thiefline(const std::string &line);
@@ -96,6 +96,7 @@ class Director {
   void SL_warpline(const std::string &line);
   void SL_infoline(const std::string &line);
   void SL_densityline(const std::string &line);
+  void SL_planetline(const std::string &line);
 
   int computer_port_sector;
   bool computer_port_done;

dispatchers.cpp

@@ -712,8 +712,14 @@ void TraderDispatch::server_line(const std::string &line,
   // Show what's going on...
   if (state > 1) {
     std::string temp = raw_line;
-    temp.append("\n\r");
-    to_client(temp);
+    // replace progress bar with something else
+    if (startswith(temp, "\x1b[1;33m\xb3"))
+      temp = "\x1b[1A\x1b[1;33m** SLOW MOVE **";
+    // don't output lines that move cursor up 3.
+    // if (!in(temp, "\x1b[3A")) {
+      temp.append("\n\r");
+      to_client(temp);
+    // }
   }
 
   if (line == "Docking...") {

galaxy.cpp

@@ -776,6 +776,50 @@ port_pair_type Galaxy::find_closest_trade(int sector, int lowest_trade_type,
   return ppt;
 }
 
+sector_type Galaxy::find_nearest_unexplored(sector_type sector) {
+  // search the galaxy for unexplored
+  std::set<sector_type> seen;
+  std::set<sector_type> current;
+  current.insert(sector);
+  bool found = false;
+  bool added_new = false;
+  int depth = 0;
+
+  while (!found) {
+    ++depth;
+    BUGZ_LOG(info) << "depth: " << depth << " current:" << current.size()
+                   << " seen: " << seen.size();
+
+    // search for warps
+    for (auto const &c : current) {
+      auto port_warps = warps.find(c);
+      if (port_warps == warps.end()) return c;
+    }
+
+    // update the seen
+    seen.insert(current.begin(), current.end());
+    auto look_in = current;
+    current.clear();
+    for (auto const &li : look_in) {
+      auto wi = warps.find(li);
+      if (wi == warps.end()) return li;
+      for (auto const &w : wi->second.warps) {
+        // have we already seen this sector?
+        if (seen.find(w) != seen.end()) continue;
+
+        current.insert(w);
+        added_new = true;
+      }
+    }
+
+    if (!added_new) {
+      BUGZ_LOG(warning) << "No new sectors added.  We're done!";
+      found = false;
+    }
+  }
+  return 0;
+}
+
 trade_type_result Galaxy::trade_type_info(sector_type port1, sector_type port2,
                                           int burnt_percent) {
   BUGZ_LOG(fatal) << "Trade_type_info(" << port1 << "," << port2 << ")";

galaxy.h

@@ -139,6 +139,8 @@ class Galaxy {
   void save(void);
   void load(void);
 
+  sector_type find_nearest_unexplored(sector_type sector);
+
   std::vector<port_pair_type> find_best_trades(void);
   std::vector<port_pair_type> find_trades(sector_type sector,
                                           bool highest = true);

scripts.cpp

@@ -216,4 +216,98 @@ void ScriptTerror::trade_notify(void) {
   }
   to_client("Ok, trade is done.\n\r");
   deactivate();
+}
+
+ScriptVoyager::ScriptVoyager(Director &d) : Dispatch(d) {
+  BUGZ_LOG(warning) << "SCriptVoyager()";
+  init();
+}
+
+ScriptVoyager::~ScriptVoyager() {
+  BUGZ_LOG(warning) << "~ScriptVoyager()";
+}
+
+void ScriptVoyager::init(void) {
+  move = std::make_shared<MoveDispatch>(director);
+  md = static_cast<MoveDispatch *>(&(*move));
+  md->setNotify([this]() { this->move_notify(); });
+
+  input = std::make_shared<InputDispatch>(director);
+  id = static_cast<InputDispatch *>(&(*input));
+  id->prompt = "Number of loops/tries: ";
+  id->max_length = 5;
+  id->numeric = true;
+  id->setNotify([this](){ this->input_notify();});
+}
+
+void ScriptVoyager::activate(void) {
+  director.chain = input;
+  input->activate();
+  return;
+}
+
+void ScriptVoyager::deactivate(void) {
+  BUGZ_LOG(warning) << "ScriptVoyager::deactivate()";
+  notify();
+}
+
+void ScriptVoyager::move_notify(void) {
+  if (md->aborted) {
+    deactivate();
+    return;
+  }
+  if (md->success) {
+    // Great!
+    next();
+    return;
+  } else {
+    to_client("No safe moves.\n\r");
+    deactivate();
+  }
+}
+
+void ScriptVoyager::input_notify(void) {
+  if (id->input.empty() || id->aborted) {
+    to_client("Ok, maybe later then.\n\r");
+    deactivate();
+    return;
+  }
+  loops = sstoi(id->input, -1);
+
+  if (loops == -1) {
+    to_client("I'm sorry, WHAT?\n\r");
+    deactivate();
+  }
+
+  id->input.clear();
+  BUGZ_LOG(warning) << "Voyager loops: " << loops;
+  next();
+}
+
+void ScriptVoyager::next(void) {
+  if (loops == 0) {
+    // ok, stop here.
+    to_client("The voyage ends here, for now.\n\r");
+    deactivate();
+    return;
+  }
+
+  --loops;
+
+  sector_type s = director.galaxy.find_nearest_unexplored(director.current_sector);
+  if (s == 0) {
+    to_client("I don't see anything else to explorer.\n\r");
+    BUGZ_LOG(warning) << "find_nearest_unexplored returned 0";
+    deactivate();
+  }
+
+  BUGZ_LOG(warning) << "Next stop: " << s;
+  md->move_to = s;
+  director.chain = move;
+  director.chain->activate();
+
+}
+
+void ScriptVoyager::server_prompt(const std::string &prompt) {
+
 }

scripts.h

@@ -34,4 +34,28 @@ class ScriptTerror : public Dispatch {
   void server_prompt(const std::string &prompt) override;
 };
 
+class ScriptVoyager : public Dispatch {
+  private:
+    MoveDispatch * md;
+    std::shared_ptr<Dispatch> move;
+    InputDispatch * id;
+    std::shared_ptr<Dispatch> input;
+    void next(void);
+    
+  public:
+    ScriptVoyager(Director &);
+    ~ScriptVoyager();
+    int loops;
+
+    void init(void);
+
+    void activate(void) override;
+    void deactivate(void) override;
+
+    void input_notify(void);
+    void move_notify(void);
+
+    void server_prompt(const std::string &prompt) override;
+};
+
 #endif

session.cpp

@@ -38,7 +38,7 @@ Session::Session(boost::asio::ip::tcp::socket socket,
 
   // Initialize the director
   director.to_server = boost::bind(&Session::to_server, this, _1);
-  director.to_client = boost::bind(&Session::to_client, this, _1);
+  director.to_client = boost::bind(&Session::to_client, this, _1, true);
   director.post = boost::bind(&Session::post, this, _1);
 
   // too soon!
@@ -216,7 +216,7 @@ void Session::process_lines(std::string &received) {
           int rlen = rm[0].length();
           if (director.show_client) {
             line = received.substr(0, rpos + rlen);
-            to_client(line);
+            to_client(line, false);
           }
           received = rm.suffix();
         }
@@ -247,7 +247,7 @@ void Session::process_lines(std::string &received) {
         }
       }
 
-      to_client(line);
+      to_client(line, false);
     }
     received = received.substr(rpos + 1);
 
@@ -286,7 +286,7 @@ void Session::process_lines(std::string &received) {
 
   if (!received.empty())
     if (director.show_client) {
-      to_client(received);
+      to_client(received, false);
       // std::string clean = clean_string(received);
       // BUGZ_LOG(error) << "show_client/leftovers:" << clean;
     }
@@ -505,13 +505,15 @@ void Session::client_read(void) {
       });
 }
 
-void Session::to_client(const std::string &message) {
+void Session::to_client(const std::string &message, bool log) {
   auto self(shared_from_this());
   // output the cleaned string (so I can see what we're sending in the
   // logs)
 
-  std::string clean = clean_string(message);
-  BUGZ_LOG(trace) << "2C: " << clean;
+  if (log) {
+    std::string clean = clean_string(message);
+    BUGZ_LOG(trace) << "2C: " << clean;
+  }
 
   boost::asio::async_write(
       socket_, boost::asio::buffer(message),

session.h

@@ -32,7 +32,7 @@ class Session : public std::enable_shared_from_this<Session> {
 
   const std::string &get_prompt(void);
   void set_prompt(const std::string &prompt);
-  void to_client(const std::string &message);
+  void to_client(const std::string &message, bool log = true);
   void to_server(const std::string &message);
 
   /*