Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

* Fix: Event 20220915 campaign (#5607)

Co-authored-by: YQY <91514918+5A8G0001@users.noreply.github.com>

* Upd: [TW] Event entrance of Violet Tempest Blooming Lycoris (fixed #5606)

* Fix: [CN] Skip user agreement

* Add: Event entrance of Vacation Lane – Beachside Brilliance (event_20260417_cn)

* Add: MAP_CHAPTER_SWITCH_20241219_SPEX

* Add: Chapter SP

* Opt: Faster receiving if no drop record

* Upd: Button extract

* Upd: Shop cost icons

* Fix: [JP] Remove wrong "/" in meta counter (#5608)

---------

Co-authored-by: YQY <91514918+TerryOrin@users.noreply.github.com>
Co-authored-by: YQY <91514918+5A8G0001@users.noreply.github.com>

alas.py

@@ -87,6 +87,20 @@ class AzurLaneAutoScript:
             self.config.task_call('Restart')
             self.device.sleep(10)
             return False
+        except EmulatorNetworkError as e:
+            logger.error(e)
+            self.save_error_log()
+            if self.device.is_emulator:
+                logger.info('Game update stuck 3 times. Checking network status on both ends.')
+                self.checker.check_now()
+                if self.checker.is_available() and not self.device.is_network_available():
+                    logger.critical('Emulator network is disconnected despite host being online.')
+                    logger.warning('Restarting emulator to fix internal network.')
+                    self.device.emulator_start()
+                    deep_set(self.failure_record, keys='Restart', value=1)
+            self.config.task_call('Restart')
+            self.device.sleep(10)
+            return False
         except GameBugError as e:
             logger.warning(e)
             self.save_error_log()
@@ -560,12 +574,8 @@ class AzurLaneAutoScript:
             _ = self.device
             self.device.config = self.config
             # Skip first restart
-            if task == 'Restart':
-                if self.is_first_task:
-                    logger.info('Skip task `Restart` at scheduler start')
-                else:
-                    from module.handler.login import LoginHandler
-                    LoginHandler(self.config, self.device).app_restart()
+            if task == 'Restart' and self.is_first_task:
+                logger.info('Skip task `Restart` at scheduler start')
                 self.config.task_delay(server_update=True)
                 del_cached_property(self, 'config')
                 continue

bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json

@@ -1901,5 +1901,5 @@
     183
   ], 
   "heads": [[146, 0, 0], [150, 0, 0]], 
-  "attrs": {"mxnet_version": ["int", 10600]}
+  "attrs": {"mxnet_version": ["int", 10901]}
 }

campaign/Readme.md

@@ -282,4 +282,10 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20260129   | coalition 20260122       | Light & Shadow Fashion Shoot!                | -                          | -                                                  | -                                    | 光影風尚-拍攝進行時        |
 | 20260205   | raid 20240328            | From Zero to Hero                            | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun                            | ゼロから頑張る魔王討伐（復刻）       | -                          |
 | 20260212   | raid 20260212            | Spring Auction Adventure                     | 春宴怀玉香满庭             | Spring Auction Adventure                           | 新春玉逸品会                         | 春宴懷玉香滿庭             |
-| 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | -                          |
+| 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | 春滿客棧Online             |
+| 20260312   | event 20240229 cn        | Snowrealm Peregrination Rerun                | 复刻雪境迷踪               | Snowrealm Peregrination Rerun                      | 銀界遊廻（復刻）                     | -                          |
+| 20260319   | event 20220728 cn        | Aquilifer's Ballade                          | -                          | -                                                  | -                                    | 復刻雄鷹的敘事歌           |
+| 20260326   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | 漫游者招募计划             | The Vagabond’s Recruitment Plan                    | ワンダラー募集計画                   | -                          |
+| 20260402   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | -                          | -                                                  | -                                    | 漫遊者招募計劃             |
+| 20260416   | event 20220915 cn        | Violet Tempest Blooming Lycoris              | -                          | -                                                  | -                                    | 復刻紫絳槿嵐               |
+| 20260417   | event 20260417 cn        | Vacation Lane – Beachside Brilliance         | 假日航线闪耀海滨           | Vacation Lane – Beachside Brilliance               | バケーションレーン・きらめく砂浜     | -                          |

campaign/campaign_main/campaign_15_base.py

@@ -205,3 +205,4 @@ class CampaignBase(CampaignBase_):
         self._mob_move_info_change(location, target)
         self.find_path_initial()
         self.map.show()
+        return True

campaign/campaign_main/campaign_16_1.py

@@ -7,8 +7,8 @@ from .campaign_16_base_submarine import Config as ConfigBase
 
 MAP = CampaignMap('16-1')
 MAP.shape = 'I9'
-MAP.camera_data = ['C2', 'C6', 'F2', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.camera_data = ['C2', 'C6', 'F2', 'F5']
+MAP.camera_data_spawn_point = ['F7']
 MAP.camera_sight = (-2, -1, 3, 2)
 MAP.map_data = """
     ++ ME -- -- ME -- -- ME --
@@ -57,6 +57,11 @@ class Config(ConfigBase):
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
+    MAP_SWIPE_MULTIPLY = (1.050, 1.069)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.015, 1.034)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.985, 1.003)
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/campaign_main/campaign_16_2.py

@@ -54,6 +54,11 @@ class Config(ConfigBase):
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+    MAP_SWIPE_MULTIPLY = (1.093, 1.113)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.077)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045)
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/campaign_main/campaign_16_3.py

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
 
 MAP = CampaignMap('16-3')
 MAP.shape = 'K6'
-MAP.camera_data = ['C2', 'C5', 'F2', 'F5', 'H2', 'H5']
+MAP.camera_data = ['D3', 'E4', 'G2', 'H2']
 MAP.camera_data_spawn_point = ['C5']
 MAP.camera_sight = (-2, -1, 3, 2)
 MAP.map_data = """
@@ -21,8 +21,8 @@ MAP.map_data = """
 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 40 40 40 40 50 50 50 50 50
-    50 50 50 50 50 40 40 40 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
     50 50 50 50 50 50 50 50 50 50 50
     50 50 50 50 50 50 50 50 50 50 50
 """
@@ -30,7 +30,19 @@ MAP.spawn_data = [
     {'battle': 0, 'enemy': 3},
     {'battle': 1, 'enemy': 6},
     {'battle': 2, 'enemy': 3},
-    {'battle': 3, 'boss': 1},
+    {'battle': 3},
+    {'battle': 4},
+    {'battle': 5},
+    {'battle': 6},
+    {'battle': 7, 'boss': 1},
+]
+MAP.spawn_data_loop = [
+    {'battle': 0, 'enemy': 3},
+    {'battle': 1, 'enemy': 6},
+    {'battle': 2, 'enemy': 3},
+    {'battle': 3},
+    {'battle': 4},
+    {'battle': 5, 'boss': 1},
 ]
 A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
 A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
@@ -40,7 +52,7 @@ A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
 A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
     = MAP.flatten()
 
-road_main = RoadGrids([C3, D3, F3, G4, H4])
+road_main = RoadGrids([G4, H4])
 
 
 class Config(ConfigBase):
@@ -48,43 +60,57 @@ class Config(ConfigBase):
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+    MAP_SWIPE_MULTIPLY = (1.180, 1.202)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128)
+
 
 class Campaign(CampaignBase):
     MAP = MAP
+    use_single_fleet = False
+
+    def map_init(self, map_):
+        super().map_init(map_)
+        self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode
+        self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder
 
     def battle_0(self):
-        self.clear_chosen_enemy(C3)
-        return True
+        if self.map_has_mob_move:
+            if self.mob_move(C3, C2):
+                return self.clear_chosen_enemy(D6)
+            self.map_has_mob_move = False
+
+        return self.clear_chosen_enemy(C3)
 
     def battle_1(self):
-        if self.use_support_fleet:
+        if self.map_has_mob_move:
+            self.mob_move(E6, E5)
+            if not self.use_single_fleet:
+                self.fleet_boss.goto(F4)
+                self.fleet_ensure(index=3 - self.fleet_boss_index)
+            return self.clear_chosen_enemy(G4)
+
+        if self.use_support_fleet and not self.map_is_clear_mode:
+            self.goto(C3)
             self.air_strike(E3)
-        self.clear_chosen_enemy(D3)
-        return True
+        return self.clear_chosen_enemy(D3)
 
     def battle_2(self):
-        if self.clear_roadblocks([road_main]):
-            return True
-        if self.clear_potential_roadblocks([road_main]):
-            return True
-        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
-            return True
-        return self.battle_default()
+        return self.clear_chosen_enemy(F3)
 
     def battle_3(self):
         boss = self.map.select(is_boss=True)
         if boss:
             if not self.check_accessibility(boss[0], fleet='boss'):
                 return self.clear_roadblocks([road_main])
-            if self.use_support_fleet:
+            if self.use_support_fleet and not self.map_is_clear_mode:
                 # at this stage the most right zone should be accessible
                 self.goto(K5)
                 self.air_strike(J6)
             return self.fleet_boss.clear_boss()
         if self.clear_roadblocks([road_main]):
             return True
-        if self.clear_potential_roadblocks([road_main]):
-            return True
-        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+        if self.clear_any_enemy(genre=("Light",), strongest=True):
             return True
         return self.battle_default()

campaign/campaign_main/campaign_16_4.py

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
 
 MAP = CampaignMap('16-4')
 MAP.shape = 'K8'
-MAP.camera_data = ['C2', 'C6', 'F2', 'F6', 'H2', 'H6']
+MAP.camera_data = ['C2', 'F5', 'F2', 'H2', 'H5']
 MAP.camera_data_spawn_point = ['C6']
 MAP.camera_sight = (-2, -1, 3, 2)
 MAP.map_data = """
@@ -15,24 +15,35 @@ MAP.map_data = """
     ME ++ ++ ++ -- -- ME ++ -- -- --
     -- -- ME -- -- ++ ++ ME -- -- --
     -- -- -- ME ++ -- ME -- ++ ++ --
-    -- -- ME -- -- ME ++ -- ME ++ --
+    -- -- -- ME -- ME ++ -- ME ++ --
     -- __ -- ++ ++ -- ++ ME ME -- --
-    SP -- -- ME -- -- ME ++ -- ++ ++
+    SP -- -- ME -- -- -- ++ -- ++ ++
     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 40 50 50 50
-    50 50 50 40 50 40 40 40 50 50 50
-    50 50 50 40 40 40 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50 50
     50 50 50 50 50 50 50 50 50 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': 5},
-    {'battle': 1, 'enemy': 4},
+    {'battle': 1, 'enemy': 3},
+    {'battle': 2, 'enemy': 5},
+    {'battle': 3},
+    {'battle': 4},
+    {'battle': 5},
+    {'battle': 6},
+    {'battle': 7},
+    {'battle': 8, 'boss': 1},
+]
+MAP.spawn_data_loop = [
+    {'battle': 0, 'enemy': 5},
+    {'battle': 1, 'enemy': 3},
     {'battle': 2, 'enemy': 5},
     {'battle': 3},
     {'battle': 4, 'boss': 1},
@@ -47,51 +58,108 @@ A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
 A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
     = MAP.flatten()
 
-road_main = RoadGrids([D4, F5, G4, H3])
+road_main = RoadGrids([D5, F5, G4, H3])
 
 class Config(ConfigBase):
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+    MAP_SWIPE_MULTIPLY = (1.003, 1.022)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (0.970, 0.988)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.942, 0.959)
+
 
 class Campaign(CampaignBase):
     MAP = MAP
