Merge branch 'master' into conan_build

galaxy.cpp

@@ -415,8 +415,8 @@ void Galaxy::save(void) {
         BUGZ_LOG(fatal) << "Outputting Sequence... " << data.first;
         of << yaml_spacer << data.first << ": [";
         bool first = true;
-        for( auto const &seq : data.second) {
-          if (! first) 
+        for (auto const &seq : data.second) {
+          if (!first)
             of << ", ";
           else
             first = false;
@@ -673,12 +673,13 @@ port_pair_type Galaxy::find_closest(int sector) {
 
 /**
  * Find closest and best trade
- * 
- * @param sector 
- * @param lowest_trade_type 
- * @return port_pair_type 
+ *
+ * @param sector
+ * @param lowest_trade_type
+ * @return port_pair_type
  */
-port_pair_type Galaxy::find_closest_trade(int sector, int lowest_trade_type) {
+port_pair_type Galaxy::find_closest_trade(int sector, int lowest_trade_type,
+                                          int burnt_percent) {
   // int type, sector_type s1, s2;
   BUGZ_LOG(fatal) << "find_closest_trade(" << sector << ")";
   std::vector<port_pair_type> vppt;
@@ -725,7 +726,7 @@ port_pair_type Galaxy::find_closest_trade(int sector, int lowest_trade_type) {
         auto possible_port = ports.find(s);
         if (possible_port == ports.end()) continue;
         if (possible_port->second.type == 0) continue;
-        trade_type_result ttr = trade_type_info(c, s);
+        trade_type_result ttr = trade_type_info(c, s, burnt_percent);
         if ((ttr.type == NONE) || (ttr.type > lowest_trade_type)) continue;
         // Ok! we found a trade that fits the criteria!
         vppt.push_back(port_pair_type{ttr.type, ttr.trades, c, s});

galaxy.h

@@ -146,7 +146,8 @@ class Galaxy {
                                     int burnt_percent = 20);
   void sort_port_pair_type(std::vector<port_pair_type>& pptv);
   port_pair_type find_closest(int sector);
-  port_pair_type find_closest_trade(int sector, int lowest_trade_type);
+  port_pair_type find_closest_trade(int sector, int lowest_trade_type,
+                                    int burnt_percent = 20);
   char game;
   std::string username;
 };

scripts.cpp

@@ -84,8 +84,18 @@ void ScriptTerror::input_notify(void) {
   id->input.clear();
   BUGZ_LOG(warning) << "Loops of terror: " << max_loops;
   loops = max_loops;
+
   // find nearest
-  ppt = director.galaxy.find_closest_trade(director.current_sector, 3);
+  int stop_percent;
+  if (director.galaxy.config["stop_percent"]) {
+    stop_percent = director.galaxy.config["stop_percent"].as<int>();
+  } else {
+    stop_percent = 25;
+    director.galaxy.config["stop_percent"] = stop_percent;
+  }
+
+  ppt = director.galaxy.find_closest_trade(director.current_sector, 3,
+                                           stop_percent);
   if (ppt.type == 0) {
     to_client("No trades found!  You've burnt the galaxy!\n\r");
     deactivate();
@@ -95,11 +105,11 @@ void ScriptTerror::input_notify(void) {
   // md->setNotify([this]() { this->proxy_deactivate(); });
 
   if (director.current_sector != ppt.s1) {
-  BUGZ_LOG(fatal) << "Moving to: " << ppt.s1;
-  md->move_to = ppt.s1;
-  director.chain = move;
-  director.chain->activate();
-  return;
+    BUGZ_LOG(fatal) << "Moving to: " << ppt.s1;
+    md->move_to = ppt.s1;
+    director.chain = move;
+    director.chain->activate();
+    return;
   } else {
     // We're already there!
     to_client("Ok!  Get trading!\n\r");
@@ -160,7 +170,18 @@ void ScriptTerror::trade_notify(void) {
 
   if (td->success) {
     // success!
-    ppt = director.galaxy.find_closest_trade(director.current_sector, 3);
+
+    // find nearest
+    int stop_percent;
+    if (director.galaxy.config["stop_percent"]) {
+      stop_percent = director.galaxy.config["stop_percent"].as<int>();
+    } else {
+      stop_percent = 25;
+      director.galaxy.config["stop_percent"] = stop_percent;
+    }
+
+    ppt = director.galaxy.find_closest_trade(director.current_sector, 3,
+                                             stop_percent);
     if (ppt.type == 0) {
       to_client("No trades found!  You've burnt the galaxy!\n\r");
       deactivate();