diff --git a/assets/cn/template/TEMPLATE_SIREN_Joffre.gif b/assets/cn/template/TEMPLATE_SIREN_Joffre.gif new file mode 100644 index 000000000..df893911e Binary files /dev/null and b/assets/cn/template/TEMPLATE_SIREN_Joffre.gif differ diff --git a/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif b/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif index 34b20c42e..82be71179 100644 Binary files a/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif and b/assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif differ diff --git a/assets/cn/template/TEMPLATE_SIREN_LeMars.gif b/assets/cn/template/TEMPLATE_SIREN_LeMars.gif new file mode 100644 index 000000000..61f46b967 Binary files /dev/null and b/assets/cn/template/TEMPLATE_SIREN_LeMars.gif differ diff --git a/assets/en/template/TEMPLATE_SIREN_Joffre.gif b/assets/en/template/TEMPLATE_SIREN_Joffre.gif new file mode 100644 index 000000000..df893911e Binary files /dev/null and b/assets/en/template/TEMPLATE_SIREN_Joffre.gif differ diff --git a/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif b/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif index 34b20c42e..82be71179 100644 Binary files a/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif and b/assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif differ diff --git a/assets/en/template/TEMPLATE_SIREN_LeMars.gif b/assets/en/template/TEMPLATE_SIREN_LeMars.gif new file mode 100644 index 000000000..61f46b967 Binary files /dev/null and b/assets/en/template/TEMPLATE_SIREN_LeMars.gif differ diff --git a/assets/jp/template/TEMPLATE_SIREN_Joffre.gif b/assets/jp/template/TEMPLATE_SIREN_Joffre.gif new file mode 100644 index 000000000..df893911e Binary files /dev/null and b/assets/jp/template/TEMPLATE_SIREN_Joffre.gif differ diff --git a/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif b/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif index 34b20c42e..82be71179 100644 Binary files a/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif and b/assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif differ diff --git a/assets/jp/template/TEMPLATE_SIREN_LeMars.gif b/assets/jp/template/TEMPLATE_SIREN_LeMars.gif new file mode 100644 index 000000000..61f46b967 Binary files /dev/null and b/assets/jp/template/TEMPLATE_SIREN_LeMars.gif differ diff --git a/assets/tw/template/TEMPLATE_SIREN_Joffre.gif b/assets/tw/template/TEMPLATE_SIREN_Joffre.gif new file mode 100644 index 000000000..df893911e Binary files /dev/null and b/assets/tw/template/TEMPLATE_SIREN_Joffre.gif differ diff --git a/assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif b/assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif index 34b20c42e..82be71179 100644 Binary files a/assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif and b/assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif differ diff --git a/assets/tw/template/TEMPLATE_SIREN_LeMars.gif b/assets/tw/template/TEMPLATE_SIREN_LeMars.gif new file mode 100644 index 000000000..61f46b967 Binary files /dev/null and b/assets/tw/template/TEMPLATE_SIREN_LeMars.gif differ diff --git a/campaign/event_20230223_cn/a1.py b/campaign/event_20230223_cn/a1.py new file mode 100644 index 000000000..891dcbfc6 --- /dev/null +++ b/campaign/event_20230223_cn/a1.py @@ -0,0 +1,77 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('A1') +MAP.shape = 'H8' +MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] +MAP.camera_data_spawn_point = ['E6', 'D6'] +MAP.map_data = """ + ++ -- -- -- ME -- ME -- + -- MB -- ME ++ ME -- ++ + ME -- -- Me ++ Me -- ME + ME -- -- -- MS -- -- -- + -- ME Me -- -- __ ++ ++ + -- ++ ++ ++ Me -- MS ++ + -- -- Me -- -- -- -- -- + ++ -- -- SP SP -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1, 'boss': 1}, + {'battle': 4, 'enemy': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ +A7, B7, C7, D7, E7, F7, G7, H7, \ +A8, B8, C8, D8, E8, F8, G8, H8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['Joffre'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.517 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.467 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_3(self): + return self.clear_boss() diff --git a/campaign/event_20230223_cn/a2.py b/campaign/event_20230223_cn/a2.py new file mode 100644 index 000000000..19a460d70 --- /dev/null +++ b/campaign/event_20230223_cn/a2.py @@ -0,0 +1,75 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .a1 import Config as ConfigBase + +MAP = CampaignMap('A2') +MAP.shape = 'I7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D2', 'D5'] +MAP.map_data = """ + ++ ++ -- Me -- ME ++ ++ ++ + ++ ++ Me -- -- -- -- MB -- + SP -- MS -- Me ME __ -- ME + -- -- MS ++ ++ ++ ME ME ++ + SP -- MS -- -- -- -- -- ++ + ++ -- -- -- ME Me ME -- -- + ++ -- Me ME -- ++ -- ME -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['LeMars'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.609 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.556 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_4(self): + return self.clear_boss() diff --git a/campaign/event_20230223_cn/a3.py b/campaign/event_20230223_cn/a3.py new file mode 100644 index 000000000..062543d79 --- /dev/null +++ b/campaign/event_20230223_cn/a3.py @@ -0,0 +1,78 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .a1 import Config as ConfigBase + +MAP = CampaignMap('A3') +MAP.shape = 'I8' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + ME -- ME -- -- -- -- ME -- + -- ME -- Me -- ME ME -- ++ + -- ++ ME __ -- ++ ++ ME ME + -- ++ MS -- MB ++ ++ -- -- + -- -- -- MS -- Me -- -- ME + -- SP -- -- MS -- -- ME ++ + -- -- SP -- Me -- ME -- ++ + -- -- -- -- ++ ++ ++ -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['LaGalissonniere'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.552 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.500 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_4(self): + return self.clear_boss() diff --git a/campaign/event_20230223_cn/c1.py b/campaign/event_20230223_cn/c1.py new file mode 100644 index 000000000..213161bb0 --- /dev/null +++ b/campaign/event_20230223_cn/c1.py @@ -0,0 +1,77 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('C1') +MAP.shape = 'H8' +MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] +MAP.camera_data_spawn_point = ['E6', 'D6'] +MAP.map_data = """ + ++ -- -- -- ME -- ME -- + -- MB -- ME ++ ME -- ++ + ME -- -- Me ++ Me -- ME + ME -- -- -- MS -- -- -- + -- ME Me -- -- __ ++ ++ + -- ++ ++ ++ Me -- MS ++ + -- -- Me -- -- -- -- -- + ++ -- -- SP SP -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ +A7, B7, C7, D7, E7, F7, G7, H7, \ +A8, B8, C8, D8, E8, F8, G8, H8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['Joffre'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.517 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.467 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_4(self): + return self.clear_boss() diff --git a/campaign/event_20230223_cn/c2.py b/campaign/event_20230223_cn/c2.py new file mode 100644 index 000000000..417ac7a65 --- /dev/null +++ b/campaign/event_20230223_cn/c2.py @@ -0,0 +1,75 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .c1 import Config as ConfigBase + +MAP = CampaignMap('C2') +MAP.shape = 'I7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D2', 'D5'] +MAP.map_data = """ + ++ ++ -- Me -- ME ++ ++ ++ + ++ ++ Me -- -- -- -- MB -- + SP -- MS -- Me ME __ -- ME + -- -- MS ++ ++ ++ ME ME ++ + SP -- MS -- -- -- -- -- ++ + ++ -- -- -- ME Me ME -- -- + ++ -- Me ME -- ++ -- ME -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['LeMars'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.609 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.556 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_4(self): + return self.clear_boss() diff --git a/campaign/event_20230223_cn/c3.py b/campaign/event_20230223_cn/c3.py new file mode 100644 index 000000000..a37f4bc91 --- /dev/null +++ b/campaign/event_20230223_cn/c3.py @@ -0,0 +1,79 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .c1 import Config as ConfigBase + +MAP = CampaignMap('C3') +MAP.shape = 'I8' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + ME -- ME -- -- -- -- ME -- + -- ME -- Me -- ME ME -- ++ + -- ++ ME __ -- ++ ++ ME ME + -- ++ MS -- MB ++ ++ -- -- + -- -- -- MS -- Me -- -- ME + -- SP -- -- MS -- -- ME ++ + -- -- SP -- Me -- ME -- ++ + -- -- -- -- ++ ++ ++ -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1}, + {'battle': 5, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = ['LaGalissonniere'] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = True + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + + MAP_SWIPE_MULTIPLY = 1.552 + MAP_SWIPE_MULTIPLY_MINITOUCH = 1.500 + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_5(self): + return self.fleet_boss.clear_boss() diff --git a/dev_tools/map_extractor.py b/dev_tools/map_extractor.py index f477fa79b..a5c88c855 100644 --- a/dev_tools/map_extractor.py +++ b/dev_tools/map_extractor.py @@ -212,6 +212,10 @@ DIC_SIREN_NAME_CHI_TO_ENG = { # Parallel Superimposition 'sairenboss15': 'SirenBoss15', 'sairenboss16': 'SirenBoss16', + + # Revelations of Dust + 'xiafei': 'Joffre', + 'lemaer': 'LeMars', } diff --git a/module/template/assets.py b/module/template/assets.py index 4fdbc576f..41289a89c 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -106,6 +106,7 @@ TEMPLATE_SIREN_Intruder = Template(file={'cn': './assets/cn/template/TEMPLATE_SI TEMPLATE_SIREN_IoriMinase = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_IoriMinase.gif', 'en': './assets/en/template/TEMPLATE_SIREN_IoriMinase.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_IoriMinase.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_IoriMinase.gif'}) TEMPLATE_SIREN_Ise = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Ise.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Ise.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Ise.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Ise.gif'}) TEMPLATE_SIREN_Jintsuu = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Jintsuu.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Jintsuu.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Jintsuu.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Jintsuu.gif'}) +TEMPLATE_SIREN_Joffre = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Joffre.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Joffre.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Joffre.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Joffre.gif'}) TEMPLATE_SIREN_Juno_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Juno_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Juno_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Juno_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Juno_ghost.gif'}) TEMPLATE_SIREN_Junyo = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Junyo.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Junyo.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Junyo.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Junyo.gif'}) TEMPLATE_SIREN_Jupiter_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Jupiter_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Jupiter_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Jupiter_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Jupiter_ghost.gif'}) @@ -121,6 +122,7 @@ TEMPLATE_SIREN_Kongo = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN TEMPLATE_SIREN_LaGalissonniere = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif'}) TEMPLATE_SIREN_Leipzig = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Leipzig.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Leipzig.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Leipzig.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Leipzig.gif'}) TEMPLATE_SIREN_LeMalinIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LeMalinIdol.gif'}) +TEMPLATE_SIREN_LeMars = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LeMars.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LeMars.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LeMars.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LeMars.gif'}) TEMPLATE_SIREN_LeMars_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LeMars_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LeMars_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LeMars_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LeMars_ghost.gif'}) TEMPLATE_SIREN_Lexington = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Lexington.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Lexington.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Lexington.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Lexington.gif'}) TEMPLATE_SIREN_Littorio = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Littorio.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Littorio.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Littorio.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Littorio.gif'})