+    F5_is_moved = False
+    use_single_fleet = False
+
+    def map_init(self, map_):
+        super().map_init(map_)
+        self.F5_is_moved = False
+        self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode
+        self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder
 
     def battle_0(self):
-        self.clear_chosen_enemy(D4)
-        return True
+        if self.map_has_mob_move and not self.use_single_fleet:
+            if self.mob_move(D7, D8):
+                self.fleet_boss.goto(J1)
+                self.fleet_ensure(index=3 - self.fleet_boss_index)
+                if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+                    return True
+                return self.battle_default()
+
+            self.map_has_mob_move = False
+
+        return self.clear_chosen_enemy(D5)
 
     def battle_1(self):
-        if self.use_support_fleet:
-            self.goto(D1)
-            self.air_strike(B1)
-        self.clear_chosen_enemy(F5)
-        return True
+        if not self.map_has_mob_move:
+            return self.clear_chosen_enemy(F5)
+
+        if not self.use_single_fleet:
+            if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+                return True
+            return self.battle_default()
+
+        grids = SelectedGrids([H6, I5])
+        grid = grids.delete(grids.select(enemy_genre='Main')).first_or_none()
+        if grid is not None and self.mob_move(F5, F6):
+            self.F5_is_moved = True
+            return self.clear_chosen_enemy(grid)
+
+        self.F5_is_moved = False
+        return self.clear_chosen_enemy(F5)
 
     def battle_2(self):
