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

Fix: Skip using emergency repair if all HP is 0 (#4501)

Browse Source
This commit is contained in:
LmeSzinc
2025-01-10 02:39:46 +08:00
parent c98ea50b04
commit 156a988cf5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/combat/combat.py
View File

@@ -237,7 +237,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
if not self.config.HpControl_UseEmergencyRepair:
return False
if self.appear_then_click(EMERGENCY_REPAIR_CONFIRM, offset=True):
if self.appear_then_click(EMERGENCY_REPAIR_CONFIRM, offset=True, interval=3):
return True
if self.appear(BATTLE_PREPARATION, offset=(20, 20)) and self.appear(EMERGENCY_REPAIR_AVAILABLE):
# When entering battle_preparation page (or after emergency repairing),
@@ -251,16 +251,22 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
self.wait_until_stable(stable_checker)
if not self.appear(EMERGENCY_REPAIR_AVAILABLE):
return False
logger.info('EMERGENCY_REPAIR_AVAILABLE')
if not len(self.hp):
return False
if max(self.hp[:3]) <= 0.001 or max(self.hp[3:]) <= 0.001:
logger.warning(f'Invalid HP to use emergency repair: {self.hp}')
return False
hp = np.array(self.hp)
hp = hp[hp > 0.001]
if (len(hp) and np.min(hp) < self.config.HpControl_RepairUseSingleThreshold) \
or np.max(self.hp[:3]) < self.config.HpControl_RepairUseMultiThreshold \
or np.max(self.hp[3:]) < self.config.HpControl_RepairUseMultiThreshold:
or max(self.hp[:3]) < self.config.HpControl_RepairUseMultiThreshold \
or max(self.hp[3:]) < self.config.HpControl_RepairUseMultiThreshold:
logger.info('Use emergency repair')
self.device.click(EMERGENCY_REPAIR_AVAILABLE)
self.interval_clear(EMERGENCY_REPAIR_CONFIRM)
return True
return False