diff --git a/assets/cn/template/TEMPLATE_SIREN_3.png b/assets/cn/template/TEMPLATE_SIREN_BB.png similarity index 100% rename from assets/cn/template/TEMPLATE_SIREN_3.png rename to assets/cn/template/TEMPLATE_SIREN_BB.png diff --git a/assets/cn/template/TEMPLATE_SIREN_2.png b/assets/cn/template/TEMPLATE_SIREN_CA.png similarity index 100% rename from assets/cn/template/TEMPLATE_SIREN_2.png rename to assets/cn/template/TEMPLATE_SIREN_CA.png diff --git a/assets/cn/template/TEMPLATE_SIREN_1.png b/assets/cn/template/TEMPLATE_SIREN_CL.png similarity index 100% rename from assets/cn/template/TEMPLATE_SIREN_1.png rename to assets/cn/template/TEMPLATE_SIREN_CL.png diff --git a/assets/cn/template/TEMPLATE_SIREN_CV.png b/assets/cn/template/TEMPLATE_SIREN_CV.png new file mode 100644 index 000000000..d30551b3e Binary files /dev/null and b/assets/cn/template/TEMPLATE_SIREN_CV.png differ diff --git a/assets/en/template/TEMPLATE_SIREN_3.png b/assets/en/template/TEMPLATE_SIREN_BB.png similarity index 100% rename from assets/en/template/TEMPLATE_SIREN_3.png rename to assets/en/template/TEMPLATE_SIREN_BB.png diff --git a/assets/en/template/TEMPLATE_SIREN_2.png b/assets/en/template/TEMPLATE_SIREN_CA.png similarity index 100% rename from assets/en/template/TEMPLATE_SIREN_2.png rename to assets/en/template/TEMPLATE_SIREN_CA.png diff --git a/assets/en/template/TEMPLATE_SIREN_1.png b/assets/en/template/TEMPLATE_SIREN_CL.png similarity index 100% rename from assets/en/template/TEMPLATE_SIREN_1.png rename to assets/en/template/TEMPLATE_SIREN_CL.png diff --git a/assets/en/template/TEMPLATE_SIREN_CV.png b/assets/en/template/TEMPLATE_SIREN_CV.png new file mode 100644 index 000000000..d30551b3e Binary files /dev/null and b/assets/en/template/TEMPLATE_SIREN_CV.png differ diff --git a/assets/jp/template/TEMPLATE_SIREN_3.png b/assets/jp/template/TEMPLATE_SIREN_BB.png similarity index 100% rename from assets/jp/template/TEMPLATE_SIREN_3.png rename to assets/jp/template/TEMPLATE_SIREN_BB.png diff --git a/assets/jp/template/TEMPLATE_SIREN_2.png b/assets/jp/template/TEMPLATE_SIREN_CA.png similarity index 100% rename from assets/jp/template/TEMPLATE_SIREN_2.png rename to assets/jp/template/TEMPLATE_SIREN_CA.png diff --git a/assets/jp/template/TEMPLATE_SIREN_1.png b/assets/jp/template/TEMPLATE_SIREN_CL.png similarity index 100% rename from assets/jp/template/TEMPLATE_SIREN_1.png rename to assets/jp/template/TEMPLATE_SIREN_CL.png diff --git a/assets/jp/template/TEMPLATE_SIREN_CV.png b/assets/jp/template/TEMPLATE_SIREN_CV.png new file mode 100644 index 000000000..d30551b3e Binary files /dev/null and b/assets/jp/template/TEMPLATE_SIREN_CV.png differ diff --git a/module/config/config.py b/module/config/config.py index e7e06d6fe..dd50db060 100644 --- a/module/config/config.py +++ b/module/config/config.py @@ -239,7 +239,7 @@ class AzurLaneConfig: 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_SIREN_TEMPLATE = ['1', '2', '3', 'DD'] + MAP_SIREN_TEMPLATE = ['DD', 'CL', 'CA', 'BB', 'CV'] MAP_SIREN_COUNT = 0 MAP_MYSTERY_HAS_CARRIER = False MAP_GRID_CENTER_TOLERANCE = 0.1 diff --git a/module/map/grid_info.py b/module/map/grid_info.py index bc1371e24..7cc88bcd5 100644 --- a/module/map/grid_info.py +++ b/module/map/grid_info.py @@ -84,7 +84,7 @@ class GridInfo: return key if self.is_siren: - return ''.join([text[0] for text in self.enemy_genre.split('_')]).upper() if self.enemy_genre else 'SU' + return self.enemy_genre.split('_')[1][:2].upper() if self.enemy_genre else 'SU' if self.is_enemy: return '%s%s' % (self.enemy_scale, self.enemy_genre[0].upper()) \ diff --git a/module/template/assets.py b/module/template/assets.py index 47c26494c..83138a6dc 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -21,10 +21,11 @@ TEMPLATE_FORMATION_1 = Template(file={'cn': './assets/cn/template/TEMPLATE_FORMA TEMPLATE_FORMATION_2 = Template(file={'cn': './assets/cn/template/TEMPLATE_FORMATION_2.png', 'en': './assets/en/template/TEMPLATE_FORMATION_2.png', 'jp': './assets/jp/template/TEMPLATE_FORMATION_2.png'}) TEMPLATE_FORMATION_3 = Template(file={'cn': './assets/cn/template/TEMPLATE_FORMATION_3.png', 'en': './assets/en/template/TEMPLATE_FORMATION_3.png', 'jp': './assets/jp/template/TEMPLATE_FORMATION_3.png'}) TEMPLATE_MAP_WALK_OUT_OF_STEP = Template(file={'cn': './assets/cn/template/TEMPLATE_MAP_WALK_OUT_OF_STEP.png', 'en': './assets/en/template/TEMPLATE_MAP_WALK_OUT_OF_STEP.png', 'jp': './assets/jp/template/TEMPLATE_MAP_WALK_OUT_OF_STEP.png'}) -TEMPLATE_SIREN_1 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_1.png', 'en': './assets/en/template/TEMPLATE_SIREN_1.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_1.png'}) -TEMPLATE_SIREN_2 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_2.png', 'en': './assets/en/template/TEMPLATE_SIREN_2.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_2.png'}) -TEMPLATE_SIREN_3 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_3.png', 'en': './assets/en/template/TEMPLATE_SIREN_3.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_3.png'}) TEMPLATE_SIREN_Algerie = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Algerie.png', 'en': './assets/en/template/TEMPLATE_SIREN_Algerie.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_Algerie.png'}) +TEMPLATE_SIREN_BB = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BB.png', 'en': './assets/en/template/TEMPLATE_SIREN_BB.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_BB.png'}) +TEMPLATE_SIREN_CA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CA.png', 'en': './assets/en/template/TEMPLATE_SIREN_CA.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_CA.png'}) +TEMPLATE_SIREN_CL = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CL.png', 'en': './assets/en/template/TEMPLATE_SIREN_CL.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_CL.png'}) +TEMPLATE_SIREN_CV = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CV.png', 'en': './assets/cn/template/TEMPLATE_SIREN_CV.png', 'jp': './assets/cn/template/TEMPLATE_SIREN_CV.png'}) TEMPLATE_SIREN_DD = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_DD.png', 'en': './assets/en/template/TEMPLATE_SIREN_DD.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_DD.png'}) TEMPLATE_SIREN_LaGalissonniere = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.png', 'en': './assets/en/template/TEMPLATE_SIREN_LaGalissonniere.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.png'}) TEMPLATE_SIREN_Vauquelin = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Vauquelin.png', 'en': './assets/en/template/TEMPLATE_SIREN_Vauquelin.png', 'jp': './assets/jp/template/TEMPLATE_SIREN_Vauquelin.png'})