diff --git a/module/campaign/os_run.py b/module/campaign/os_run.py index 023e98d43..781bb88e0 100644 --- a/module/campaign/os_run.py +++ b/module/campaign/os_run.py @@ -57,6 +57,8 @@ class OSCampaignRun(OSMapOperation): if get_os_reset_remain() > 0: self.config.task_delay(server_update=True) self.config.task_call('Reward') + if self.is_cl1_enabled and self.get_yellow_coins() >= self.config.OS_NORMAL_YELLOW_COINS_PRESERVE: + self.config.task_call('OpsiHazard1Leveling') else: logger.info('Just less than 1 day to OpSi reset, delay 2.5 hours') self.config.task_delay(minute=150, server_update=True) diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index 57a589c43..faa433f48 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -444,6 +444,11 @@ class OperationSiren(OSMap): self.config.task_delay(server_update=True) if not self.is_in_opsi_explore(): self.config.task_call('OpsiMeowfficerFarming') + next_run = deep_get(self.config.data, "OpsiObscure.Scheduler.NextRun", default=DEFAULT_TIME) + if next_run - datetime.now() > timedelta(minutes=27): + self.config.task_call('OpsiAbyssal') + self.config.task_call('OpsiStronghold') + self.config.task_call('OpsiObscure') self.config.task_stop() else: logger.warning(f"Disable OpsiHazard1Leveling yellow coin limit : {IsDisableOpsiHazard1LevelingYellowCoinLimit}")