chain trading now only buys 2x tradevolume max

Ctri-The-Third · Jan 14, 2024 · 1d1a801 · 1d1a801
1 parent d6fadc5
commit 1d1a801
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/behaviours/chain_trade.py b/behaviours/chain_trade.py
@@ -85,13 +85,18 @@ def _run(self):
         buy_wp = st.waypoints_view_one(params["buy_wp"])
         sell_wp = st.waypoints_view_one(params["sell_wp"])
         tradegood = params["tradegood"]
+        buy_market = st.system_market(buy_wp)
+        target_tg = buy_market.get_tradegood(params["tradegood"])
+        max_to_buy = ship.cargo_capacity
+        if target_tg:
+            max_to_buy = target_tg.trade_volume * 2
         pass
         if not tradegood in [x.symbol for x in ship.cargo_inventory]:
             self.go_and_buy(
                 tradegood,
                 buy_wp,
-                max_to_buy=self.ship.cargo_capacity,
                 burn_allowed=True,
+                max_to_buy=max_to_buy,
             )
 
         self.go_and_sell_or_fulfill(tradegood, sell_wp, burn_allowed=True)

diff --git a/behaviours/emergency_reboot.py b/behaviours/emergency_reboot.py
@@ -151,11 +151,11 @@ def select_positive_trade(self):
     behaviour_params = {
         "priority": 3,
     }
-
     bhvr = EmergencyReboot(agent, ship, behaviour_params or {})
 
-    lock_ship(ship_number, "MANUAL", bhvr.st.db_client.connection, 60 * 24)
-    bhvr.st.ships_view_one(ship, True)
+    lock_ship(ship_number, "MANUAL", 60 * 24)
     while True:
+        bhvr.st.ships_view_one(ship, True)
+
         bhvr.run()
-    lock_ship(ship_number, "MANUAL", bhvr.st.db_client.connection, 0)
+    lock_ship(ship_number, "MANUAL", 0)