Add: Chapter SP

campaign/event_20260417_cn/campaign_base.py

@@ -0,0 +1,38 @@
+from module.base.button import Button
+from module.campaign.campaign_base import CampaignBase as CampaignBase_
+from module.logger import logger
+
+EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
+                         name='EVENT_ANIMATION')
+
+
+class CampaignBase(CampaignBase_):
+    @staticmethod
+    def _campaign_ocr_result_process(result):
+        result = CampaignBase_._campaign_ocr_result_process(result)
+        if result in ['ysp', 'usp', 'vsp']:
+            result = 'sp'
+        return result
+
+    def is_event_animation(self):
+        """
+        Animation in events after cleared an enemy.
+
+        Returns:
+            bool: If animation appearing.
+        """
+        appear = self.appear(EVENT_ANIMATION)
+        if appear:
+            logger.info('DOA animation, waiting')
+        return appear
+
+    def event_animation_end(self):
+        if not self.appear(EVENT_ANIMATION):
+            return False
+        # wait until EVENT_ANIMATION closed
+        for _ in self.loop():
+            if self.is_event_animation():
+                continue
+            break
+        # now in_map
+        return True

campaign/event_20260417_cn/sp.py

@@ -0,0 +1,114 @@
+from .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('VSP')
+MAP.shape = 'I9'
+MAP.camera_data = ['D3', 'D6', 'E3', 'E6']
+MAP.camera_data_spawn_point = ['D3', 'D6']
+MAP.map_data = """
+    ++ ++ -- ++ ++ ++ -- ++ ++
+    ++ ++ -- ME -- ME -- ++ ++
+    ++ ME -- -- -- -- -- ME ++
+    SP -- -- MS -- ME -- -- --
+    -- __ MS -- ++ -- -- MB --
+    SP -- -- MS -- 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
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 12, 'siren': 3},
+    {'battle': 1},
+    {'battle': 2},
+    {'battle': 3},
+    {'battle': 4},
+    {'battle': 5},
+    {'battle': 6},
+    {'battle': 7, '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, \
+A9, B9, C9, D9, E9, F9, G9, H9, I9, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['Lexington2', 'Yorktown2']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = False
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    STAR_REQUIRE_1 = 0
+    STAR_REQUIRE_2 = 0
+    STAR_REQUIRE_3 = 0
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219_SPEX = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (80, 255 - 49),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 49, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    MAP_IS_ONE_TIME_STAGE = True
+
+
+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=2):
+            return True
+
+        return self.battle_default()
+
+    def battle_5(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_7(self):
+        return self.fleet_boss.clear_boss()
+
+    def _expected_end(self, expected):
+        # after 4th battle, no enemy search but has event animation
+        # we wait until event animation appears, otherwise next map walk will click on animation popup
+        if self.battle_count == 3:
+            return self.event_animation_end
+        return super()._expected_end(expected)

campaign/event_20260417_cn/sp1.py

@@ -0,0 +1,91 @@
+from .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('SP1')
+MAP.shape = 'I8'
+MAP.camera_data = ['D2', 'D6', 'F2', 'F6']
+MAP.camera_data_spawn_point = ['F2']
+MAP.map_data = """
+    -- -- -- ME -- -- -- ++ ++
+    ME -- ME ++ Me -- SP -- ++
+    -- ME -- ++ -- -- -- SP --
+    -- ++ -- Me -- MS -- -- --
+    -- -- -- -- -- ++ ++ ++ ME
+    -- MB -- __ -- Me -- 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
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, '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:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['Bremerton']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219_SPEX = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (80, 255 - 49),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 49, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    MAP_SWIPE_MULTIPLY = (1.188, 1.210)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.149, 1.170)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.116, 1.136)
+
+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()

campaign/event_20260417_cn/sp2.py

