Fix: should call cd_tasks only when they are not in cd

LmeSzinc · Apr 9, 2024 · e9b146c · e9b146c
1 parent 549f20d
commit e9b146c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py
@@ -410,9 +410,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():
-                        self.config.task_call('OpsiAbyssal')
-                        self.config.task_call('OpsiStronghold')
-                        self.config.task_call('OpsiObscure')
+                        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()
 
@@ -428,9 +430,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():
-                        self.config.task_call('OpsiAbyssal')
-                        self.config.task_call('OpsiStronghold')
-                        self.config.task_call('OpsiObscure')
+                        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()