-        if self.clear_roadblocks([road_main]):
-            return True
-        if self.clear_potential_roadblocks([road_main]):
-            return True
+        if not self.map_has_mob_move or self.use_single_fleet:
+            return self.clear_chosen_enemy(G4)
+
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
             return True
         return self.battle_default()
 
+    def battle_3(self):
+        if not self.map_has_mob_move:
+            return self.clear_chosen_enemy(H3)
+
+        if not self.use_single_fleet:
+            if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+                return True
+            return self.battle_default()
+
+        if self.F5_is_moved:
+            if I6.enemy_genre == "Main" and self.mob_move(I6, I7):
+                return self.clear_any_enemy(genre=("Light",), strongest=True)
+            return self.clear_chosen_enemy(I6)
+
+        self.mob_move(H3, I3)
+        self.mob_move(I3, I2)
+        return self.clear_any_enemy(genre=("Light",), strongest=True)
+
     def battle_4(self):
+        if self.map_is_clear_mode:
+            return self.fleet_boss.clear_boss()
+
         boss = self.map.select(is_boss=True)
         if boss:
             if not self.check_accessibility(boss[0], fleet='boss'):
                 return self.clear_roadblocks([road_main])
+
             if self.use_support_fleet:
                 # at this stage the most right zone should be accessible
                 self.goto(J6)
                 self.air_strike(I8)
+
             return self.fleet_boss.clear_boss()
+
         if self.clear_roadblocks([road_main]):
             return True
         if self.clear_potential_roadblocks([road_main]):
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
             return True
+
         return self.battle_default()

campaign/campaign_main/campaign_16_base_aircraft.py

@@ -6,7 +6,7 @@ from module.handler.strategy import AIR_STRIKE_OFFSET
 from module.logger import logger
 from module.map.utils import location_ensure
 
-from .campaign_support_fleet import CampaignBase as CampaignBase_
+from .campaign_15_base import CampaignBase as CampaignBase_
 
 
 class Config:
@@ -17,7 +17,9 @@ class Config:
         'prominence': 10,
         'distance': 35,
     }
-    HOMO_CANNY_THRESHOLD = (50, 100)
+    # Handle fog on map, static homography parameters and lower canny threshold
+    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
+    HOMO_CANNY_THRESHOLD = (50, 80)
 
 
 class CampaignBase(CampaignBase_):

campaign/campaign_main/campaign_16_base_submarine.py

@@ -14,9 +14,11 @@ class CampaignBase(CampaignBase_):
     ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
 
     def map_init(self, map_):
+        # submarine battle after entering map
+        # all emenies spawned already, so no need to wait enemy searching
         if self.use_support_fleet:
             logger.hr(f'{self.FUNCTION_NAME_BASE}SUBMARINE', level=2)
-            self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False)
+            self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False, expected_end='no_searching')
         super().map_init(map_)
 
     def handle_submarine_support_popup(self):

campaign/campaign_war_archives/campaign_base.py

@@ -1,3 +1,4 @@
+from module.base.timer import Timer
 from module.campaign.campaign_base import CampaignBase as CampaignBase_
 from module.exception import RequestHumanTakeover
 from module.logger import logger
@@ -58,6 +59,7 @@ class CampaignBase(CampaignBase_):
         Fixed number of scrolls until give up, may need to
         increase as more war archives campaigns are added
         """
+        confirm_timer = Timer(1.5, count=4)
         for _ in range(20):
             if skip_first_screenshot:
                 skip_first_screenshot = False
@@ -80,13 +82,19 @@ class CampaignBase(CampaignBase_):
                 return entrance
 
             if WAR_ARCHIVES_SCROLL.appear(main=self):
+                confirm_timer.clear()
                 if WAR_ARCHIVES_SCROLL.at_bottom(main=self):
                     WAR_ARCHIVES_SCROLL.set_top(main=self)
                 else:
                     WAR_ARCHIVES_SCROLL.next_page(main=self, page=0.66)
                 continue
             else:
-                break
+                confirm_timer.start()
+                if confirm_timer.reached():
+                    logger.warning('WAR_ARCHIVES_SCROLL disappeared')
+                    break
+                else:
+                    continue
 
         logger.warning('Failed to find archives entrance')
         return None

campaign/event_20220915_cn/campaign_base.py

@@ -6,7 +6,7 @@ from module.map.assets import SWITCH_OVER
 
 class CampaignBase(CampaignBase_):
     def enemy_searching_appear(self):
-        if not self.appear(SWITCH_OVER, offset=(20, 20)):
+        if not self.is_in_map():
             return False
 
         return red_overlay_transparency(

campaign/event_20260226_cn/a1.py

@@ -4,28 +4,28 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('A1')
-MAP.shape = 'J8'
-MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.shape = 'I8'
+MAP.camera_data = ['E2', 'E6']
+MAP.camera_data_spawn_point = ['E2']
 MAP.map_data = """
