diff --git a/assets/cn/template/TEMPLATE_ENEMY_CARRIER.png b/assets/cn/template/TEMPLATE_ENEMY_Carrier.png similarity index 100% rename from assets/cn/template/TEMPLATE_ENEMY_CARRIER.png rename to assets/cn/template/TEMPLATE_ENEMY_Carrier.png diff --git a/assets/cn/template/TEMPLATE_ENEMY_LIGHT.png b/assets/cn/template/TEMPLATE_ENEMY_Light.png similarity index 100% rename from assets/cn/template/TEMPLATE_ENEMY_LIGHT.png rename to assets/cn/template/TEMPLATE_ENEMY_Light.png diff --git a/assets/cn/template/TEMPLATE_ENEMY_MAIN.png b/assets/cn/template/TEMPLATE_ENEMY_Main.png similarity index 100% rename from assets/cn/template/TEMPLATE_ENEMY_MAIN.png rename to assets/cn/template/TEMPLATE_ENEMY_Main.png diff --git a/assets/cn/template/TEMPLATE_ENEMY_TREASURE.png b/assets/cn/template/TEMPLATE_ENEMY_Treasure.png similarity index 100% rename from assets/cn/template/TEMPLATE_ENEMY_TREASURE.png rename to assets/cn/template/TEMPLATE_ENEMY_Treasure.png diff --git a/assets/cn/template/TEMPLATE_SIREN_Algerie.png b/assets/cn/template/TEMPLATE_SIREN_Algerie.png index 761b9e089..ba5825621 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_Algerie.png and b/assets/cn/template/TEMPLATE_SIREN_Algerie.png differ diff --git a/assets/cn/template/TEMPLATE_SIREN_BB.png b/assets/cn/template/TEMPLATE_SIREN_BB.png deleted file mode 100644 index b1169b640..000000000 Binary files a/assets/cn/template/TEMPLATE_SIREN_BB.png and /dev/null differ diff --git a/assets/cn/template/TEMPLATE_SIREN_CA.png b/assets/cn/template/TEMPLATE_SIREN_CA.png deleted file mode 100644 index c5ac71a31..000000000 Binary files a/assets/cn/template/TEMPLATE_SIREN_CA.png and /dev/null differ diff --git a/assets/cn/template/TEMPLATE_SIREN_CL.png b/assets/cn/template/TEMPLATE_SIREN_CL.png deleted file mode 100644 index 63c1ebbba..000000000 Binary files a/assets/cn/template/TEMPLATE_SIREN_CL.png and /dev/null differ diff --git a/assets/cn/template/TEMPLATE_SIREN_CV.png b/assets/cn/template/TEMPLATE_SIREN_CV.png deleted file mode 100644 index d30551b3e..000000000 Binary files a/assets/cn/template/TEMPLATE_SIREN_CV.png and /dev/null differ diff --git a/assets/cn/template/TEMPLATE_SIREN_DD.png b/assets/cn/template/TEMPLATE_SIREN_DD.png deleted file mode 100644 index dc1fb8deb..000000000 Binary files a/assets/cn/template/TEMPLATE_SIREN_DD.png and /dev/null differ diff --git a/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.png b/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.png index e57eaebeb..d991a6b5a 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.png and b/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.png differ diff --git a/assets/cn/template/TEMPLATE_SIREN_Vauquelin.png b/assets/cn/template/TEMPLATE_SIREN_Vauquelin.png index 454bc978b..68d0cfc21 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_Vauquelin.png and b/assets/cn/template/TEMPLATE_SIREN_Vauquelin.png differ diff --git a/assets/cn/template/TEMPLATE_SIREN_Z18.png b/assets/cn/template/TEMPLATE_SIREN_Z18.png index 4035a0d03..791e2ca85 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_Z18.png and b/assets/cn/template/TEMPLATE_SIREN_Z18.png differ diff --git a/assets/cn/template/TEMPLATE_SIREN_Z19.png b/assets/cn/template/TEMPLATE_SIREN_Z19.png index cb58a4430..19fe977b8 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_Z19.png and b/assets/cn/template/TEMPLATE_SIREN_Z19.png differ diff --git a/assets/cn/template/TEMPLATE_SIREN_Z2.png b/assets/cn/template/TEMPLATE_SIREN_Z2.png index c518d611d..8286658e8 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_Z2.png and b/assets/cn/template/TEMPLATE_SIREN_Z2.png differ diff --git a/assets/en/template/TEMPLATE_ENEMY_CARRIER.png b/assets/en/template/TEMPLATE_ENEMY_Carrier.png similarity index 100% rename from assets/en/template/TEMPLATE_ENEMY_CARRIER.png rename to assets/en/template/TEMPLATE_ENEMY_Carrier.png diff --git a/assets/en/template/TEMPLATE_ENEMY_LIGHT.png b/assets/en/template/TEMPLATE_ENEMY_Light.png similarity index 100% rename from assets/en/template/TEMPLATE_ENEMY_LIGHT.png rename to assets/en/template/TEMPLATE_ENEMY_Light.png diff --git a/assets/en/template/TEMPLATE_ENEMY_MAIN.png b/assets/en/template/TEMPLATE_ENEMY_Main.png similarity index 100% rename from assets/en/template/TEMPLATE_ENEMY_MAIN.png rename to assets/en/template/TEMPLATE_ENEMY_Main.png diff --git a/assets/en/template/TEMPLATE_ENEMY_TREASURE.png b/assets/en/template/TEMPLATE_ENEMY_Treasure.png similarity index 100% rename from assets/en/template/TEMPLATE_ENEMY_TREASURE.png rename to assets/en/template/TEMPLATE_ENEMY_Treasure.png diff --git a/assets/en/template/TEMPLATE_SIREN_Algerie.png b/assets/en/template/TEMPLATE_SIREN_Algerie.png index 761b9e089..ba5825621 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_Algerie.png and b/assets/en/template/TEMPLATE_SIREN_Algerie.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_BB.png b/assets/en/template/TEMPLATE_SIREN_BB.png deleted file mode 100644 index b1169b640..000000000 Binary files a/assets/en/template/TEMPLATE_SIREN_BB.png and /dev/null differ diff --git a/assets/en/template/TEMPLATE_SIREN_CA.png b/assets/en/template/TEMPLATE_SIREN_CA.png deleted file mode 100644 index c5ac71a31..000000000 Binary files a/assets/en/template/TEMPLATE_SIREN_CA.png and /dev/null differ diff --git a/assets/en/template/TEMPLATE_SIREN_CL.png b/assets/en/template/TEMPLATE_SIREN_CL.png deleted file mode 100644 index 63c1ebbba..000000000 Binary files a/assets/en/template/TEMPLATE_SIREN_CL.png and /dev/null differ diff --git a/assets/en/template/TEMPLATE_SIREN_CV.png b/assets/en/template/TEMPLATE_SIREN_CV.png deleted file mode 100644 index d30551b3e..000000000 Binary files a/assets/en/template/TEMPLATE_SIREN_CV.png and /dev/null differ diff --git a/assets/en/template/TEMPLATE_SIREN_DD.png b/assets/en/template/TEMPLATE_SIREN_DD.png deleted file mode 100644 index dc1fb8deb..000000000 Binary files a/assets/en/template/TEMPLATE_SIREN_DD.png and /dev/null differ diff --git a/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.png b/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.png index e57eaebeb..d991a6b5a 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.png and b/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_Vauquelin.png b/assets/en/template/TEMPLATE_SIREN_Vauquelin.png index 454bc978b..68d0cfc21 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_Vauquelin.png and b/assets/en/template/TEMPLATE_SIREN_Vauquelin.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_Z18.png b/assets/en/template/TEMPLATE_SIREN_Z18.png index 4035a0d03..791e2ca85 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_Z18.png and b/assets/en/template/TEMPLATE_SIREN_Z18.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_Z19.png b/assets/en/template/TEMPLATE_SIREN_Z19.png index cb58a4430..19fe977b8 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_Z19.png and b/assets/en/template/TEMPLATE_SIREN_Z19.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_Z2.png b/assets/en/template/TEMPLATE_SIREN_Z2.png index c518d611d..8286658e8 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_Z2.png and b/assets/en/template/TEMPLATE_SIREN_Z2.png differ diff --git a/assets/jp/template/TEMPLATE_ENEMY_CARRIER.png b/assets/jp/template/TEMPLATE_ENEMY_Carrier.png similarity index 100% rename from assets/jp/template/TEMPLATE_ENEMY_CARRIER.png rename to assets/jp/template/TEMPLATE_ENEMY_Carrier.png diff --git a/assets/jp/template/TEMPLATE_ENEMY_LIGHT.png b/assets/jp/template/TEMPLATE_ENEMY_Light.png similarity index 100% rename from assets/jp/template/TEMPLATE_ENEMY_LIGHT.png rename to assets/jp/template/TEMPLATE_ENEMY_Light.png diff --git a/assets/jp/template/TEMPLATE_ENEMY_MAIN.png b/assets/jp/template/TEMPLATE_ENEMY_Main.png similarity index 100% rename from assets/jp/template/TEMPLATE_ENEMY_MAIN.png rename to assets/jp/template/TEMPLATE_ENEMY_Main.png diff --git a/assets/jp/template/TEMPLATE_ENEMY_TREASURE.png b/assets/jp/template/TEMPLATE_ENEMY_Treasure.png similarity index 100% rename from assets/jp/template/TEMPLATE_ENEMY_TREASURE.png rename to assets/jp/template/TEMPLATE_ENEMY_Treasure.png diff --git a/assets/jp/template/TEMPLATE_SIREN_Algerie.png b/assets/jp/template/TEMPLATE_SIREN_Algerie.png index 761b9e089..ba5825621 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_Algerie.png and b/assets/jp/template/TEMPLATE_SIREN_Algerie.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_BB.png b/assets/jp/template/TEMPLATE_SIREN_BB.png deleted file mode 100644 index b1169b640..000000000 Binary files a/assets/jp/template/TEMPLATE_SIREN_BB.png and /dev/null differ diff --git a/assets/jp/template/TEMPLATE_SIREN_CA.png b/assets/jp/template/TEMPLATE_SIREN_CA.png deleted file mode 100644 index c5ac71a31..000000000 Binary files a/assets/jp/template/TEMPLATE_SIREN_CA.png and /dev/null differ diff --git a/assets/jp/template/TEMPLATE_SIREN_CL.png b/assets/jp/template/TEMPLATE_SIREN_CL.png deleted file mode 100644 index 63c1ebbba..000000000 Binary files a/assets/jp/template/TEMPLATE_SIREN_CL.png and /dev/null differ diff --git a/assets/jp/template/TEMPLATE_SIREN_CV.png b/assets/jp/template/TEMPLATE_SIREN_CV.png deleted file mode 100644 index d30551b3e..000000000 Binary files a/assets/jp/template/TEMPLATE_SIREN_CV.png and /dev/null differ diff --git a/assets/jp/template/TEMPLATE_SIREN_DD.png b/assets/jp/template/TEMPLATE_SIREN_DD.png deleted file mode 100644 index dc1fb8deb..000000000 Binary files a/assets/jp/template/TEMPLATE_SIREN_DD.png and /dev/null differ diff --git a/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.png b/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.png index e57eaebeb..d991a6b5a 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.png and b/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_Vauquelin.png b/assets/jp/template/TEMPLATE_SIREN_Vauquelin.png index 454bc978b..68d0cfc21 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_Vauquelin.png and b/assets/jp/template/TEMPLATE_SIREN_Vauquelin.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_Z18.png b/assets/jp/template/TEMPLATE_SIREN_Z18.png index 4035a0d03..791e2ca85 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_Z18.png and b/assets/jp/template/TEMPLATE_SIREN_Z18.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_Z19.png b/assets/jp/template/TEMPLATE_SIREN_Z19.png index cb58a4430..19fe977b8 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_Z19.png and b/assets/jp/template/TEMPLATE_SIREN_Z19.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_Z2.png b/assets/jp/template/TEMPLATE_SIREN_Z2.png index c518d611d..8286658e8 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_Z2.png and b/assets/jp/template/TEMPLATE_SIREN_Z2.png differ diff --git a/module/config/config.py b/module/config/config.py index 494260fbd..660237ab9 100644 --- a/module/config/config.py +++ b/module/config/config.py @@ -237,8 +237,9 @@ class AzurLaneConfig: MAP_HAS_MAP_STORY = False # event_20200521_cn(穹顶下的圣咏曲) adds after-combat story. MAP_HAS_WALL = False # event_20200521_cn(穹顶下的圣咏曲) adds wall between grids. MAP_HAS_PT_BONUS = False # 100% PT bonus if success to catch enemy else 50%. Retreat get 0%. - MAP_SIREN_MOVE_WAIT = 1.5 # The enemy moving takes about 1.2 ~ 1.5s. + MAP_ENEMY_TEMPLATE = ['Light', 'Main', 'Carrier', 'Treasure'] MAP_SIREN_TEMPLATE = ['DD', 'CL', 'CA', 'BB', 'CV'] + MAP_SIREN_MOVE_WAIT = 1.5 # The enemy moving takes about 1.2 ~ 1.5s. MAP_SIREN_COUNT = 0 MAP_MYSTERY_HAS_CARRIER = False MAP_GRID_CENTER_TOLERANCE = 0.1 diff --git a/module/map/grid_predictor.py b/module/map/grid_predictor.py index 41426d343..677d050d3 100644 --- a/module/map/grid_predictor.py +++ b/module/map/grid_predictor.py @@ -35,6 +35,13 @@ class GridPredictor: self.image = image self.corner = corner.flatten() + self.template_enemy_genre = {} + for name in self.config.MAP_ENEMY_TEMPLATE: + self.DIC_ENEMY_GENRE[name] = globals().get(f'TEMPLATE_ENEMY_{name}') + if self.config.MAP_HAS_SIREN: + for name in self.config.MAP_SIREN_TEMPLATE: + self.DIC_ENEMY_GENRE[f'Siren_{name}'] = globals().get(f'TEMPLATE_SIREN_{name}') + x0, y0, x1, y1, x2, y2, x3, y3 = self.corner divisor = x0 - x1 + x2 - x3 x = (x0 * x2 - x1 * x3) / divisor @@ -263,14 +270,7 @@ class GridPredictor: def predict_enemy_genre(self): image = self.get_relative_image((-1, -1, 1, 0), output_shape=(120, 60)) - if not self.SIREN_TEMPLATE_LOADED: - for name in self.config.MAP_SIREN_TEMPLATE: - self.DIC_ENEMY_GENRE[f'Siren_{name}'] = globals().get(f'TEMPLATE_SIREN_{name}') - self.SIREN_TEMPLATE_LOADED = True - - for name, template in self.DIC_ENEMY_GENRE.items(): - if not self.config.MAP_HAS_SIREN and name.startswith('Siren'): - continue + for name, template in self.template_enemy_genre.items(): if template.match(image): return name