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

Fix: Treat is_question as is_port outside of OpSi ports

Browse Source
This commit is contained in:
LmeSzinc
2023-04-11 21:48:09 +08:00
parent 26851c1473
commit 44bd0e4e81
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/os/radar.py
View File

@@ -325,19 +325,25 @@ class Radar:
return None
def predict_question(self, image):
def predict_question(self, image, in_port=True):
"""
Args:
image: Screenshot.
in_port (bool): False to treat is_port as is_question
Returns:
tuple: Grid location of question mark on radar, or None if nothing found.
"""
self.predict(image)
self.show()
for location in [(0, 1), (-1, 0), (1, 0), (0, -1), (0, -2), (0, -3)]:
grid = self[location]
if grid.is_question and not grid.predict_port():
return location
if in_port:
if grid.is_question and not grid.is_port:
return location
else:
if grid.is_question or grid.is_port:
return location
return None