diff --git a/module/map_detection/grid_info.py b/module/map_detection/grid_info.py index 99fa12c05..eb9432610 100644 --- a/module/map_detection/grid_info.py +++ b/module/map_detection/grid_info.py @@ -156,6 +156,12 @@ class GridInfo: Returns: bool: If success. """ + if info.is_caught_by_siren: + if self.is_sea: + self.is_fleet = True + self.is_caught_by_siren = True + else: + return False if info.is_fleet: if self.is_sea: self.is_fleet = True diff --git a/module/map_detection/grid_predictor.py b/module/map_detection/grid_predictor.py index f157de51d..b10c3fc72 100644 --- a/module/map_detection/grid_predictor.py +++ b/module/map_detection/grid_predictor.py @@ -64,6 +64,7 @@ class GridPredictor: self.is_fleet = self.predict_fleet() self.is_mystery = self.predict_mystery() self.is_current_fleet = self.predict_current_fleet() + # self.is_caught_by_siren = self.predict_caught_by_siren() if self.enemy_genre: self.is_enemy = True @@ -182,6 +183,10 @@ class GridPredictor: image = color_similarity_2d(image, color=(255, 255, 255)) return TEMPLATE_FLEET_AMMO.match(image) + def predict_caught_by_siren(self): + image = self.relative_crop((-1, -1.5, 1, 0.5), shape=(120, 120)) + return TEMPLATE_CAUGHT_BY_SIREN.match(image, similarity=0.6) + def predict_mystery(self): """ Returns: