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

Fix: Handle machine fortress

Browse Source
This commit is contained in:
LmeSzinc
2021-09-16 21:43:58 +08:00
parent 8d52210c0f
commit 54ba53a4d3
18 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/map/fleet.py
View File

@@ -667,7 +667,7 @@ class Fleet(Camera, AmbushHandler):
self.ammo_count = 3
self.map = map_
self.map.reset()
self.handle_map_green_config_cover()
self.handle_clear_mode_config_cover()
self.map.poor_map_data = self.config.POOR_MAP_DATA
self.map.load_map_data(use_loop=self.map_is_clear_mode)
self.map.load_spawn_data(use_loop=self.map_is_clear_mode)
@@ -696,8 +696,8 @@ class Fleet(Camera, AmbushHandler):
self.round_reset()
self.round_battle()
def handle_map_green_config_cover(self):
if not self.map_is_green:
def handle_clear_mode_config_cover(self):
if not self.map_is_clear_mode:
return False
if self.config.POOR_MAP_DATA and self.map.is_map_data_poor:

5
module/map/map.py
View File

@@ -422,12 +422,15 @@ class Map(Fleet):
if self.config.FLEET_2:
kwargs['sort'] = ('weight', 'cost_2')
grids = self.map.select(is_siren=True)
grids = self.map.select(is_siren=True).add(self.map.select(manual_siren=True))
grids = self.select_grids(grids, **kwargs)
if grids:
logger.hr('Clear siren')
self.show_select_grids(grids, **kwargs)
if grids[0].manual_siren:
# Manual sirens are not spawning sirens, shouldn't siren_count
self.siren_count -= 1
self.clear_chosen_enemy(grids[0], expected='siren')
return True