-    ++ -- -- -- -- -- ++ -- SP --
-    ++ ME ++ ++ ++ Me -- -- -- SP
-    -- -- -- -- Me -- -- MS -- --
-    ME -- ME -- -- -- __ -- ++ ++
-    ++ -- ++ ++ -- MS -- -- ++ ++
-    -- -- -- ++ ME -- ++ Me -- --
-    -- MB -- -- -- -- -- -- -- --
-    -- -- -- ++ ME -- ME ++ ++ ++
+    -- -- ME -- ME -- -- -- --
+    -- ++ -- -- -- ME ++ ++ --
+    -- ++ -- SP -- -- Me ++ --
+    -- ME -- -- SP -- -- ME --
+    ++ -- Me -- -- -- Me -- --
+    -- ME ++ MS -- MS ++ ++ ++
+    -- -- ME -- __ -- ME ++ --
+    -- -- -- -- MB -- -- -- --
 """
 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 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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},
@@ -34,20 +34,20 @@ MAP.spawn_data = [
     {'battle': 3, 'enemy': 1, 'boss': 1},
     {'battle': 4, 'enemy': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+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 = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -61,24 +61,11 @@ class Config:
     STAGE_ENTRANCE = ['half', '20240725']
     MAP_HAS_MODE_SWITCH = True
     STAGE_INCREASE_AB = True
-    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (80, 255 - 17),
-        'width': (0.9, 10),
-        'prominence': 10,
-        'distance': 35,
-    }
-    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 17, 255),
-        'prominence': 10,
-        'distance': 50,
-        'wlen': 1000
-    }
-    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
-    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_WALK_USE_CURRENT_FLEET = True
-    MAP_SWIPE_MULTIPLY = (1.232, 1.255)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.191, 1.213)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.156, 1.177)
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.179, 1.201)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127)
 
 
 class Campaign(CampaignBase):

campaign/event_20260226_cn/a2.py

@@ -5,18 +5,17 @@ from module.logger import logger
 from .a1 import Config as ConfigBase
 
 MAP = CampaignMap('A2')
-MAP.shape = 'J8'
-MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
-MAP.camera_data_spawn_point = ['E6']
+MAP.shape = 'J7'
+MAP.camera_data = ['D2', 'D5', 'E4']
+MAP.camera_data_spawn_point = ['D5']
 MAP.map_data = """
-    -- -- -- -- -- ++ ME ++ -- --
-    -- -- MB -- -- ME -- ME -- --
-    ++ ++ -- ++ ++ -- -- -- ME --
-    ++ -- __ -- ++ Me -- ++ ++ ++
-    -- MS -- MS -- -- -- Me -- --
-    -- -- MS -- -- Me -- -- ME --
-    ++ -- -- -- -- ++ -- ME ++ ++
-    ++ SP -- SP -- ME -- -- ++ ++
+    -- ME -- -- ME ++ ++ -- -- --
+    MB -- ME -- -- -- ++ ME ME ++
+    ++ -- ++ ++ Me -- Me -- -- ++
+    -- -- ++ ++ -- __ -- -- ME --
+    -- MS -- -- MS -- -- ME ++ --
+    ME -- -- -- -- -- ME -- -- --
+    ++ -- SP SP -- ++ ++ ++ -- --
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
@@ -26,7 +25,6 @@ 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
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2, 'siren': 1},
@@ -42,13 +40,12 @@ A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
 A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
 A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
 A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
     = MAP.flatten()
 
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -58,6 +55,8 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/event_20260226_cn/a3.py

@@ -5,32 +5,28 @@ from module.logger import logger
 from .a1 import Config as ConfigBase
 
 MAP = CampaignMap('A3')
-MAP.shape = 'K10'
-MAP.camera_data = ['F3', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.shape = 'H8'
+MAP.camera_data = ['D4', 'D6', 'E3']
+MAP.camera_data_spawn_point = ['D4']
 MAP.map_data = """
-    -- ++ ++ ++ -- -- -- ++ ++ ++ --
-    -- ++ -- Me -- MB -- Me -- ++ --
-    -- -- ME -- Me -- Me -- ME -- --
-    -- -- ++ MS -- __ -- MS ++ -- --
-    -- -- ++ -- -- MS -- -- ++ -- --
-    ++ ++ ME -- -- -- -- -- ME ++ ++
-    ++ ++ -- -- SP -- SP -- -- ++ ++
-    -- -- ME -- ++ ++ ++ -- ME -- --
-    -- ++ -- -- ++ ++ ++ -- -- ++ --
-    -- -- -- -- ++ ++ ++ -- -- -- --
+    ++ ++ -- -- ME -- -- ME
+    ++ ++ MS -- -- -- ME --
+    SP -- -- MS -- ++ -- --
+    SP -- -- MS -- ++ ME --
+    ++ Me __ -- -- -- -- --
+    ++ ME -- Me ++ ++ ++ --
+    -- -- -- -- Me -- ME --
+    MB ++ 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 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    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},
@@ -39,22 +35,20 @@ MAP.spawn_data = [
     {'battle': 3, 'enemy': 1},
     {'battle': 4, 'enemy': 1, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
-A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
-A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \
+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(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/b1.py

@@ -4,50 +4,51 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('B1')
-MAP.shape = 'J8'
-MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.shape = 'I8'
+MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['D6']
 MAP.map_data = """
-    ++ -- -- -- -- -- ++ -- SP --
-    ++ ME ++ ++ ++ Me -- -- -- SP
-    -- -- -- -- Me -- -- MS -- --
-    ME -- ME -- -- -- __ -- ++ ++
-    ++ -- ++ ++ -- MS -- -- ++ ++
-    -- -- -- ++ ME -- ++ Me -- --
-    -- MB -- -- -- -- -- -- -- --
-    -- -- -- ++ ME -- ME ++ ++ ++
+    ++ -- -- -- -- -- -- -- --
+    ME -- ME ++ ++ ++ -- -- ++
+    -- ME -- MS -- MS -- ME ++
+    -- ++ MS -- -- -- Me -- ME
+    -- Me -- -- SP -- -- __ Me
+    -- -- -- SP -- -- Me -- --
+    ++ ++ Me -- -- ++ -- MB --
+    ++ ++ -- 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 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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': 9, 'siren': 1},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4, 'boss': 1},
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2, 'boss': 1},
+    {'battle': 5, 'enemy': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+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 = ['Vboss_Hermit', 'Vboss_Lovers']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -61,24 +62,11 @@ class Config:
     STAGE_ENTRANCE = ['half', '20240725']
     MAP_HAS_MODE_SWITCH = True
     STAGE_INCREASE_AB = True
-    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (80, 255 - 17),
-        'width': (0.9, 10),
-        'prominence': 10,
-        'distance': 35,
-    }
-    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 17, 255),
-        'prominence': 10,
-        'distance': 50,
-        'wlen': 1000
-    }
-    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
-    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_WALK_USE_CURRENT_FLEET = True
-    MAP_SWIPE_MULTIPLY = (1.217, 1.240)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.177, 1.199)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.143, 1.163)
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.138, 1.160)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088)
 
 
 class Campaign(CampaignBase):

