Added ScriptExplore

  Yup, sometime last night it appears to have been removed... but since
conan_build is being removed for the nicer conan.sh I needed to merge it
over.

director.cpp

@@ -533,6 +533,7 @@ MenuDispatch *Director::init_scripts_menu(void) {
                 {"C", "Closest Trade"},
                 {"N", "Nearest Unexplored"},
                 {"V", "Voyager Explorer"},
+                {"E", "Explorer"},
                 {"U", "Upgrade Planet Pants"},
                 {"X", "Exit Scripts"}};
     md->setNotify([this]() { this->scripts_done(); });
@@ -635,6 +636,17 @@ void Director::scripts_done(void) {
           chain->activate();
           return;
         } break;
+        case 'E': {
+          script = std::make_shared<ScriptExplore>(*this);
+          ScriptExplore *se = static_cast<ScriptExplore *>(&(*script));
+          se->setNotify([this]() {
+            script.reset();
+            this->proxy_deactivate();
+          });
+          chain = script;
+          chain->activate();
+          return;
+        } break;
         case 'Q':
           chain = main_menu;
           main_menu->activate();

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.";
           why_failed = str(boost::format("Density of %1% at %2%.") % move_to % d.density );  // density of move_to ...
           success = false;
@@ -613,7 +614,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 {
@@ -634,11 +635,7 @@ void MoveDispatch::server_prompt(const std::string &prompt) {
     if (prompt == "Stop in this sector (Y,N,E,I,R,S,D,P,?) (?=Help) [N] ? ") {
       int to_check = warp_lane[warp_pos + 1];
       density d = director.galaxy.dscan.find(to_check);
-      /*
-      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

@@ -147,7 +147,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

@@ -328,7 +328,6 @@ ScriptExplore::ScriptExplore(Director &d) : Dispatch(d) {
 
 ScriptExplore::~ScriptExplore() {
   BUGZ_LOG(warning) << "~ScriptExplore()";
-  us.reset();
 }
 
 void ScriptExplore::init() {
@@ -366,10 +365,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;
@@ -385,6 +386,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();
@@ -412,7 +414,7 @@ void ScriptExplore::input_notify() {
     BUGZ_LOG(warning) << "Explore loops: INFINITE";
   }
   
-  director.chain = us;
+  
   to_server("SD");
   state = 3;
 }

scripts.h

@@ -67,7 +67,7 @@ class ScriptExplore : public Dispatch {
     std::shared_ptr<Dispatch> input;
     void next(void);
     std::shared_ptr<Dispatch> us;
-    
+
   public:
     ScriptExplore(Director &);
     ~ScriptExplore();