Merge branch 'master' into work1

Merging master into our changes.

director.cpp

@@ -1043,15 +1043,15 @@ void Director::SL_densityline(const std::string &line) {
       galaxy.meta["density"][sector] = YAML::Node();
     }
     */
-    // what():  [json.exception.type_error.305] cannot use operator[] with a
-    // numeric argument with object
-
-    std::string sector_text = std::to_string(sector);
-    galaxy.meta["density"][sector_text]["density"] = density;
-    galaxy.meta["density"][sector_text]["warps"] = warps;
-    galaxy.meta["density"][sector_text]["navhaz"] = navhaz;
-    galaxy.meta["density"][sector_text]["anom"] = anom;
-    galaxy.meta["density"][sector_text]["known"] = known;
+   // what():  [json.exception.type_error.305] cannot use operator[] with a numeric argument with object
+   // numeric argument with object 
+
+   std::string sector_text = std::to_string(sector);
+    galaxy.meta["_density"][sector_text]["density"] = density;
+    galaxy.meta["_density"][sector_text]["warps"] = warps;
+    galaxy.meta["_density"][sector_text]["navhaz"] = navhaz;
+    galaxy.meta["_density"][sector_text]["anom"] = anom;
+    galaxy.meta["_density"][sector_text]["known"] = known;
     // Add a check to see if density is greater than 500
     // Add datetime stamp
   }

scripts.cpp

@@ -43,7 +43,7 @@ void ScriptTerror::activate(void) {
     old_trade_end_empty = "Y";
   }
   director.galaxy.config["trade_end_empty"] = "Y";
-
+  
   // Step 0:  Get ship information / # of holds
   max_loops = loops = -1;
   to_server("I");