campaign/event_20260226_cn/b2.py

@@ -6,17 +6,17 @@ from .b1 import Config as ConfigBase
 
 MAP = CampaignMap('B2')
 MAP.shape = 'J8'
-MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
-MAP.camera_data_spawn_point = ['E6']
+MAP.camera_data = ['D2', 'D6', 'G2', 'G6']
+MAP.camera_data_spawn_point = ['G2']
 MAP.map_data = """
-    -- -- -- -- -- ++ ME ++ -- --
-    -- -- MB -- -- ME -- ME -- --
-    ++ ++ -- ++ ++ -- -- -- ME --
-    ++ -- __ -- ++ Me -- ++ ++ ++
-    -- MS -- MS -- -- -- Me -- --
-    -- -- MS -- -- Me -- -- ME --
-    ++ -- -- -- -- ++ -- ME ++ ++
-    ++ SP -- SP -- ME -- -- ++ ++
+    MB ++ ME ME ++ ++ ++ -- -- --
+    -- -- -- -- ++ ME MS -- -- SP
+    -- ME ++ -- Me -- -- MS -- --
+    -- -- Me -- -- __ MS -- -- SP
+    -- ME -- ++ -- -- -- -- -- --
+    -- ++ ME -- Me -- Me ++ ++ ME
+    -- ME -- ME ++ -- -- ME ++ --
+    -- -- -- -- ++ ME -- -- -- --
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
@@ -29,12 +29,12 @@ MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
-    {'battle': 0, 'enemy': 9, 'siren': 1},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4},
-    {'battle': 5, 'boss': 1},
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1, 'boss': 1},
 ]
 A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
 A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
@@ -49,7 +49,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Chariot']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/b3.py

@@ -5,57 +5,57 @@ from module.logger import logger
 from .b1 import Config as ConfigBase
 
 MAP = CampaignMap('B3')
-MAP.shape = 'K10'
-MAP.camera_data = ['F3', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.shape = 'I10'
+MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8']
+MAP.camera_data_spawn_point = ['D2']
 MAP.map_data = """
-    -- ++ ++ ++ -- -- -- ++ ++ ++ --
-    -- ++ -- Me -- MB -- Me -- ++ --
-    -- -- ME -- Me -- Me -- ME -- --
-    -- -- ++ MS -- __ -- MS ++ -- --
-    -- -- ++ -- -- MS -- -- ++ -- --
-    ++ ++ ME -- -- -- -- -- ME ++ ++
-    ++ ++ -- -- SP -- SP -- -- ++ ++
-    -- -- ME -- ++ ++ ++ -- ME -- --
-    -- ++ -- -- ++ ++ ++ -- -- ++ --
-    -- -- -- -- ++ ++ ++ -- -- -- --
+    ++ ++ ++ SP -- SP ++ ++ ++
+    -- -- -- -- -- -- -- -- --
+    -- Me ++ -- MS -- ++ Me --
+    -- Me ++ MS -- MS ++ Me --
+    -- -- Me -- __ -- Me -- --
+    ME -- -- -- ++ -- -- -- ME
+    -- ME -- ++ ++ ++ -- ME --
+    ME -- -- ME -- ME -- -- ME
+    ++ ++ -- -- MB -- -- ++ ++
+    ++ ++ -- 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 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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': 9, 'siren': 2},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4},
-    {'battle': 5, 'boss': 1},
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
-A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
-A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \
+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, \
+A10, B10, C10, D10, E10, F10, G10, H10, I10, \
     = MAP.flatten()
 
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Lovers', 'Vboss_Chariot']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/c1.py

@@ -4,28 +4,28 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('C1')
-MAP.shape = 'J8'
-MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.shape = 'I8'
+MAP.camera_data = ['E2', 'E6']
+MAP.camera_data_spawn_point = ['E2']
 MAP.map_data = """
-    ++ -- -- -- -- -- ++ -- SP --
-    ++ ME ++ ++ ++ Me -- -- -- SP
-    -- -- -- -- Me -- -- MS -- --
-    ME -- ME -- -- -- __ -- ++ ++
-    ++ -- ++ ++ -- MS -- -- ++ ++
-    -- -- -- ++ ME -- ++ Me -- --
-    -- MB -- -- -- -- -- -- -- --
-    -- -- -- ++ ME -- ME ++ ++ ++
+    -- -- ME -- ME -- -- -- --
+    -- ++ -- -- -- ME ++ ++ --
+    -- ++ -- SP -- -- Me ++ --
+    -- ME -- -- SP -- -- ME --
+    ++ -- Me -- -- -- Me -- --
+    -- ME ++ MS -- MS ++ ++ ++
+    -- -- ME -- __ -- ME ++ --
+    -- -- -- -- MB -- -- -- --
 """
 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 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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},
@@ -34,20 +34,20 @@ MAP.spawn_data = [
     {'battle': 3, 'enemy': 1},
     {'battle': 4, 'enemy': 1, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+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 = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -61,24 +61,11 @@ class Config:
     STAGE_ENTRANCE = ['half', '20240725']
     MAP_HAS_MODE_SWITCH = True
     STAGE_INCREASE_AB = True
-    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (80, 255 - 17),
-        'width': (0.9, 10),
-        'prominence': 10,
-        'distance': 35,
-    }
-    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 17, 255),
-        'prominence': 10,
-        'distance': 50,
-        'wlen': 1000
-    }
-    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
-    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_WALK_USE_CURRENT_FLEET = True
-    MAP_SWIPE_MULTIPLY = (1.232, 1.255)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.191, 1.213)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.156, 1.177)
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.179, 1.201)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127)
 
 
 class Campaign(CampaignBase):

