ScriptExplore dead end and unsafe handled

  Dead Ends and Unsafe Destinations are now handled in ScriptExplore.

scripts.cpp

@@ -342,6 +342,18 @@ void ScriptExplore::init() {
   id->numeric = true;
   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() {
@@ -380,8 +392,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();
+    }
   }
 }
 
@@ -431,35 +458,61 @@ void ScriptExplore::next() {
   // Calculate next best sector to goto
   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].warps >= best_sector.warps) || (ds.d[x].density == 100 || ds.d[x].density == 101)) {
+              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
     }
   }
   BUGZ_LOG(warning) << "Unknown Warps: " << unknown_warps.size();
@@ -472,28 +525,38 @@ 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;
+  BUGZ_LOG(info) << "Explorer State: SP " << state;
   //next();
   if(state == 1) {
     if(at_command_prompt(prompt)) {
-      if(director.galaxy.meta["ship"]) {
-        if(!director.galaxy.meta["ship"]["scanner"]) {
+      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;
@@ -502,6 +565,7 @@ void ScriptExplore::server_prompt(const std::string &prompt) {
   if (state == 3) {
     if(at_command_prompt(prompt)) {
       state = 4;
+      BUGZ_LOG(info) << "state = 3, calculating next sector";
       next();
     }
   }

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);