Contiuned work on ScriptExplore

scripts.cpp

@@ -424,12 +424,29 @@ void ScriptExplore::next() {
   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].known << ") to " << best_sector.sector;
+    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) {
-          best_sector = ds.d[x];
+        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 = 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);
+          }
         }
       } else {
         best_sector = ds.d[x];
@@ -437,10 +454,17 @@ void ScriptExplore::next() {
       // Check density for possible port
     }
   }
+  BUGZ_LOG(warning) << "Unknown Warps: " << unknown_warps.size();
   if (best_sector.sector == 0) {
-    to_client("No unknown warps.");
-    deactivate();
-    return;
+    if (unknown_warps.size() == 0) {
+      to_client("No unknown warps.");
+      deactivate();
+      return;
+    } else {
+      BUGZ_LOG(warning) << "Seeking previous unexplored";
+      best_sector.sector = unknown_warps.top();
+      unknown_warps.pop();
+    }
   }
   BUGZ_LOG(warning) << "Targeting sector: " << best_sector.sector;
   md->move_to = best_sector.sector;

scripts.h

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