sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: Akashi detection in OS radar (#502)

Browse Source
This commit is contained in:
LmeSzinc 2021-06-29 16:44:09 +08:00
parent 6bd8f7d1de
commit 2d82f79398
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/mask/MASK_OS_RADAR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

17
module/os/radar.py
View File

@ -1,8 +1,13 @@
from PIL import Image
from module.base.mask import Mask
from module.base.utils import *
from module.config.config import AzurLaneConfig
from module.logger import logger
from module.map_detection.utils import fit_points
MASK_RADAR = Mask('./assets/mask/MASK_OS_RADAR.png')
class RadarGrid:
is_enemy = False # Red gun
@ -132,9 +137,7 @@ class RadarGrid:
return self.image_color_count(area=(-3, -3, 3, 3), color=(255, 255, 255), threshold=235, count=10)
def predict_question(self):
return self.image_color_count(area=(0, -7, 6, 0), color=(255, 255, 255), threshold=235, count=10) \
and self.image_color_count(area=(-4, -7, 2, 0), color=(255, 255, 255), threshold=235, count=10) \
and self.image_color_count(area=(-2, 0, 4, 7), color=(255, 255, 255), threshold=235, count=5)
return self.image_color_count(area=(0, -7, 6, 0), color=(255, 255, 255), threshold=235, count=10)
class Radar:
@ -170,6 +173,10 @@ class Radar:
return iter(self.grids.values())
def __getitem__(self, item):
"""
Returns:
RadarGrid:
"""
return self.grids[tuple(item)]
def __contains__(self, item):
@ -188,6 +195,7 @@ class Radar:
Returns:
"""
image = Image.fromarray(MASK_RADAR.apply(image))
for grid in self:
grid.image = image
grid.reset()
@ -275,7 +283,8 @@ class Radar:
"""
self.predict(image)
for location in [(0, 1), (-1, 0), (1, 0), (0, -1)]:
if self[location].is_question:
grid = self[location]
if grid.is_question and not grid.predict_port():
return location
return None