@@ -297,8 +297,7 @@ void ScriptVoyager::next(void) {
 
   --loops;
 
-  sector_type s =
-      director.galaxy.find_nearest_unexplored(director.current_sector);
+  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";
@@ -309,32 +308,49 @@ void ScriptVoyager::next(void) {
   md->move_to = s;
   director.chain = move;
   director.chain->activate();
+
 }
 
 // SL: [###### DANGER! You have marked sector 740 to be avoided!]
 // SP: [Do you really want to warp there? (Y/N) ]
 
-void ScriptVoyager::server_prompt(const std::string &prompt) {}
+void ScriptVoyager::server_prompt(const std::string &prompt) {
+
+}
 
 ScriptExplore::ScriptExplore(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "ScriptExplore()";
   init();
 }
 
-ScriptExplore::~ScriptExplore() { BUGZ_LOG(warning) << "~ScriptExplore()"; }
+ScriptExplore::~ScriptExplore() {
+  BUGZ_LOG(warning) << "~ScriptExplore()";
+}
 
 void ScriptExplore::init() {
   move = std::make_shared<MoveDispatch>(director);
   md = static_cast<MoveDispatch *>(&(*move));
-  md->setNotify([this]() { this->move_notify(); });
+  md->setNotify([this]() {this->move_notify();});
 
   input = std::make_shared<InputDispatch>(director);
   id = static_cast<InputDispatch *>(&(*input));
   id->prompt = "Number of sectors to explore: ";
   id->max_length = 5;
   id->numeric = true;
-  id->setNotify([this]() { this->input_notify(); });
+  id->setNotify([this](){this->input_notify();});
   state = 0;
+  target = 0;
+
+  if(!director.galaxy.config.contains("prefer_ports")) {
+    director.galaxy.config["prefer_ports"] = "Y";
+    prefer_ports = true;
+  } else {
+    prefer_ports = json_str(director.galaxy.config["prefer_ports"]) == "Y";
+  }
+  if(!director.galaxy.meta["help"].contains("prefer_ports")) {
+    director.galaxy.meta["help"]["prefer_ports"] = "Explorer prefers to find ports.";
+  }
+  BUGZ_LOG(warning) << "Prefer Ports: " + prefer_ports;
 }
 
 void ScriptExplore::activate() {
@@ -342,13 +358,13 @@ void ScriptExplore::activate() {
 
   state = 1;
   to_server("I");
-  /*
+  /* 
   director.chain = input;
   input->activate();
   if(director.galaxy.meta["ship"]) {
     if(!director.galaxy.meta["ship"]["scanner"]) {
-      to_client("\n\rIt appears your ship doesn't have a long range
-  scanner.\n\r"); deactivate();
+      to_client("\n\rIt appears your ship doesn't have a long range scanner.\n\r");
+      deactivate();
     }
   }
   state = 1;
@@ -373,8 +389,23 @@ void ScriptExplore::move_notify() {
     state = 3;
     return;
   } else {
-    to_client("No safe moves.\n\r");
-    deactivate();
+    if (unknown_warps.size() != 0) {
+      BUGZ_LOG(warning) << "Seeking previous unexplored (Unsafe Dest.)";
+      state = 4;
+      next();
+      target = unknown_warps.top();
+      unknown_warps.pop();
+      std::string message = "UNSAFE DESTINATION";
+      std::string indenter = "    ";
+      ANSIColor alert(COLOR::WHITE, COLOR::RED, ATTR::BOLD);
+      to_client(indenter + alert() + message + reset() + "\n\r");
+    } else {
+      std::string message = "Move failed: " + md->why_failed + "\n\r";
+      //to_client("No safe moves.\n\r");
+      BUGZ_LOG(warning) << message;
+      to_client(message);
+      deactivate();
+    }
   }
 }
 
@@ -417,46 +448,66 @@ void ScriptExplore::next() {
     deactivate();
     return;
   }
-  if (!infinite) --loops;
+  if(!infinite)
+    --loops;
 
   // Calculate next best sector to goto
-  density_scan &ds = director.galaxy.dscan;
+  density_scan & ds = director.galaxy.dscan;
   density best_sector;
-  for (int x = 0; x < ds.pos; ++x) {
-    BUGZ_LOG(warning) << "Comparing: " << ds.d[x].sector << " ("
-                      << ds.d[x].density << ", " << ds.d[x].known << ") to "
-                      << best_sector.sector << " (" << best_sector.density
-                      << ", " << best_sector.known << ")";
-    /* Is this sector prefered over others?
-     * Warp Counts (Number of warps)
-     * Density Check (Is this sector clear, does it contain a port)
-     * NavHaz Check (Avoid sectors with navhaz above X%)
-     */
-    if (!ds.d[x].known) {
-      BUGZ_LOG(warning) << "Subject: " << ds.d[x].sector;
-      // Compare, Warp counts
-      if (best_sector.sector != 0) {
-        if ((ds.d[x].warps >= best_sector.warps) ||
-            ((ds.d[x].density == 100 || ds.d[x].density == 101) &&
-             (best_sector.density != 100 || best_sector.density != 101))) {
-          if (density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
-            if (best_sector.sector != 0) {
-              BUGZ_LOG(warning)
-                  << "Storing previous best " << best_sector.sector;
-              unknown_warps.push(best_sector.sector);
+  best_sector.sector = 0;
+  if (target != 0) {
+    BUGZ_LOG(info) << "Using: " << target;
+    best_sector.sector = target;
+    target = 0;
+  } else {
+    for (int x = 0; x < ds.pos; ++x) {
+      if(best_sector.sector != 0)
+        BUGZ_LOG(info) << "Comparing: " << ds.d[x].sector << " (" << ds.d[x].density << ", " << ds.d[x].known <<") to " << best_sector.sector << " (" << best_sector.density << ", " << best_sector.known << ")";
+      /* Is this sector prefered over others?
+        * Warp Counts (Number of warps)
+        * Density Check (Is this sector clear, does it contain a port)
+        * NavHaz Check (Avoid sectors with navhaz above X%)
+      */
+      if(!ds.d[x].known) {
+        BUGZ_LOG(info) << "Subject: " << ds.d[x].sector;
+        // Compare, Warp counts
+        if (best_sector.sector != 0) {
+          if(prefer_ports) {
+            if((ds.d[x].density == 100 || ds.d[x].density == 101) || (ds.d[x].warps >= best_sector.warps)) {
+              if(density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
+                if(best_sector.sector != 0) {
+                  BUGZ_LOG(info) << "Storing previous best " << best_sector.sector;
+                  unknown_warps.push(best_sector.sector);
+                }
+                best_sector = ds.d[x];
+              }
+            } else {
+              if(density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
+                BUGZ_LOG(info) << "Added " << ds.d[x].sector << " to unknown_warps (" << unknown_warps.size() << ")";
+                unknown_warps.push(ds.d[x].sector);
+              }
+            }
+          } else {
+            if((ds.d[x].warps >= best_sector.warps)) {
+              if(density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
+                if(best_sector.sector != 0) {
+                  BUGZ_LOG(info) << "Storing previous best " << best_sector.sector;
+                  unknown_warps.push(best_sector.sector);
+                }
+                best_sector = ds.d[x];
+              }
+            } else {
+              if(density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
+                BUGZ_LOG(info) << "Added " << ds.d[x].sector << " to unknown_warps (" << unknown_warps.size() << ")";
+                unknown_warps.push(ds.d[x].sector);
+              }
             }
-            best_sector = ds.d[x];
           }
         } else {
-          if (density_clear(ds.d[x].sector, ds.d[x].density, ds.d[x].navhaz)) {
-            BUGZ_LOG(warning)
-                << "Added " << ds.d[x].sector << " to unknown_warps ("
-                << unknown_warps.size() << ")";
-            unknown_warps.push(ds.d[x].sector);
-          }
+          BUGZ_LOG(info) << "No-Op " << ds.d[x].sector << " is best.";
+          best_sector = ds.d[x];
         }
-      } else {
-        best_sector = ds.d[x];
+        // Check density for possible port
       }
       // Check density for possible port
     }
@@ -471,120 +522,48 @@ void ScriptExplore::next() {
       BUGZ_LOG(warning) << "Seeking previous unexplored";
       best_sector.sector = unknown_warps.top();
       unknown_warps.pop();
+      std::string message = "DEAD END";
+      std::string indenter = "    ";
+      ANSIColor alert(COLOR::WHITE, COLOR::RED, ATTR::BOLD);
+      to_client(indenter + alert() + message + reset() + "\n\r");
     }
   }
   BUGZ_LOG(warning) << "Targeting sector: " << best_sector.sector;
-  md->move_to = best_sector.sector;
-  director.chain = move;
-  director.chain->activate();
+  if (director.current_sector != best_sector.sector) {
+    md->move_to = best_sector.sector;
+    director.chain = move;
+    director.chain->activate();
+  } else {
+    BUGZ_LOG(warning) << "Targeting current sector!";
+    state = 3;
+    to_server("SD");
+  }
 }
 
 void ScriptExplore::server_prompt(const std::string &prompt) {
-  BUGZ_LOG(warning) << "Explorer State: SP " << state;
-  // next();
-  if (state == 1) {
-    if (at_command_prompt(prompt)) {
-      if (director.galaxy.meta["ship"]) {
-        if (!director.galaxy.meta["ship"]["scanner"]) {
-          to_client(
-              "\n\rIt appears your ship doesn't have a long range "
-              "scanner.\n\r");
+  BUGZ_LOG(info) << "Explorer State: SP " << state;
+  //next();
+  if(state == 1) {
+    if(at_command_prompt(prompt)) {
+      if(director.galaxy.meta.contains("ship")) {
+        if(!director.galaxy.meta["ship"].contains("scanner")) {
+          to_client("\n\rIt appears your ship doesn't have a long range scanner.\n\r");
           deactivate();
           return;
         }
       }
       state = 2;
-      BUGZ_LOG(fatal) << "state = 1, prompting for user input";
+      BUGZ_LOG(info) << "state = 1, prompting for user input";
       director.chain = input;
       input->activate();
       return;
     }
   }
   if (state == 3) {
-    if (at_command_prompt(prompt)) {
+    if(at_command_prompt(prompt)) {
       state = 4;
+      BUGZ_LOG(info) << "state = 3, calculating next sector";
       next();
     }
   }
 }
-
-ScriptPlanet::ScriptPlanet(Director &d) : Dispatch(d) {
-  BUGZ_LOG(warning) << "ScriptPlanet()";
-  init();
-}
-
-ScriptPlanet::~ScriptPlanet() { BUGZ_LOG(warning) << "~ScriptPlanet()"; }
-
-void ScriptPlanet::init() {
-  move = std::make_shared<MoveDispatch>(director);
-  md = static_cast<MoveDispatch *>(&(*move));
-  md->setNotify([this]() { this->move_notify(); });
-  trader = std::make_shared<TraderDispatch>(director);
-  td = static_cast<TraderDispatch *>(&(*trader));
-  td->setNotify([this]() { this->trade_notify(); });
-  input = std::make_shared<InputDispatch>(director);
-  id = static_cast<InputDispatch *>(&(*input));
-  id->prompt = "Which planet would you like to upgrade => ";
-  id->max_length = 3;
-  id->numeric = true;
-  id->setNotify([this]() { this->input_notify(); });
-  state = 0;
-}
-
-void ScriptPlanet::activate() {
-  us = director.chain;
-
-  // FUTURE:  handle special case here, where we activate at planet/citadel
-  // prompt
-
-  state = 1;
-
-  // clear out the planets list -- we're refreshing.
-  director.galaxy.planets.clear();
-  // get planet lists
-  to_server("TLQ");
-}
-
-void ScriptPlanet::deactivate() {
-  BUGZ_LOG(warning) << "ScriptPlanet::deactivate()";
-  us.reset();
-  notify();
-}
-
-void ScriptPlanet::input_notify() {
-  deactivate();
-}
-
-void ScriptPlanet::move_notify() {}
-void ScriptPlanet::trade_notify() {}
-
-void ScriptPlanet::server_prompt(const std::string &prompt) {
-  if (state == 1) {
-    if (at_command_prompt(prompt)) {
-      state = 2;
-      to_server("CYQ");
-    }
-  } else if (state == 2) {
-    if (at_command_prompt(prompt)) {
-      state = 3;
-      if (director.galaxy.planets.empty()) {
-        to_client("Sorry, I don't see that you have any planets!\n\r");
-        deactivate();
-        return;
-      }
-      for (auto const &planet : director.galaxy.planets) {
-        std::string text =
-            str(boost::format("%1$3d <%2$5d> Class %3% Level %4% Name %5%\n\r") %
-                planet.first % planet.second.sector % planet.second.c %
-                planet.second.level % planet.second.name);
-        to_client(text);
-      }
-      director.chain = input;
-      director.chain->activate();
-      return;
-    }
-  }
-}
-
-void ScriptPlanet::server_line(const std::string &line,
-                               const std::string &raw_line) {}

scripts.h

@@ -5,6 +5,7 @@
 #include "dispatchers.h"
 #include "galaxy.h"
 #include <stack>
+#include "ansicolor.h"
 
 class ScriptTerror : public Dispatch {
  private:
@@ -75,6 +76,7 @@ class ScriptExplore : public Dispatch {
     bool infinite;
     bool prefer_ports;
     int state;
+    int target;
     std::stack<sector_type> unknown_warps;
     
     void init(void);