@@ -0,0 +1,79 @@
+from .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 .sp1 import Config as ConfigBase
+
+MAP = CampaignMap('SP2')
+MAP.shape = 'I8'
+MAP.camera_data = ['D2', 'D6', 'E2', 'E6']
+MAP.camera_data_spawn_point = ['D2', 'E2']
+MAP.map_data = """
+    ++ -- SP -- SP -- ++ -- --
+    ME -- -- -- -- -- -- ME --
+    -- ME -- MS __ -- -- -- ++
+    ME -- Me ++ -- Me -- ME --
+    ++ -- ++ ++ -- ++ ++ -- --
+    ME -- -- Me -- ++ ++ ME --
+    -- MB -- -- -- -- -- -- --
+    MB -- -- ++ ++ ++ -- 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': 3, 'siren': 1},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, '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 = ['FuShunG']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_SWIPE_MULTIPLY = (1.234, 1.257)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.193, 1.215)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.158, 1.179)
+
+
+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()

campaign/event_20260417_cn/sp3.py

@@ -0,0 +1,91 @@
+from .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 .sp1 import Config as ConfigBase
+
+MAP = CampaignMap('SP3')
+MAP.shape = 'I8'
+MAP.camera_data = ['D2', 'D6']
+MAP.camera_data_spawn_point = ['D2']
+# Big Raffaello may cover D2-D3
+MAP.map_covered = ['D2', 'D3']
+MAP.map_data = """
+    ++ ++ Me ++ ++ ++ -- -- --
+    ++ ++ -- ME -- ME -- -- --
+    SP -- -- MS -- -- ME ++ --
+    SP -- -- MS -- -- -- -- --
+    ++ Me __ ++ ++ -- Me -- --
+    ME -- -- Me ++ ME ++ -- --
+    -- -- -- -- ME -- ME -- ++
+    MB ++ 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': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4},
+    {'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 = ['Raffaello', 'ArkRoyalG']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    # Big Raffaello may cover nearby grids
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SWIPE_MULTIPLY = (1.137, 1.159)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.100, 1.120)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.068, 1.087)
+
+
+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()
+
+    def _expected_end(self, expected):
+        # after 4th battle, no enemy search but has event animation
+        # we wait until event animation appears, otherwise next map walk will click on animation popup
+        if self.battle_count == 3:
+            return self.event_animation_end
+        return super()._expected_end(expected)

campaign/event_20260417_cn/sp4.py

@@ -0,0 +1,80 @@
+from .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 .sp1 import Config as ConfigBase
+
+MAP = CampaignMap('SP4')
+MAP.shape = 'I8'
+MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['D6']
+MAP.map_data = """
+    -- -- -- ++ ++ ++ -- -- --
+    -- ++ ME -- MB -- ME ++ --
+    -- ME -- -- -- -- -- ME --
+    -- ++ ++ Me -- Me ++ ++ --
+    -- ++ ++ MS -- MS ++ ++ --
+    -- ME Me -- __ -- Me ME --
+    ME -- -- -- -- -- -- -- 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 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'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 = ['Cheshire', 'Nakhimov']
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_SWIPE_MULTIPLY = (1.084, 1.104)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.048, 1.067)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.017, 1.036)
+
+
+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()

dev_tools/map_extractor.py

@@ -317,6 +317,16 @@ DIC_SIREN_NAME_CHI_TO_ENG = {
     'unknownV_boss_hermit': 'Vboss_Hermit',
     'unknownV_boss_lovers': 'Vboss_Lovers',
     'unknownV_boss_chariot': 'Vboss_Chariot',
+
+    # Vacation Lane – Beachside Brilliance (event_20260417_cn)
+    'bulaimodun': 'Bremerton',
+    'fushun_g': 'FuShunG',
+    'lafeier': 'Raffaello',
+    'huangjiafangzhou_g': 'ArkRoyal',
+    'chaijun': 'Cheshire',
+    'naximofu': 'Nakhimov',
+    'liekexingdunII': 'Lexington2',
+    'yuekechengII': 'Yorktown2',
 }
 
 
@@ -769,8 +779,8 @@ Arguments:
                      adapted for war_archives usage
 """
 FILE = '../AzurLaneLuaScripts'