campaign/event_20260226_cn/c2.py

@@ -5,18 +5,17 @@ from module.logger import logger
 from .c1 import Config as ConfigBase
 
 MAP = CampaignMap('C2')
-MAP.shape = 'J8'
-MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
-MAP.camera_data_spawn_point = ['E6']
+MAP.shape = 'J7'
+MAP.camera_data = ['D2', 'D5', 'E4']
+MAP.camera_data_spawn_point = ['D5']
 MAP.map_data = """
-    -- -- -- -- -- ++ ME ++ -- --
-    -- -- MB -- -- ME -- ME -- --
-    ++ ++ -- ++ ++ -- -- -- ME --
-    ++ -- __ -- ++ Me -- ++ ++ ++
-    -- MS -- MS -- -- -- Me -- --
-    -- -- MS -- -- Me -- -- ME --
-    ++ -- -- -- -- ++ -- ME ++ ++
-    ++ SP -- SP -- ME -- -- ++ ++
+    -- ME -- -- ME ++ ++ -- -- --
+    MB -- ME -- -- -- ++ ME ME ++
+    ++ -- ++ ++ Me -- Me -- -- ++
+    -- -- ++ ++ -- __ -- -- ME --
+    -- MS -- -- MS -- -- ME ++ --
+    ME -- -- -- -- -- ME -- -- --
+    ++ -- SP SP -- ++ ++ ++ -- --
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
@@ -26,7 +25,6 @@ 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
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 2, 'siren': 2},
@@ -42,13 +40,12 @@ A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
 A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
 A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
 A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
     = MAP.flatten()
 
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -58,6 +55,8 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/event_20260226_cn/c3.py

@@ -5,32 +5,28 @@ from module.logger import logger
 from .c1 import Config as ConfigBase
 
 MAP = CampaignMap('C3')
-MAP.shape = 'K10'
-MAP.camera_data = ['F3', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.shape = 'H8'
+MAP.camera_data = ['D4', 'D6', 'E3']
+MAP.camera_data_spawn_point = ['D4']
 MAP.map_data = """
