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

Merge pull request #197 from noname94/patch

Browse Source 
Fix: handle_strategy() before perspective calculation
This commit is contained in:
Kyo
2020-09-22 14:09:35 -03:00
committed by GitHub
parent 542ccb69e0 5902c1446e
commit 9574231083
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/map/fleet.py
View File

@@ -552,11 +552,12 @@ class Fleet(Camera, AmbushHandler):
portal=self.config.MAP_HAS_PORTAL,
)
self.handle_strategy(index=1 if not self.fleets_reversed() else 2)
self.update()
self.handle_fleet_reverse()
if self.handle_fleet_reverse():
self.handle_strategy(index=1)
self.hp_reset()
self.hp_get()
self.handle_strategy(index=self.fleet_current_index)
self.ensure_edge_insight(preset=self.map.in_map_swipe_preset_data)
self.full_scan(must_scan=self.map.camera_data_spawn_point)
self.find_current_fleet()

5
module/map/map_operation.py
View File

@@ -173,6 +173,9 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
return False
def fleets_reversed(self):
return (self.config.FLEET_2 != 0) and (self.config.FLEET_2 < self.config.FLEET_1)
def handle_fleet_reverse(self):
"""
The game chooses the fleet with a smaller index to be the first fleet,
@@ -181,7 +184,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
Returns:
bool: Fleet changed
"""
if (self.config.FLEET_2 == 0) or (self.config.FLEET_2 > self.config.FLEET_1):
if not self.fleets_reversed():
return False
self.fleet_switch_click()