-FOLDER = './campaign/test'
-KEYWORD = ''
+FOLDER = './campaign/event_20260417_cn'
+KEYWORD = '2020001'
 SELECT = True
 OVERWRITE = True
 IS_WAR_ARCHIVES = False

module/campaign/run.py

@@ -330,6 +330,9 @@ class CampaignRun(CampaignEvent):
                 logger.info(
                     'In event_20240912_cn, MapAchievement=threat_safe_without_3_stars fallback to 100_percent_clear')
                 self.config.override(StopCondition_MapAchievement='100_percent_clear')
+        if folder == 'event_20260417_cn':
+            if name in ['vsp', ]:
+                name = 'sp'
         return name, folder
 
     def can_use_auto_search_continue(self):

module/template/assets.py

@@ -54,6 +54,7 @@ TEMPLATE_SIREN_Amity = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN
 TEMPLATE_SIREN_Arethusa = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Arethusa.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Arethusa.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Arethusa.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Arethusa.gif'})
 TEMPLATE_SIREN_Arizona = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Arizona.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Arizona.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Arizona.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Arizona.gif'})
 TEMPLATE_SIREN_ArkRoyal = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_ArkRoyal.gif', 'en': './assets/en/template/TEMPLATE_SIREN_ArkRoyal.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_ArkRoyal.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_ArkRoyal.gif'})
+TEMPLATE_SIREN_ArkRoyalG = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_ArkRoyalG.gif', 'en': './assets/en/template/TEMPLATE_SIREN_ArkRoyalG.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_ArkRoyalG.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_ArkRoyalG.gif'})
 TEMPLATE_SIREN_Asanagi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Asanagi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Asanagi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Asanagi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Asanagi.gif'})
 TEMPLATE_SIREN_Atlanta = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Atlanta.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Atlanta.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Atlanta.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Atlanta.gif'})
 TEMPLATE_SIREN_August = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_August.gif', 'en': './assets/en/template/TEMPLATE_SIREN_August.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_August.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_August.gif'})
@@ -69,6 +70,7 @@ TEMPLATE_SIREN_Bellona = Template(file={'cn': './assets/cn/template/TEMPLATE_SIR
 TEMPLATE_SIREN_BlackDragonBoss01 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BlackDragonBoss01.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BlackDragonBoss01.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BlackDragonBoss01.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BlackDragonBoss01.gif'})
 TEMPLATE_SIREN_BlackDragonBoss02 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BlackDragonBoss02.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BlackDragonBoss02.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BlackDragonBoss02.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BlackDragonBoss02.gif'})
 TEMPLATE_SIREN_BolzanoAlter = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'en': './assets/en/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_BolzanoAlter.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_BolzanoAlter.gif'})
+TEMPLATE_SIREN_Bremerton = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Bremerton.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Bremerton.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Bremerton.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Bremerton.gif'})
 TEMPLATE_SIREN_CA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CA.gif'})
 TEMPLATE_SIREN_CAalchemist = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CAalchemist.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CAalchemist.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CAalchemist.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CAalchemist.gif'})
 TEMPLATE_SIREN_CAalchemist2 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CAalchemist2.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CAalchemist2.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CAalchemist2.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CAalchemist2.gif'})
