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

Merge pull request #9 from LmeSzinc/master

Browse Source 
Fix: Enhance failed turn to retry retire when mood notice popup
This commit is contained in:
Erik
2020-06-01 15:15:02 -03:00
committed by GitHub
parent 2a301be4ef 496a47bdb9
commit 595193fa50
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/combat/combat.py
View File

@@ -50,6 +50,8 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
continue
if self.handle_combat_low_emotion():
continue
if self.handle_retirement():
continue
# Break
if self.combat_appear():

6
module/retire/retirement.py
View File

@@ -247,13 +247,15 @@ class Retirement(Enhancement):
self._unable_to_enhance = False
if not total:
logger.warning('No ship retired, exit')
raise ScriptError('No ship retired, exit')
logger.info('This may happens because wrong options of one click retirement in game')
exit(1)
elif 'retire' in self.config.RETIREMENT_METHOD or self._unable_to_enhance:
total = self._retire_handler()
self._unable_to_enhance = False
if not total:
logger.warning('No ship retired, exit')
raise ScriptError('No ship retired, exit')
logger.info('This may happens because some filters are set in dock')
exit(1)
else:
total = self._enhance_handler()
if not total: