Terror moves and trades.

Just for one step.  loops next.

TradeWars Proxy Notes.md

@@ -2,6 +2,8 @@
 
 ## TODO
 
+* I have the ANSI music from Yankee Trader.
+* 
 * TradeDispatch -- return some value that says we've Traded/or there's nothing here to trade with.  (Keep calling TradeDispatch until nothing -- then move on!)
 * MoveDispatch -- return success that we moved to a sector.  (Should we give it two sectors that we want to trade with -- and have it move to the nearest/closest one?)  That way we don't waste a move (going to the furthest one, only to move back to the nearer)?
 * 

director.cpp

@@ -479,6 +479,7 @@ MenuDispatch *Director::init_scripts_menu(void) {
     md->menu = {{"!", "Terror"},
                 {"T", "Trade"},
                 {"S", "Safe Move"},
+                {"C", "Closest Trade"},
                 {"U", "Upgrade Planet Pants"}};
     md->setNotify([this]() { this->scripts_done(); });
     return md;
@@ -538,6 +539,14 @@ void Director::scripts_done(void) {
           return;
         } break;
         case '!': {
+          script = std::make_shared<ScriptTerror>(*this);
+          ScriptTerror * st = static_cast<ScriptTerror *>(&(*script));
+          st->setNotify([this]() { this->proxy_deactivate(); });
+          chain = script;
+          chain->activate();
+          return;
+        }
+        case 'C': {
           auto best = galaxy.find_closest(current_sector);
           if (best.type != 0) {
             std::string text =

scripts.cpp

@@ -1,6 +1,7 @@
 #include "scripts.h"
 
 #include "logging.h"
+#include <boost/format.hpp>
 
 ScriptTrader::ScriptTrader(Director &d) : Dispatch(d) {
   BUGZ_LOG(fatal) << "ScriptTrader()";
@@ -487,25 +488,31 @@ void ScriptTrader::server_prompt(const std::string &prompt) {
 void ScriptTrader::client_input(const std::string &cinput) { deactivate(); };
 
 ScriptTerror::ScriptTerror(Director &d) : Dispatch(d) {
-  BUGZ_LOG(warning) << "ScriptTerror";
+  BUGZ_LOG(warning) << "ScriptTerror()";
   init();
 }
 
-ScriptTerror::~ScriptTerror() { BUGZ_LOG(warning) << "~ScriptTerror"; }
+ScriptTerror::~ScriptTerror() { BUGZ_LOG(warning) << "~ScriptTerror()"; }
 
 void ScriptTerror::init(void) {
+  BUGZ_LOG(fatal) << "ScriptTerror::init()";
+
   move = std::make_shared<MoveDispatch>(director);
   md = static_cast<MoveDispatch *>(&(*move));
   // setup notify functions for results/completion.
-  // md->setNotify([this]() { this->input_notify(); });
+  md->setNotify([this]() { this->move_notify(); });
+
   input = std::make_shared<InputDispatch>(director);
-  id = static_cast<InputDispatch *>(&(*move));
+  id = static_cast<InputDispatch *>(&(*input));
   id->prompt = "Number of loops: ";
   id->max_length = 4;
   id->numeric = true;
   id->setNotify([this]() { this->input_notify(); });
-  trader = std::make_shared<ScriptTrader>(director);
-  st = static_cast<ScriptTrader *>(&(*trader));
+
+  trader = std::make_shared<TraderDispatch>(director);
+  td = static_cast<TraderDispatch *>(&(*trader));
+  td->setNotify([this]() { this->trade_notify(); });
+  BUGZ_LOG(fatal) << "ScriptTerror::init() completed.";
 }
 
 void ScriptTerror::activate(void) {
@@ -532,12 +539,52 @@ void ScriptTerror::input_notify(void) {
     deactivate();
     return;
   }
-  loops = sstoi(id->input);
-  if (loops == 0) {
+  max_loops = sstoi(id->input, -1);
+  if (max_loops == -1) {
     deactivate();
     return;
   }
-  BUGZ_LOG(warning) << "Loops of terror: " << loops;
-  // for now:
+  id->input.clear();
+  BUGZ_LOG(warning) << "Loops of terror: " << max_loops;
+  loops = 0;
+  // find nearest
+  ppt = director.galaxy.find_closest_trade(director.current_sector, 3);
+  if (ppt.type == 0) {
+    to_client("No trades found!  You've burnt the galaxy!\n\r");
+    deactivate();
+    return;
+  }
+  // ok, step 2:  move!
+  // md->setNotify([this]() { this->proxy_deactivate(); });
+
+  BUGZ_LOG(fatal) << "Moving to: " << ppt.s1;          
+  md->move_to = ppt.s1;
+  director.chain = move;
+  director.chain->activate();
+  return;
+}
+
+void ScriptTerror::move_notify(void) {
+  BUGZ_LOG(fatal) << "move_notify()";
+  // Check for success, and start trading!
+  if (md->success) {
+    to_client("We're here, get trading!\n\r");
+
+    td->port[0] = ppt.s1;
+    td->port[1] = ppt.s2;
+    td->trades = ppt.trades;
+    td->type = ppt.type;
+    director.chain = trader;
+    director.chain->activate();
+    return;
+  } else {
+    to_client("Move FAILED.\n\r");
+    deactivate();
+  }
+}
+
+void ScriptTerror::trade_notify(void) {
+  // Done trading -- maybe! :P
+  to_client("Ok, trade is done.\n\r");
   deactivate();
 }

scripts.h

@@ -61,13 +61,15 @@ class ScriptTerror : public Dispatch {
   std::shared_ptr<Dispatch> move;
   InputDispatch * id;
   std::shared_ptr<Dispatch> input;
-  ScriptTrader * st;
+  TraderDispatch * td;
   std::shared_ptr<Dispatch> trader;
 
  public:
   ScriptTerror(Director &);
   ~ScriptTerror();
   int loops;
+  int max_loops;
+  port_pair_type ppt;
   
   void init(void);
 
@@ -75,6 +77,8 @@ class ScriptTerror : public Dispatch {
   void deactivate(void) override;
 
   void input_notify(void);
+  void move_notify(void);
+  void trade_notify(void);
 };
 
 #endif

utils.cpp

@@ -176,16 +176,16 @@ void remove_telnet_commands(std::string &text) {
   }
 }
 
-int sstoi(const std::string &text) {
+int sstoi(const std::string &text, int failure) {
   int result;
   try {
     result = stoi(text);
   } catch (const std::invalid_argument &e) {
     // BUGZ_LOG(fatal) << e.what();
-    result = 0;
+    return failure;
   } catch (const std::out_of_range &e) {
     // BUGZ_LOG(fatal) << e.what();
-    result = 0;
+    return failure;
   }
   return result;
-}
+}

utils.h

@@ -37,6 +37,6 @@ void remove_telnet_commands(std::string &text);
  * @param text 
  * @return int 
  */
-int sstoi(const std::string &text);
+int sstoi(const std::string &text, int failure=0);
 
 #endif