@@ -88,6 +90,7 @@ TEMPLATE_SIREN_CVpurple = Template(file={'cn': './assets/cn/template/TEMPLATE_SI
 TEMPLATE_SIREN_Carabiniere = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Carabiniere.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Carabiniere.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Carabiniere.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Carabiniere.gif'})
 TEMPLATE_SIREN_CesareAlter = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_CesareAlter.gif', 'en': './assets/en/template/TEMPLATE_SIREN_CesareAlter.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_CesareAlter.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_CesareAlter.gif'})
 TEMPLATE_SIREN_Champagne = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Champagne.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Champagne.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Champagne.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Champagne.gif'})
+TEMPLATE_SIREN_Cheshire = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Cheshire.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Cheshire.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Cheshire.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Cheshire.gif'})
 TEMPLATE_SIREN_ChihayaKisaragi = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_ChihayaKisaragi.gif', 'en': './assets/en/template/TEMPLATE_SIREN_ChihayaKisaragi.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_ChihayaKisaragi.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_ChihayaKisaragi.gif'})
 TEMPLATE_SIREN_Chitose = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Chitose.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Chitose.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Chitose.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Chitose.gif'})
 TEMPLATE_SIREN_Chiyoda = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Chiyoda.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Chiyoda.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Chiyoda.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Chiyoda.gif'})
@@ -113,6 +116,7 @@ TEMPLATE_SIREN_ELpurple = Template(file={'cn': './assets/cn/template/TEMPLATE_SI
 TEMPLATE_SIREN_Elizabeth3 = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Elizabeth3.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Elizabeth3.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Elizabeth3.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Elizabeth3.gif'})
 TEMPLATE_SIREN_Formidable = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Formidable.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Formidable.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Formidable.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Formidable.gif'})
 TEMPLATE_SIREN_Fox = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Fox.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Fox.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Fox.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Fox.gif'})
+TEMPLATE_SIREN_FuShunG = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_FuShunG.gif', 'en': './assets/en/template/TEMPLATE_SIREN_FuShunG.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_FuShunG.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_FuShunG.gif'})
 TEMPLATE_SIREN_Gascogne = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Gascogne.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Gascogne.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Gascogne.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Gascogne.gif'})
 TEMPLATE_SIREN_GascogneIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_GascogneIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_GascogneIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_GascogneIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_GascogneIdol.gif'})
 TEMPLATE_SIREN_Gloucester = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Gloucester.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Gloucester.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Gloucester.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Gloucester.gif'})
@@ -176,6 +180,7 @@ TEMPLATE_SIREN_MisakiDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_S
 TEMPLATE_SIREN_Miyuki = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Miyuki.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Miyuki.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Miyuki.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Miyuki.gif'})
 TEMPLATE_SIREN_Nagato = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Nagato.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Nagato.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Nagato.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Nagato.gif'})
 TEMPLATE_SIREN_NagisaDOA = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_NagisaDOA.gif', 'en': './assets/en/template/TEMPLATE_SIREN_NagisaDOA.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_NagisaDOA.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_NagisaDOA.gif'})
+TEMPLATE_SIREN_Nakhimov = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Nakhimov.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Nakhimov.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Nakhimov.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Nakhimov.gif'})
 TEMPLATE_SIREN_Nelson = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Nelson.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Nelson.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Nelson.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Nelson.gif'})
 TEMPLATE_SIREN_Neptune_ghost = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Neptune_ghost.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Neptune_ghost.gif'})
 TEMPLATE_SIREN_Northampton = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Northampton.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Northampton.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Northampton.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Northampton.gif'})
@@ -189,6 +194,7 @@ TEMPLATE_SIREN_PrinceOfWales = Template(file={'cn': './assets/cn/template/TEMPLA
 TEMPLATE_SIREN_PrinzAdalbert = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_PrinzAdalbert.gif', 'en': './assets/en/template/TEMPLATE_SIREN_PrinzAdalbert.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_PrinzAdalbert.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_PrinzAdalbert.gif'})
 TEMPLATE_SIREN_PrinzEugen = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_PrinzEugen.gif', 'en': './assets/en/template/TEMPLATE_SIREN_PrinzEugen.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_PrinzEugen.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_PrinzEugen.gif'})
 TEMPLATE_SIREN_PrinzHeinrich = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_PrinzHeinrich.gif', 'en': './assets/en/template/TEMPLATE_SIREN_PrinzHeinrich.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_PrinzHeinrich.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_PrinzHeinrich.gif'})
+TEMPLATE_SIREN_Raffaello = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Raffaello.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Raffaello.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Raffaello.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Raffaello.gif'})
 TEMPLATE_SIREN_Renown = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Renown.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Renown.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Renown.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Renown.gif'})
 TEMPLATE_SIREN_Revenge = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Revenge.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Revenge.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Revenge.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Revenge.gif'})
 TEMPLATE_SIREN_Rodney = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Rodney.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Rodney.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Rodney.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Rodney.gif'})