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: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY

Browse Source
This commit is contained in:
LmeSzinc
2025-05-21 01:48:29 +08:00
parent d3ad772a36
commit 3c5eea5fb0
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/map/fleet.py
View File

@@ -630,10 +630,12 @@ class Fleet(Camera, AmbushHandler):
logger.info(f'Tracked enemy {matched_before} -> {matched_after}')
# Delete wrong prediction
for grid in after.delete(matched_after):
if not grid.may_siren:
logger.warning(f'Wrong detection: {grid}')
grid.wipe_out()
# keep whatever if MAP_HAS_MOVABLE_NORMAL_ENEMY, it's kind of a mess
if not self.config.MAP_HAS_MOVABLE_NORMAL_ENEMY:
for grid in after.delete(matched_after):
if not grid.may_siren:
logger.warning(f'Wrong detection: {grid}')
grid.wipe_out()
# Predict missing siren
diff = before.delete(matched_before)
@@ -649,6 +651,13 @@ class Fleet(Camera, AmbushHandler):
covered = covered.add(self.map.grid_covered(self.map[self.fleet_1_location], location=[(0, -1)]))
if self.fleet_2_location:
covered = covered.add(self.map.grid_covered(self.map[self.fleet_2_location], location=[(0, -1)]))
if self.config.MAP_HAS_MOVABLE_NORMAL_ENEMY and not self.config.MAP_ENEMY_TEMPLATE:
# enemy_scale icon of the right grid may get covered by fleet
# if enemy template is empty, must predict by enemy_scale
if self.fleet_1_location:
covered = covered.add(self.map.grid_covered(self.map[self.fleet_1_location], location=[(1, 0)]))
if self.fleet_2_location:
covered = covered.add(self.map.grid_covered(self.map[self.fleet_2_location], location=[(1, 0)]))
covered = covered.add(self.map._map_covered)
if siren:
for grid in after: