Further work on ScriptExplore

CMakeLists.txt

@@ -22,6 +22,11 @@ endif()
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
+add_definitions("-std=c++11")
+set(Boost_USE_STATIC_LIBS ON)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
 ##############
 # C++ Standard
 ##############
@@ -30,11 +35,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD   17)
 set(CMAKE_CXX_EXTENSIONS ON)
 
-ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK)
+#ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK)
 
 # add log_setup log 
-FIND_PACKAGE( Boost 1.60 COMPONENTS program_options log_setup log REQUIRED )
-INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+#FIND_PACKAGE( Boost 1.60 COMPONENTS program_options log_setup log REQUIRED )
+#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
 if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp)
   message("***")
@@ -58,11 +63,13 @@ option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
 ### TESTS
 add_executable(test-galaxy test-galaxy.cpp galaxy.cpp config.cpp utils.cpp buysell.cpp)
 add_dependencies(test-galaxy gtest)
-target_link_libraries(test-galaxy gtest_main ${Boost_LIBRARIES} yaml-cpp)
+#target_link_libraries(test-galaxy gtest_main ${Boost_LIBRARIES} yaml-cpp)
+target_link_libraries(test-galaxy gtest_main ${CONAN_LIBS} yaml-cpp)
 
 add_executable(test-director test-director.cpp galaxy.cpp utils.cpp buysell.cpp director.cpp dispatchers.cpp boxes.cpp scripts.cpp config.cpp ansicolor.cpp)
 add_dependencies(test-director gtest)
-target_link_libraries(test-director gtest_main ${Boost_LIBRARIES} yaml-cpp)
+#target_link_libraries(test-director gtest_main ${Boost_LIBRARIES} yaml-cpp)
+target_link_libraries(test-director gtest_main ${CONAN_LIBS} yaml-cpp)
 
 enable_testing()
 add_test(NAME test-galaxy
@@ -72,7 +79,8 @@ add_test(NAME test-director
 
 # dispatchers.cpp 
 ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp dispatchers.cpp scripts.cpp buysell.cpp config.cpp ansicolor.cpp)
-TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
+#TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
+TARGET_LINK_LIBRARIES( twproxy ${CONAN_LIBS} pthread yaml-cpp)
 
-target_precompile_headers(twproxy PRIVATE pch.hpp)
+# target_precompile_headers(twproxy PRIVATE pch.hpp)
 

dispatchers.cpp

@@ -530,6 +530,7 @@ void MoveDispatch::server_line(const std::string &line,
   }
 }
 
