Added initial planet upgrade script.

director.cpp

@@ -647,6 +647,17 @@ void Director::scripts_done(void) {
           chain->activate();
           return;
         } break;
+        case 'U': {
+          script = std::make_shared<ScriptPlanet>(*this);
+          ScriptPlanet *sp = static_cast<ScriptPlanet *>(&(*script));
+          sp->setNotify([this]() {
+            script.reset();
+            this->proxy_deactivate();
+          });
+          chain = script;
+          chain->activate();
+          return;
+        } break;
         case 'Q':
           chain = main_menu;
           main_menu->activate();
@@ -1032,9 +1043,10 @@ void Director::SL_densityline(const std::string &line) {
       galaxy.meta["density"][sector] = YAML::Node();
     }
     */
-   // what():  [json.exception.type_error.305] cannot use operator[] with a numeric argument with object
-   
-   std::string sector_text = std::to_string(sector);
+    // what():  [json.exception.type_error.305] cannot use operator[] with a
+    // numeric argument with object
+
+    std::string sector_text = std::to_string(sector);
     galaxy.meta["density"][sector_text]["density"] = density;
     galaxy.meta["density"][sector_text]["warps"] = warps;
     galaxy.meta["density"][sector_text]["navhaz"] = navhaz;
@@ -1325,6 +1337,8 @@ void Director::SL_planetline(const std::string &line) {
     name = work;
     BUGZ_LOG(warning) << (int)sector << " # " << number << " Class " << c
                       << " Level " << level << " name: [" << name << "]";
+    planet p{sector, number, level, name, c};
+    galaxy.planets[number] = p;
   }
 
   /*

dispatchers.cpp

@@ -908,8 +908,9 @@ void TraderDispatch::server_prompt(const std::string &prompt) {
         return;
       }
 
+      int total;
       if (director.galaxy.meta["ship"]["holds"].contains("total")) {
-        int total = json_int(director.galaxy.meta["ship"]["holds"]["total"]);
+        total = json_int(director.galaxy.meta["ship"]["holds"]["total"]);
         int empty = 0;
         if (director.galaxy.meta["ship"]["holds"].contains("empty")) {
           empty = json_int(director.galaxy.meta["ship"]["holds"]["empty"]);
@@ -926,6 +927,22 @@ void TraderDispatch::server_prompt(const std::string &prompt) {
         }
       }
 
+      // Right now, I stop trading, if we can't fill/buy max holds.
+      // We now look to see if you have 75 * total_holds credits.
+
+      int credits = json_int(director.galaxy.meta["credits"]);
+
+      if (credits < (total * 75) ) {
+        BUGZ_LOG(fatal) << "FAIL: credits < " << total * 75 << " have " << credits;
+        std::string message = str(boost::format( "ScriptTrader FAIl: You need at least %1% credits to trade.\n\r") % (total * 75));
+        to_client(message);
+        why_failed = "Low credits.";
+        success = false;
+        aborted = true;
+        deactivate();
+        return;
+      }
+
       // Which port to trade with first?  examine trades
       BUGZ_LOG(fatal) << "trades: " << trades;
       BUGZ_LOG(fatal) << "port0:" << text_from_buysell(port_buysell[0]);

galaxy.h

@@ -113,6 +113,15 @@ class density_scan {
   int pos;
 };
 
+class planet {
+  public:
+  sector_type sector;
+  int number;
+  int level;
+  std::string name;
+  char c; // class
+};
+
 // SPECIAL = 0
 // STARDOCK = 9
 
@@ -132,6 +141,7 @@ class Galaxy {
   // ports;
   std::map<sector_type, port> ports;
   std::map<sector_type, sector_warps> warps;
+  std::map<int, planet> planets;
 
   void add_warp(sector_warps);
   void add_port(sector_type sector, int port_class);

scripts.cpp

@@ -38,13 +38,12 @@ void ScriptTerror::activate(void) {
 
   // Save the trade_end_empty setting, and set to Y
   if (director.galaxy.config.contains("trade_end_empty")) {
-    old_trade_end_empty =
-        director.galaxy.config["trade_end_empty"];
+    old_trade_end_empty = director.galaxy.config["trade_end_empty"];
   } else {
     old_trade_end_empty = "Y";
   }
   director.galaxy.config["trade_end_empty"] = "Y";
-  
+
   // Step 0:  Get ship information / # of holds
   max_loops = loops = -1;
   to_server("I");
@@ -228,9 +227,7 @@ ScriptVoyager::ScriptVoyager(Director &d) : Dispatch(d) {
   init();
 }
 
-ScriptVoyager::~ScriptVoyager() {
-  BUGZ_LOG(warning) << "~ScriptVoyager()";
-}
+ScriptVoyager::~ScriptVoyager() { BUGZ_LOG(warning) << "~ScriptVoyager()"; }
 
 void ScriptVoyager::init(void) {
   move = std::make_shared<MoveDispatch>(director);
@@ -242,7 +239,7 @@ void ScriptVoyager::init(void) {
   id->prompt = "Number of loops/tries: ";
   id->max_length = 5;
   id->numeric = true;
-  id->setNotify([this](){ this->input_notify();});
+  id->setNotify([this]() { this->input_notify(); });
 }
 
 void ScriptVoyager::activate(void) {
@@ -300,7 +297,8 @@ void ScriptVoyager::next(void) {
 
   --loops;
 
-  sector_type s = director.galaxy.find_nearest_unexplored(director.current_sector);
+  sector_type s =
+      director.galaxy.find_nearest_unexplored(director.current_sector);
   if (s == 0) {
     to_client("I don't see anything else to explorer.\n\r");
     BUGZ_LOG(warning) << "find_nearest_unexplored returned 0";
@@ -311,36 +309,31 @@ void ScriptVoyager::next(void) {
   md->move_to = s;
   director.chain = move;
   director.chain->activate();
-
 }
 
 // SL: [###### DANGER! You have marked sector 740 to be avoided!]
 // SP: [Do you really want to warp there? (Y/N) ]
 
-void ScriptVoyager::server_prompt(const std::string &prompt) {
-
-}
+void ScriptVoyager::server_prompt(const std::string &prompt) {}
 
 ScriptExplore::ScriptExplore(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "ScriptExplore()";
   init();
 }
 
-ScriptExplore::~ScriptExplore() {
-  BUGZ_LOG(warning) << "~ScriptExplore()";
-}
+ScriptExplore::~ScriptExplore() { BUGZ_LOG(warning) << "~ScriptExplore()"; }
 
 void ScriptExplore::init() {
   move = std::make_shared<MoveDispatch>(director);
   md = static_cast<MoveDispatch *>(&(*move));
-  md->setNotify([this]() {this->move_notify();});
+  md->setNotify([this]() { this->move_notify(); });
 
   input = std::make_shared<InputDispatch>(director);
   id = static_cast<InputDispatch *>(&(*input));
   id->prompt = "Number of sectors to explore: ";
   id->max_length = 5;
   id->numeric = true;
-  id->setNotify([this](){this->input_notify();});
+  id->setNotify([this]() { this->input_notify(); });
   state = 0;
 }
 
@@ -349,13 +342,13 @@ void ScriptExplore::activate() {
 
   state = 1;
   to_server("I");
-  /* 
+  /*
   director.chain = input;
   input->activate();
   if(director.galaxy.meta["ship"]) {
     if(!director.galaxy.meta["ship"]["scanner"]) {
-      to_client("\n\rIt appears your ship doesn't have a long range scanner.\n\r");
-      deactivate();
+      to_client("\n\rIt appears your ship doesn't have a long range
+  scanner.\n\r"); deactivate();
     }
   }
   state = 1;
@@ -413,8 +406,7 @@ void ScriptExplore::input_notify() {
     to_client("[ PRESS A KEY TO STOP ]\n\r");
     BUGZ_LOG(warning) << "Explore loops: INFINITE";
   }
-  
-  
+
   to_server("SD");
   state = 3;
 }
@@ -425,34 +417,41 @@ void ScriptExplore::next() {
     deactivate();
     return;
   }
-  if(!infinite)
-    --loops;
+  if (!infinite) --loops;
 
   // Calculate next best sector to goto
-  density_scan & ds = director.galaxy.dscan;
+  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 << ")";
+    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) {
+     * 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;
+        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() << ")";
+          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);
           }
         }
@@ -482,12 +481,14 @@ void ScriptExplore::next() {
 
 void ScriptExplore::server_prompt(const std::string &prompt) {
   BUGZ_LOG(warning) << "Explorer State: SP " << state;
-  //next();
-  if(state == 1) {
-    if(at_command_prompt(prompt)) {
-      if(director.galaxy.meta["ship"]) {
-        if(!director.galaxy.meta["ship"]["scanner"]) {
-          to_client("\n\rIt appears your ship doesn't have a long range scanner.\n\r");
+  // next();
+  if (state == 1) {
+    if (at_command_prompt(prompt)) {
+      if (director.galaxy.meta["ship"]) {
+        if (!director.galaxy.meta["ship"]["scanner"]) {
+          to_client(
+              "\n\rIt appears your ship doesn't have a long range "
+              "scanner.\n\r");
           deactivate();
           return;
         }
@@ -500,9 +501,90 @@ void ScriptExplore::server_prompt(const std::string &prompt) {
     }
   }
   if (state == 3) {
-    if(at_command_prompt(prompt)) {
+    if (at_command_prompt(prompt)) {
       state = 4;
       next();
     }
   }
-}
+}
+
+ScriptPlanet::ScriptPlanet(Director &d) : Dispatch(d) {
+  BUGZ_LOG(warning) << "ScriptPlanet()";
+  init();
+}
+
+ScriptPlanet::~ScriptPlanet() { BUGZ_LOG(warning) << "~ScriptPlanet()"; }
+
+void ScriptPlanet::init() {
+  move = std::make_shared<MoveDispatch>(director);
+  md = static_cast<MoveDispatch *>(&(*move));
+  md->setNotify([this]() { this->move_notify(); });
+  trader = std::make_shared<TraderDispatch>(director);
+  td = static_cast<TraderDispatch *>(&(*trader));
+  td->setNotify([this]() { this->trade_notify(); });
+  input = std::make_shared<InputDispatch>(director);
+  id = static_cast<InputDispatch *>(&(*input));
+  id->prompt = "Which planet would you like to upgrade => ";
+  id->max_length = 3;
+  id->numeric = true;
+  id->setNotify([this]() { this->input_notify(); });
+  state = 0;
+}
+
+void ScriptPlanet::activate() {
+  us = director.chain;
+
+  // FUTURE:  handle special case here, where we activate at planet/citadel
+  // prompt
+
+  state = 1;
+
+  // clear out the planets list -- we're refreshing.
+  director.galaxy.planets.clear();
+  // get planet lists
+  to_server("TLQ");
+}
+
+void ScriptPlanet::deactivate() {
+  BUGZ_LOG(warning) << "ScriptPlanet::deactivate()";
+  us.reset();
+  notify();
+}
+
+void ScriptPlanet::input_notify() {
+  deactivate();
+}
+
+void ScriptPlanet::move_notify() {}
+void ScriptPlanet::trade_notify() {}
+
+void ScriptPlanet::server_prompt(const std::string &prompt) {
+  if (state == 1) {
+    if (at_command_prompt(prompt)) {
+      state = 2;
+      to_server("CYQ");
+    }
+  } else if (state == 2) {
+    if (at_command_prompt(prompt)) {
+      state = 3;
+      if (director.galaxy.planets.empty()) {
+        to_client("Sorry, I don't see that you have any planets!\n\r");
+        deactivate();
+        return;
+      }
+      for (auto const &planet : director.galaxy.planets) {
+        std::string text =
+            str(boost::format("%1$3d <%2$5d> Class %3% Level %4% Name %5%\n\r") %
+                planet.first % planet.second.sector % planet.second.c %
+                planet.second.level % planet.second.name);
+        to_client(text);
+      }
+      director.chain = input;
+      director.chain->activate();
+      return;
+    }
+  }
+}
+
+void ScriptPlanet::server_line(const std::string &line,
+                               const std::string &raw_line) {}

scripts.h

@@ -88,4 +88,35 @@ class ScriptExplore : public Dispatch {
     void server_prompt(const std::string &prompt) override;
 };
 
+class ScriptPlanet : public Dispatch {
+  private:
+    MoveDispatch * md;
+    std::shared_ptr<Dispatch> move;
+    InputDispatch * id;
+    std::shared_ptr<Dispatch> input;
+    TraderDispatch * td;
+    std::shared_ptr<Dispatch> trader;
+    void next(void);
+    std::shared_ptr<Dispatch> us;
+    
+  public:
+    ScriptPlanet(Director &);
+    ~ScriptPlanet();
+    int planet;
+    int sector;
+    int state;
+
+    void init(void);
+
+    void activate(void) override;
+    void deactivate(void) override;
+
+    void input_notify(void);
+    void move_notify(void);
+    void trade_notify(void);
+
+    void server_prompt(const std::string &prompt) override;
+    void server_line(const std::string &line, const std::string &raw_line) override;
+};
+
 #endif