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

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

Browse Source
This commit is contained in:
LmeSzinc
2023-02-18 01:19:04 +08:00
parent b63cf43568
commit d191d16649
18 changed files with 211 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/map/map.py
View File

@@ -22,7 +22,7 @@ class Map(Fleet):
logger.info('Clear enemy: %s' % grid)
expected = f'combat_{expected}' if expected else 'combat'
self.show_fleet()
if self.config.Emotion_CalculateEmotion and self.config.Campaign_UseFleetLock:
if self.emotion.is_calculate and self.config.Campaign_UseFleetLock:
self.emotion.wait(fleet_index=self.fleet_current_index)
self.goto(grid, expected=expected)
@@ -708,7 +708,7 @@ class Map(Fleet):
self.show_fleet()
prev = self.battle_count
for n, grid in enumerate(itertools.cycle(route)):
if self.config.Emotion_CalculateEmotion and self.config.Campaign_UseFleetLock:
if self.emotion.is_calculate and self.config.Campaign_UseFleetLock:
self.emotion.wait(fleet_index=self.fleet_current_index)
self.goto(grid, expected='combat_nothing')