From e9b146c9d50598540d103d42bc7f40e5db80d33f Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:01:39 +0800 Subject: [PATCH] Fix: should call cd_tasks only when they are not in cd --- module/os/operation_siren.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index ff4c95d152..bb1b7e2dcb 100644 --- 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()