-    -- ++ ++ ++ -- -- -- ++ ++ ++ --
-    -- ++ -- Me -- MB -- Me -- ++ --
-    -- -- ME -- Me -- Me -- ME -- --
-    -- -- ++ MS -- __ -- MS ++ -- --
-    -- -- ++ -- -- MS -- -- ++ -- --
-    ++ ++ ME -- -- -- -- -- ME ++ ++
-    ++ ++ -- -- SP -- SP -- -- ++ ++
-    -- -- ME -- ++ ++ ++ -- ME -- --
-    -- ++ -- -- ++ ++ ++ -- -- ++ --
-    -- -- -- -- ++ ++ ++ -- -- -- --
+    ++ ++ -- -- ME -- -- ME
+    ++ ++ MS -- -- -- ME --
+    SP -- -- MS -- ++ -- --
+    SP -- -- MS -- ++ ME --
+    ++ Me __ -- -- -- -- --
+    ++ ME -- Me ++ ++ ++ --
+    -- -- -- -- Me -- ME --
+    MB ++ 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 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    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},
@@ -40,22 +36,20 @@ MAP.spawn_data = [
     {'battle': 4, 'enemy': 1},
     {'battle': 5, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
-A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
-A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \
+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(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/d1.py

@@ -4,51 +4,51 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('D1')
-MAP.shape = 'J8'
-MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.shape = 'I8'
+MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['D6']
 MAP.map_data = """
-    ++ -- -- -- -- -- ++ -- SP --
-    ++ ME ++ ++ ++ Me -- -- -- SP
-    -- -- -- -- Me -- -- MS -- --
-    ME -- ME -- -- -- __ -- ++ ++
-    ++ -- ++ ++ -- MS -- -- ++ ++
-    -- -- -- ++ ME -- ++ Me -- --
-    -- MB -- -- -- -- -- -- -- --
-    -- -- -- ++ ME -- ME ++ ++ ++
+    ++ -- -- -- -- -- -- -- --
+    ME -- ME ++ ++ ++ -- -- ++
+    -- ME -- MS -- MS -- ME ++
+    -- ++ MS -- -- -- Me -- ME
+    -- Me -- -- SP -- -- __ Me
+    -- -- -- SP -- -- Me -- --
+    ++ ++ Me -- -- ++ -- MB --
+    ++ ++ -- 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 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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': 9, 'siren': 2},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4},
-    {'battle': 5, 'boss': 1},
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+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 = ['Vboss_Hermit', 'Vboss_Lovers']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -62,24 +62,11 @@ class Config:
     STAGE_ENTRANCE = ['half', '20240725']
     MAP_HAS_MODE_SWITCH = True
     STAGE_INCREASE_AB = True
-    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (80, 255 - 17),
-        'width': (0.9, 10),
-        'prominence': 10,
-        'distance': 35,
-    }
-    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 17, 255),
-        'prominence': 10,
-        'distance': 50,
-        'wlen': 1000
-    }
-    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
-    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_WALK_USE_CURRENT_FLEET = True
-    MAP_SWIPE_MULTIPLY = (1.217, 1.240)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.177, 1.199)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.143, 1.163)
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.138, 1.160)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088)
 
 
 class Campaign(CampaignBase):

campaign/event_20260226_cn/d2.py

@@ -6,17 +6,17 @@ from .d1 import Config as ConfigBase
 
 MAP = CampaignMap('D2')
 MAP.shape = 'J8'
-MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
-MAP.camera_data_spawn_point = ['E6']
+MAP.camera_data = ['D2', 'D6', 'G2', 'G6']
+MAP.camera_data_spawn_point = ['G2']
 MAP.map_data = """
-    -- -- -- -- -- ++ ME ++ -- --
-    -- -- MB -- -- ME -- ME -- --
-    ++ ++ -- ++ ++ -- -- -- ME --
-    ++ -- __ -- ++ Me -- ++ ++ ++
-    -- MS -- MS -- -- -- Me -- --
-    -- -- MS -- -- Me -- -- ME --
-    ++ -- -- -- -- ++ -- ME ++ ++
-    ++ SP -- SP -- ME -- -- ++ ++
+    MB ++ ME ME ++ ++ ++ -- -- --
+    -- -- -- -- ++ ME MS -- -- SP
+    -- ME ++ -- Me -- -- MS -- --
+    -- -- Me -- -- __ MS -- -- SP
+    -- ME -- ++ -- -- -- -- -- --
+    -- ++ ME -- Me -- Me ++ ++ ME
+    -- ME -- ME ++ -- -- ME ++ --
+    -- -- -- -- ++ ME -- -- -- --
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
@@ -29,12 +29,12 @@ MAP.weight_data = """
     50 50 50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
-    {'battle': 0, 'enemy': 9, 'siren': 3},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4},
-    {'battle': 5},
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2, 'siren': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1},
     {'battle': 6, 'boss': 1},
 ]
 A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
@@ -50,7 +50,7 @@ A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Chariot']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/d3.py

@@ -5,58 +5,58 @@ from module.logger import logger
 from .d1 import Config as ConfigBase
 
 MAP = CampaignMap('D3')
-MAP.shape = 'K10'
-MAP.camera_data = ['F3', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.shape = 'I10'
+MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8']
+MAP.camera_data_spawn_point = ['D2']
 MAP.map_data = """
-    -- ++ ++ ++ -- -- -- ++ ++ ++ --
-    -- ++ -- Me -- MB -- Me -- ++ --
-    -- -- ME -- Me -- Me -- ME -- --
-    -- -- ++ MS -- __ -- MS ++ -- --
-    -- -- ++ -- -- MS -- -- ++ -- --
-    ++ ++ ME -- -- -- -- -- ME ++ ++
-    ++ ++ -- -- SP -- SP -- -- ++ ++
-    -- -- ME -- ++ ++ ++ -- ME -- --
-    -- ++ -- -- ++ ++ ++ -- -- ++ --
-    -- -- -- -- ++ ++ ++ -- -- -- --
+    ++ ++ ++ SP -- SP ++ ++ ++
+    -- -- -- -- -- -- -- -- --
+    -- Me ++ -- MS -- ++ Me --
+    -- Me ++ MS -- MS ++ Me --
+    -- -- Me -- __ -- Me -- --
+    ME -- -- -- ++ -- -- -- ME
+    -- ME -- ++ ++ ++ -- ME --
+    ME -- -- ME -- ME -- -- ME
+    ++ ++ -- -- MB -- -- ++ ++
+    ++ ++ -- 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 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 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': 9, 'siren': 3},
-    {'battle': 1},
-    {'battle': 2},
-    {'battle': 3},
-    {'battle': 4},
-    {'battle': 5},
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2, 'siren': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'enemy': 1},
     {'battle': 6, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
-A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
-A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \
-A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \
+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, \
+A10, B10, C10, D10, E10, F10, G10, H10, I10, \
     = MAP.flatten()
 
 
 class Config(ConfigBase):
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Lovers', 'Vboss_Chariot']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True

campaign/event_20260226_cn/sp.py

@@ -4,28 +4,26 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('SP')
-MAP.shape = 'I8'
-MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
-MAP.camera_data_spawn_point = ['F2']
+MAP.shape = 'H7'
+MAP.camera_data = ['D5', 'E2', 'E5']
+MAP.camera_data_spawn_point = ['D2']
 MAP.map_data = """
-    ++ ++ ++ -- -- -- -- SP --
-    -- ME -- -- -- MS -- -- SP
-    -- -- ME ++ -- -- MS -- --
-    ME -- -- -- ME __ -- MS --
-    -- ME -- ME ++ -- ++ ++ ME
-    ++ -- -- -- -- -- ++ ++ --
-    -- MB -- ++ ME -- ME -- --
-    -- -- -- ++ -- ME ++ ++ ++
+    -- -- -- -- ++ -- ME --
+    -- SP SP -- ++ ME -- ME
+    -- -- -- -- MS -- ME --
+    ++ ++ ++ MS __ -- ++ ++
+    -- ME -- -- -- MS -- ++
+    ME -- ME -- ++ -- MB --
+    -- 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 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50
+    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': 10, 'siren': 3},
@@ -37,20 +35,19 @@ MAP.spawn_data = [
     {'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, \
+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, \
     = MAP.flatten()
 
 
 class Config:
     # ===== Start of generated config =====
-    MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Lovers', 'Vboss_Chariot']
+    MAP_SIREN_TEMPLATE = []
     MOVABLE_ENEMY_TURN = (2,)
     MAP_HAS_SIREN = True
     MAP_HAS_MOVABLE_ENEMY = True
@@ -65,27 +62,14 @@ class Config:
 
     MAP_CHAPTER_SWITCH_20241219 = True
     STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = False
     STAGE_INCREASE_AB = True
-    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (80, 255 - 17),
-        'width': (0.9, 10),
-        'prominence': 10,
-        'distance': 35,
-    }
-    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 17, 255),
-        'prominence': 10,
-        'distance': 50,
-        'wlen': 1000
-    }
-    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
-    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_WALK_USE_CURRENT_FLEET = True
-    MAP_SWIPE_MULTIPLY = (1.180, 1.202)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128)
-    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
     MAP_IS_ONE_TIME_STAGE = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_SWIPE_MULTIPLY = (1.162, 1.184)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.124, 1.145)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.091, 1.111)
 
 
 class Campaign(CampaignBase):

campaign/event_20260326_cn/ht1.py

@@ -0,0 +1,95 @@
+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('HT1')
+MAP.shape = 'I7'
+MAP.camera_data = ['E2', 'F5']
+MAP.camera_data_spawn_point = ['E5']
+MAP.map_data = """
+    -- -- MB -- ++ -- ME -- --
+    -- ME -- Me ++ ME -- ME --
+    -- ++ Me -- -- -- -- -- ++
+    -- MS ++ MS -- Me -- ME --
+    -- -- MS -- ++ ++ ME -- --
+    ++ -- __ -- ++ ++ -- -- ME
+    ++ SP -- SP -- -- -- 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': 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, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    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_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    MAP_SWIPE_MULTIPLY = (1.147, 1.168)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.109, 1.129)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.077, 1.096)
+
+
+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()

campaign/event_20260326_cn/ht2.py

@@ -0,0 +1,82 @@
+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 .ht1 import Config as ConfigBase
+
+MAP = CampaignMap('HT2')
+MAP.shape = 'I7'
+MAP.camera_data = ['D2', 'D5', 'F5']
+MAP.camera_data_spawn_point = ['F2']
+MAP.map_data = """
+    -- -- ++ ++ SP -- SP ++ --
+    ME ME ++ ++ -- -- -- ++ --
+    -- -- -- -- -- MS -- Me --
+    ME ME ++ ++ ++ -- ++ ++ ++
+    -- -- -- -- MS -- MS -- Me
+    ME ME ++ -- -- __ -- -- ++
+    -- -- ++ -- Me MB 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': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2, 'siren': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5},
+    {'battle': 6, '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 = []
+    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 =====
+
+
+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=1):
+            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_6(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/ht3.py

@@ -0,0 +1,85 @@
+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 .ht1 import Config as ConfigBase
+
+MAP = CampaignMap('HT3')
+MAP.shape = 'I8'
+MAP.camera_data = ['E3', 'E6']
+MAP.camera_data_spawn_point = ['E6']
+MAP.map_data = """
+    -- -- -- ++ ++ ++ -- -- --
+    -- ++ -- Me -- Me -- ++ --
+    -- -- Me -- -- -- Me -- --
+    -- ME -- -- MB -- -- ME --
+    -- ++ ++ MS -- MS ++ ++ --
+    -- ++ ++ -- MS -- ++ ++ --
+    -- ME -- -- __ -- -- ME --
+    -- ME -- SP -- SP -- 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, 'siren': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5},
+    {'battle': 6, '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 = []
+    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 =====
+
+
+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=1):
+            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_6(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/sp.py

@@ -0,0 +1,120 @@
+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('SP')
+MAP.shape = 'G8'
+MAP.camera_data = ['D2', 'D6']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    ++ ++ MS -- MS ++ ++
+    ++ ME -- MS -- ME ++
+    ME -- -- -- -- -- ME
+    ME -- SP __ SP -- ME
+    ME -- -- -- -- -- ME
+    ++ ME ME -- ME ME ++
+    -- ++ ++ -- ++ ++ --
+    -- ++ ++ MB ++ ++ --
+"""
+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
+"""
+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, \
+A2, B2, C2, D2, E2, F2, G2, \
+A3, B3, C3, D3, E3, F3, G3, \
+A4, B4, C4, D4, E4, F4, G4, \
+A5, B5, C5, D5, E5, F5, G5, \
+A6, B6, C6, D6, E6, F6, G6, \
+A7, B7, C7, D7, E7, F7, G7, \
+A8, B8, C8, D8, E8, F8, G8, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    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_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    HOMO_STORAGE = ((7, 6), [(135.178, 83.137), (919.07, 83.137), (-16.807, 613.173), (1000.053, 613.173)])
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
+    MAP_IS_ONE_TIME_STAGE = True
+
+    MAP_SWIPE_MULTIPLY = (1.127, 1.148)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.090, 1.110)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.058, 1.077)
+
+
+class Campaign(CampaignBase):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def map_data_init(self, map_):
+        super().map_data_init(map_)
+        C1.is_siren = True
+        D2.is_siren = True
+        E1.is_siren = True
+
+    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()

campaign/event_20260326_cn/t1.py

@@ -0,0 +1,94 @@
+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('T1')
+MAP.shape = 'I7'
+MAP.camera_data = ['E2', 'F5']
+MAP.camera_data_spawn_point = ['E5']
+MAP.map_data = """
+    -- -- MB -- ++ -- ME -- --
+    -- ME -- Me ++ ME -- ME --
+    -- ++ Me -- -- -- -- -- ++
+    -- MS ++ MS -- Me -- ME --
+    -- -- MS -- ++ ++ ME -- --
+    ++ -- __ -- ++ ++ -- -- ME
+    ++ SP -- SP -- -- -- 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': 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, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    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_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    MAP_SWIPE_MULTIPLY = (1.147, 1.168)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.109, 1.129)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.077, 1.096)
+
+
+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_20260326_cn/t2.py

@@ -0,0 +1,72 @@
+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 .t1 import Config as ConfigBase
+
+MAP = CampaignMap('T2')
+MAP.shape = 'I7'
+MAP.camera_data = ['D2', 'D5', 'F5']
+MAP.camera_data_spawn_point = ['F2']
+MAP.map_data = """
+    -- -- ++ ++ SP -- SP ++ --
+    ME ME ++ ++ -- -- -- ++ --
+    -- -- -- -- -- MS -- Me --
+    ME ME ++ ++ ++ -- ++ ++ ++
+    -- -- -- -- MS -- MS -- Me
+    ME ME ++ -- -- __ -- -- ++
+    -- -- ++ -- Me MB 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': 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, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    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 =====
+
+
+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_20260326_cn/t3.py

@@ -0,0 +1,76 @@
+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 .t1 import Config as ConfigBase
+
+MAP = CampaignMap('T3')
+MAP.shape = 'I8'
+MAP.camera_data = ['E3', 'E6']
+MAP.camera_data_spawn_point = ['E6']
+MAP.map_data = """
+    -- -- -- ++ ++ ++ -- -- --
+    -- ++ -- Me -- Me -- ++ --
+    -- -- Me -- -- -- Me -- --
+    -- ME -- -- MB -- -- ME --
+    -- ++ ++ MS -- MS ++ ++ --
+    -- ++ ++ -- MS -- ++ ++ --
+    -- ME -- -- __ -- -- ME --
+    -- ME -- SP -- SP -- 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 = []
+    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 =====
+
+
+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()

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()