+/*
 bool MoveDispatch::density_clear(density d) {  // int sector, int density) {
   /*
   http://wiki.classictw.com/index.php?title=Gypsy%27s_Big_Dummy%27s_Guide_to_TradeWars_Text#Trader_Information
@@ -551,7 +552,7 @@ bool MoveDispatch::density_clear(density d) {  // int sector, int density) {
   500 = Planet
   512 = Federation Starship under Admiral Clausewitz
   575 = Destroyed Port (Before 25% Nav-Haz Clears)
-  */
+  */ /*
   if (d.sector == 0) return false;
 
   switch (d.density) {
@@ -564,7 +565,7 @@ bool MoveDispatch::density_clear(density d) {  // int sector, int density) {
   // special case for sector 1:
   if ((d.sector == 1) && (d.density == 601)) return true;
   return false;
-}
+} */
 
 void MoveDispatch::server_prompt(const std::string &prompt) {
   BUGZ_LOG(fatal) << "server_prompt: " << prompt;
@@ -579,7 +580,7 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
       density d = director.galaxy.dscan.find(move_to);
       if (d.sector == move_to) {
         // Yes! we found the sector in the scan!
-        if (!density_clear(d)) {
+        if (!density_clear(d.sector, d.density, d.navhaz)) {
           BUGZ_LOG(fatal) << "Failed density check on single move.";
           success = false;
           deactivate();
@@ -612,7 +613,7 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
         int density =
             director.galaxy.meta["density"][to_check]["density"].as<int>();
         */
-        if (density_clear(d)) {  // to_check, density)) {
+        if (density_clear(d.sector, d.density, d.navhaz)) {  // to_check, density)) {
           to_server("S");
           ++warp_pos;
         } else {
@@ -636,7 +637,7 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
       int density =
           director.galaxy.meta["density"][to_check]["density"].as<int>();
       */
-      if (density_clear(d)) {
+      if (density_clear(d.sector, d.density, d.navhaz)) {
         to_server("N");
         ++warp_pos;
         state = 4;

dispatchers.h

@@ -148,7 +148,7 @@ class MoveDispatch : public Dispatch {
   void server_prompt(const std::string &prompt) override;
   void client_input(const std::string &input) override;
  private:
-  bool density_clear(density d); // int sector, int density);  
+  //bool density_clear(density d); // int sector, int density);  
 };
 
 class TraderDispatch : public Dispatch {

scripts.cpp

@@ -322,7 +322,6 @@ ScriptExplore::ScriptExplore(Director &d) : Dispatch(d) {
 
 ScriptExplore::~ScriptExplore() {
   BUGZ_LOG(warning) << "~ScriptExplore()";
-  us.reset();
 }
 
 void ScriptExplore::init() {
@@ -360,10 +359,12 @@ void ScriptExplore::activate() {
 
 void ScriptExplore::deactivate() {
   BUGZ_LOG(warning) << "ScriptExplore::deactivate()";
+  us.reset();
   notify();
 }
 
 void ScriptExplore::move_notify() {
+  director.chain = us;
   if (md->aborted) {
     deactivate();
     return;
@@ -379,6 +380,7 @@ void ScriptExplore::move_notify() {
 }
 
 void ScriptExplore::input_notify() {
+  director.chain = us;
   if (id->input.empty() || id->aborted) {
     to_client("Maybe next time.\n\r");
     deactivate();
@@ -406,7 +408,7 @@ void ScriptExplore::input_notify() {
     BUGZ_LOG(warning) << "Explore loops: INFINITE";
   }
   
-  director.chain = us;
+  
   to_server("SD");
   state = 3;
 }
@@ -424,12 +426,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(safe_sector(ds.d[x])) {
+            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(safe_sector(ds.d[x])) {
+            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 +456,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;
@@ -448,6 +474,51 @@ void ScriptExplore::next() {
   director.chain->activate();
 }
 
+bool ScriptExplore::safe_sector(density d) {  // int sector, int density) {
+  if (d.sector == 0) return false;
+  if (d.anomaly) return false;
+  int dense = d.density;
+  /*
+  http://wiki.classictw.com/index.php?title=Gypsy%27s_Big_Dummy%27s_Guide_to_TradeWars_Text#Trader_Information
+  Density Readings:
+    0 = Empty Sector or Ferrengi Dreadanought
+    1 = Marker Beacon
+    2 = Limpet Type 2 Tracking Mine
+    5 = Fighter (per Fighter)
+   10 = Armid Type 1 Mine
+   21 = Navigation Hazard (Per 1 Percent)
+   21 = Destroyed Ship     (Due to 1 Percent Nav-Haz)
+   38 = Unmanned Ship
+   40 = Manned Ship, Alien or Ferrengi Assault Trader
+   50 = Destroyed Starport (After 25 Percent Nav-Haz Clears)
+  100 = Starport or Ferrengi Battle Cruiser
+  210 = Destroyed Planet   (Due to 10 Percent Nav-Haz)
+  462 = Federation Starship under Admiral Nelson
+  489 = Federation Starship under Captain Zyrain
+  500 = Planet
+  512 = Federation Starship under Admiral Clausewitz
+  575 = Destroyed Port (Before 25% Nav-Haz Clears)
+  */
+  // Adjust density by upto 5% navhaz (Only if navhaz less than 6%)
+  if(d.navhaz != 0 && d.navhaz <= 5) {
+    dense -= d.navhaz * 21;
+  }
+  // If navhaz above 5% report it unsafe
+  if (d.navhaz > 5) return false;
+
+  switch (dense) {
+    case 0:
+    case 1:
+    case 100:
+    case 101:
+      return true;
+  }
+  // special case for sector 1:
+  if ((d.sector == 1) && (dense == 601)) return true;
+  return false;
+}
+
+
 void ScriptExplore::server_prompt(const std::string &prompt) {
   BUGZ_LOG(warning) << "Explorer State: SP " << state;
   //next();

scripts.h

@@ -4,6 +4,7 @@
 #include "buysell.h"
 #include "dispatchers.h"
 #include "galaxy.h"
+#include <stack>
 
 class ScriptTerror : public Dispatch {
  private:
@@ -66,7 +67,7 @@ class ScriptExplore : public Dispatch {
     std::shared_ptr<Dispatch> input;
     void next(void);
     std::shared_ptr<Dispatch> us;
-    
+
   public:
     ScriptExplore(Director &);
     ~ScriptExplore();
@@ -74,6 +75,7 @@ class ScriptExplore : public Dispatch {
     bool infinite;
     bool prefer_ports;
     int state;
+    std::stack<sector_type> unknown_warps;
     
     void init(void);
 
@@ -83,6 +85,8 @@ class ScriptExplore : public Dispatch {
     void input_notify(void);
     void move_notify(void);
 
+    bool safe_sector(density d);
+
     void server_prompt(const std::string &prompt) override;
 };