sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Fix: Disable auto search temporarily instead of turning it off in user config

Browse Source
This commit is contained in:
LmeSzinc
2022-04-29 11:41:27 +08:00
parent 058f8658e4
commit 3b8da700d3
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/handler/fast_forward.py
View File

@@ -90,13 +90,6 @@ class FastForwardHandler(AutoSearchHandler):
logger.attr('Map_info', text)
logger.attr('StopCondition_MapAchievement', self.config.StopCondition_MapAchievement)
# Force to disable auto search if StopCondition.MapAchievement is not 'non_stop'
if self.config.StopCondition_MapAchievement != 'non_stop' and self.config.Campaign_UseAutoSearch:
logger.warning(f'StopCondition.MapAchievement={self.config.StopCondition_MapAchievement} '
f'does not work with auto search. '
f'Auto search will be disabled')
self.config.Campaign_UseAutoSearch = False
def handle_fast_forward(self):
if not self.map_has_clear_mode:
self.map_is_clear_mode = False
@@ -114,8 +107,13 @@ class FastForwardHandler(AutoSearchHandler):
self.config.MAP_HAS_MAZE = False
self.config.MAP_HAS_FORTRESS = False
self.config.MAP_HAS_BOUNCING_ENEMY = False
self.config.MAP_HAS_DECOY_ENEMY = False
self.map_is_clear_mode = True
self.map_is_auto_search = self.config.Campaign_UseAutoSearch
if self.config.MAP_CLEAR_ALL_THIS_TIME:
logger.info('MAP_CLEAR_ALL_THIS_TIME does not work with auto search, disable auto search temporarily')
self.map_is_auto_search = False
else:
self.map_is_auto_search = self.config.Campaign_UseAutoSearch
self.map_is_2x_book = self.config.Campaign_Use2xBook
else:
# When disable fast forward, MAP_HAS_AMBUSH depends on map settings.