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

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
This commit is contained in:
LmeSzinc
2021-09-17 23:53:15 +08:00
parent 61cbe75527 ae6809c9aa
commit 5ed75c8de5
37 changed files with 1379 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/map/map.py
View File

@@ -417,18 +417,22 @@ class Map(Fleet):
Returns:
bool: True if clear an enemy.
"""
if not self.config.MAP_HAS_SIREN:
if not self.config.MAP_HAS_SIREN and not self.config.MAP_HAS_FORTRESS:
return False
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(is_fortress=True))
grids = self.select_grids(grids, **kwargs)
if grids:
logger.hr('Clear siren')
self.show_select_grids(grids, **kwargs)
self.clear_chosen_enemy(grids[0], expected='siren')
if grids[0].is_fortress:
expected = 'fortress'
else:
expected = 'siren'
self.clear_chosen_enemy(grids[0], expected=expected)
return True
return False