diff --git a/module/campaign/os_run.py b/module/campaign/os_run.py index 1a84ffab0..d8608f391 100644 --- a/module/campaign/os_run.py +++ b/module/campaign/os_run.py @@ -67,6 +67,11 @@ class OSCampaignRun(OSMapOperation): self.config.task_delay(minute=150, server_update=True) def opsi_hazard1_leveling(self): + if self.config.SERVER in ['en', 'jp', 'tw']: + logger.info(f'Opsi CL1 Leveling is not supported in {self.config.SERVER},' + ' please contact server maintainers') + self.config.task_delay(server_update=True) + return self.config.override( OpsiGeneral_AkashiShopFilter='ActionPoint' ) diff --git a/module/os/map.py b/module/os/map.py index eb06a41fb..d3cee3c69 100644 --- a/module/os/map.py +++ b/module/os/map.py @@ -632,11 +632,6 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler): def run_strategic_search(self): self.handle_ash_beacon_attack() - if self.config.SERVER != 'cn': - logger.critical('Unable to use strategy search in your server, ' - 'please turn the option off and wait for asset update') - raise RequestHumanTakeover - logger.info('Run strategy search') self.os_auto_search_run(strategic=True)