Feature: restart cl1 if enabled after MeowfficerFarming

LmeSzinc · Aug 29, 2024 · 112ce77 · 112ce77
1 parent 6f586b0
commit 112ce77
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py
@@ -396,7 +396,12 @@ def os_meowfficer_farming(self):
                     .sort_by_clock_degree(center=(1252, 1012), start=self.zone.location)
 
                 logger.hr(f'OS meowfficer farming, zone_id={zones[0].zone_id}', level=1)
-                self.globe_goto(zones[0])
+                try:
+                    self.globe_goto(zones[0])
+                except ActionPointLimit:
+                    if self.is_cl1_enabled and self.get_yellow_coins() >= self.config.OS_CL1_YELLOW_COINS_PRESERVE:
+                        self.config.task_call('OpsiHazard1Leveling')
+                    raise ActionPointLimit
                 self.fleet_set(self.config.OpsiFleet_Fleet)
                 self.os_order_execute(
                     recon_scan=False,
@@ -429,6 +434,11 @@ def os_hazard1_leveling(self):
                 with self.config.multi_set():
                     self.config.task_delay(server_update=True)
                     if not self.is_in_opsi_explore():
+                        cd = self.nearest_task_cooling_down
+                        if cd is None:
+                            self.config.task_call('OpsiAbyssal')
+                            self.config.task_call('OpsiStronghold')
+                            self.config.task_call('OpsiObscure')
                         self.config.task_call('OpsiMeowfficerFarming')
                 self.config.task_stop()
 
@@ -444,6 +454,11 @@ def os_hazard1_leveling(self):
                 with self.config.multi_set():
                     self.config.task_delay(server_update=True)
                     if not self.is_in_opsi_explore():
+                        cd = self.nearest_task_cooling_down
+                        if cd is None:
+                            self.config.task_call('OpsiAbyssal')
+                            self.config.task_call('OpsiStronghold')
+                            self.config.task_call('OpsiObscure')
                         self.config.task_call('OpsiMeowfficerFarming')
                 self.config.task_stop()