sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-19 04:53:34 +08:00
Code Activity

Fix: Retreat before boss appear, but boss fleet is in full hp

Browse Source 
But there will be one more full_scan before real retreat
This commit is contained in:
LmeSzinc
2020-08-09 01:42:10 +08:00
parent bcb605d510
commit de9dde2e99
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/map/fleet.py
View File

@@ -173,6 +173,8 @@ class Fleet(Camera, MapOperation, AmbushHandler):
location = location_ensure(location) location = location_ensure(location)
result_mystery = '' result_mystery = ''
self.movable_before = self.map.select(is_siren=True) self.movable_before = self.map.select(is_siren=True)
if self.hp_withdraw_triggered():
self.withdraw()
while 1: while 1:
sight = self.map.camera_sight sight = self.map.camera_sight
@@ -201,6 +203,7 @@ class Fleet(Camera, MapOperation, AmbushHandler):
# Ambush # Ambush
if self.handle_ambush(): if self.handle_ambush():
self.hp_get()
ambushed_retry.start() ambushed_retry.start()
walk_timeout.reset() walk_timeout.reset()
@@ -221,8 +224,6 @@ class Fleet(Camera, MapOperation, AmbushHandler):
if self.combat_appear(): if self.combat_appear():
self.combat(expected_end=self._expected_combat_end(expected), fleet_index=self.fleet_current_index) self.combat(expected_end=self._expected_combat_end(expected), fleet_index=self.fleet_current_index)
self.hp_get() self.hp_get()
if self.hp_withdraw_triggered():
self.withdraw()
arrived = True if not self.config.MAP_HAS_MOVABLE_ENEMY else False arrived = True if not self.config.MAP_HAS_MOVABLE_ENEMY else False
result = 'combat' result = 'combat'
self.battle_count += 1 self.battle_count += 1