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

* Merge pull request #5595 from Heipen/ui_update

Upd: Battle UI ElvenVine

* Upd: [TW] Event The Vagabond’s Recruitment Plan (event_20260326_cn)

---------

Co-authored-by: heipen <126669219+Heipen@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,3 +282,8 @@ 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                       | 春滿客棧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              | -                          | -                                                  | -                                    | 漫遊者招募計劃             |

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_20260226_cn/a1.py

@@ -0,0 +1,84 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('A1')
+MAP.shape = 'I8'
+MAP.camera_data = ['E2', 'E6']
+MAP.camera_data_spawn_point = ['E2']
+MAP.map_data = """
+    -- -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1, 'boss': 1},
+    {'battle': 4, 'enemy': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, 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 = []
+    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 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    STAGE_INCREASE_AB = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    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):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def battle_0(self):
+        if self.clear_siren():
+            return True
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
+        return self.battle_default()
+
+    def battle_3(self):
+        return self.clear_boss()

campaign/event_20260226_cn/a2.py

@@ -0,0 +1,74 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .a1 import Config as ConfigBase
+
+MAP = CampaignMap('A2')
+MAP.shape = 'J7'
+MAP.camera_data = ['D2', 'D5', 'E4']
+MAP.camera_data_spawn_point = ['D5']
+MAP.map_data = """
+    -- 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
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, 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, \
+    = 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 =====
+
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+
+
+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_20260226_cn/a3.py

@@ -0,0 +1,75 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .a1 import Config as ConfigBase
+
+MAP = CampaignMap('A3')
+MAP.shape = 'H8'
+MAP.camera_data = ['D4', 'D6', 'E3']
+MAP.camera_data_spawn_point = ['D4']
+MAP.map_data = """
+    ++ ++ -- -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, \
+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 = []
+    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_20260226_cn/b1.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
+
+MAP = CampaignMap('B1')
+MAP.shape = 'I8'
+MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['D6']
+MAP.map_data = """
+    ++ -- -- -- -- -- -- -- --
+    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
+"""
+MAP.spawn_data = [
+    {'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, \
+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 = []
+    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 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    STAGE_INCREASE_AB = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    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):
+    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_20260226_cn/b2.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 .b1 import Config as ConfigBase
+
+MAP = CampaignMap('B2')
+MAP.shape = 'J8'
+MAP.camera_data = ['D2', 'D6', 'G2', 'G6']
+MAP.camera_data_spawn_point = ['G2']
+MAP.map_data = """
+    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
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 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, \
+    = 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_20260226_cn/b3.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 .b1 import Config as ConfigBase
+
+MAP = CampaignMap('B3')
+MAP.shape = 'I10'
+MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    ++ ++ ++ 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
+"""
+MAP.spawn_data = [
+    {'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, \
+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 = []
+    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_20260226_cn/c1.py

@@ -0,0 +1,84 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('C1')
+MAP.shape = 'I8'
+MAP.camera_data = ['E2', 'E6']
+MAP.camera_data_spawn_point = ['E2']
+MAP.map_data = """
+    -- -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, \
+    = 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 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    STAGE_INCREASE_AB = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    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):
+    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_20260226_cn/c2.py

@@ -0,0 +1,74 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .c1 import Config as ConfigBase
+
+MAP = CampaignMap('C2')
+MAP.shape = 'J7'
+MAP.camera_data = ['D2', 'D5', 'E4']
+MAP.camera_data_spawn_point = ['D5']
+MAP.map_data = """
+    -- 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
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, 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, \
+    = 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 =====
+
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+
+
+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_20260226_cn/c3.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 .c1 import Config as ConfigBase
+
+MAP = CampaignMap('C3')
+MAP.shape = 'H8'
+MAP.camera_data = ['D4', 'D6', 'E3']
+MAP.camera_data_spawn_point = ['D4']
+MAP.map_data = """
+    ++ ++ -- -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, \
+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 = []
+    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_20260226_cn/d1.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
+
+MAP = CampaignMap('D1')
+MAP.shape = 'I8'
+MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['D6']
+MAP.map_data = """
+    ++ -- -- -- -- -- -- -- --
+    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
+"""
+MAP.spawn_data = [
+    {'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, \
+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 = []
+    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 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    STAGE_INCREASE_AB = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    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):
+    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_20260226_cn/d2.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 .d1 import Config as ConfigBase
+
+MAP = CampaignMap('D2')
+MAP.shape = 'J8'
+MAP.camera_data = ['D2', 'D6', 'G2', 'G6']
+MAP.camera_data_spawn_point = ['G2']
+MAP.map_data = """
+    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
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 2},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 2, '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, \
+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, \
+    = 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_20260226_cn/d3.py

@@ -0,0 +1,91 @@
+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 .d1 import Config as ConfigBase
+
+MAP = CampaignMap('D3')
+MAP.shape = 'I10'
+MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    ++ ++ ++ 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
+"""
+MAP.spawn_data = [
+    {'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, \
+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 = []
+    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_20260226_cn/sp.py

@@ -0,0 +1,96 @@
+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 = 'H7'
+MAP.camera_data = ['D5', 'E2', 'E5']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    -- -- -- -- ++ -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 10, '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, \
+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 = []
+    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
+    STAR_REQUIRE_1 = 0
+    STAR_REQUIRE_2 = 0
+    STAR_REQUIRE_3 = 0
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = False
+    STAGE_INCREASE_AB = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    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):
+    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()

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

config/template.json

@@ -103,6 +103,7 @@
       "CommissionRecord": "do_not",
       "CombatRecord": "do_not",
       "OpsiRecord": "do_not",
+      "CL1Record": "do_not",
       "AkashiRecord": "do_not",
       "MeowfficerBuy": "do_not",
       "MeowfficerTalent": "do_not"
@@ -188,6 +189,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -196,13 +198,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -265,6 +267,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -273,13 +276,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -342,6 +345,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -350,13 +354,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -432,6 +436,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -510,6 +515,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -518,13 +524,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -587,6 +593,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -595,13 +602,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -659,7 +666,7 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
@@ -749,7 +756,7 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
@@ -824,6 +831,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -832,13 +840,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -905,6 +913,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -913,13 +922,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -986,6 +995,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -994,13 +1004,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -1067,6 +1077,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -1075,13 +1086,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -1148,6 +1159,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -1156,13 +1168,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -1225,6 +1237,7 @@
     },
     "Submarine": {
       "Fleet": 0,
+      "AutoRecommend": false,
       "Mode": "do_not_use",
       "AutoSearchMode": "sub_standby",
       "DistanceToBoss": "2_grid_to_boss"
@@ -1233,13 +1246,13 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
       "Fleet2Value": 119,
       "Fleet2Record": "2020-01-01 00:00:00",
-      "Fleet2Control": "prevent_yellow_face",
+      "Fleet2Control": "prevent_green_face",
       "Fleet2Recover": "not_in_dormitory",
       "Fleet2Oath": false,
       "Fleet2Onsen": false
@@ -1296,7 +1309,7 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
@@ -1347,7 +1360,7 @@
       "Mode": "calculate",
       "Fleet1Value": 119,
       "Fleet1Record": "2020-01-01 00:00:00",
-      "Fleet1Control": "prevent_yellow_face",
+      "Fleet1Control": "prevent_green_face",
       "Fleet1Recover": "not_in_dormitory",
       "Fleet1Oath": false,
       "Fleet1Onsen": false,
@@ -1402,7 +1415,8 @@
     },
     "AddNewStudent": {
       "Enable": false,
-      "Favorite": true
+      "Favorite": false,
+      "MinLevel": 50
     },
     "Storage": {
       "Storage": {}
@@ -1770,6 +1784,7 @@
       "Refresh": false,
       "BuySkinBox": "disabled",
       "BuySkinBoxAmount": 0,
+      "SkinBoxPositionFilter": "1 > 2 > 3",
       "ConsumeCoins": false,
       "Filter": "BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2\n> Cube\n> FoodT6 > FoodT5"
     },

deploy/Windows/emulator.py

@@ -142,10 +142,13 @@ class EmulatorManager(AlasManager):
         for adb in replace:
             logger.info(f'Replacing {adb}')
             bak = self.adb_path_to_backup(adb, new_backup=True)
-            logger.info(f'{adb} -----> {bak}')
-            shutil.move(adb, bak)
-            logger.info(f'{self.adb} -----> {adb}')
-            shutil.copy(self.adb, adb)
+            try:
+                logger.info(f'{adb} -----> {bak}')
+                shutil.move(adb, bak)
+                logger.info(f'{self.adb} -----> {adb}')
+                shutil.copy(self.adb, adb)
+            except OSError as e:
+                logger.warning(f'Failed to replace {adb}, {e}')
 
     def adb_recover(self):
         """

deploy/emulator.py

@@ -50,10 +50,11 @@ class VirtualBoxEmulator:
                 return root
 
         try:
-            reg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, f'{self.UNINSTALL_REG}\\{self.name}', 0)
+            with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, f'{self.UNINSTALL_REG}\\{self.name}', 0) as reg:
+                res = winreg.QueryValueEx(reg, 'UninstallString')[0]
         except FileNotFoundError:
-            reg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, f'{self.UNINSTALL_REG_2}\\{self.name}', 0)
-        res = winreg.QueryValueEx(reg, 'UninstallString')[0]
+            with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, f'{self.UNINSTALL_REG_2}\\{self.name}', 0) as reg:
+                res = winreg.QueryValueEx(reg, 'UninstallString')[0]
 
         file = re.search('"(.*?)"', res)
         file = file.group(1) if file else res
@@ -70,17 +71,17 @@ class VirtualBoxEmulator:
             str: Installation dir or None
         """
         try:
-            reg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, path, 0)
-            root = winreg.QueryValueEx(reg, key)[0]
-            if os.path.exists(root):
-                return root
+            with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, path, 0) as reg:
+                root = winreg.QueryValueEx(reg, key)[0]
+                if os.path.exists(root):
+                    return root
         except FileNotFoundError:
             pass
         try:
-            reg = winreg.OpenKey(winreg.HKEY_CURRENT_USER, path, 0)
-            root = winreg.QueryValueEx(reg, key)[0]
-            if os.path.exists(root):
-                return root
+            with winreg.OpenKey(winreg.HKEY_CURRENT_USER, path, 0) as reg:
+                root = winreg.QueryValueEx(reg, key)[0]
+                if os.path.exists(root):
+                    return root
         except FileNotFoundError:
             pass
 
@@ -137,16 +138,19 @@ class VirtualBoxEmulator:
         """
         for ori, bak in zip(self.adb_binary, self.adb_backup):
             logger.info(f'Replacing {ori}')
-            if os.path.exists(ori):
-                if filecmp.cmp(adb, ori, shallow=True):
-                    logger.info(f'{adb} is same as {ori}, skip')
+            try:
+                if os.path.exists(ori):
+                    if filecmp.cmp(adb, ori, shallow=True):
+                        logger.info(f'{adb} is same as {ori}, skip')
+                    else:
+                        logger.info(f'{ori} -----> {bak}')
+                        shutil.move(ori, bak)
+                        logger.info(f'{adb} -----> {ori}')
+                        shutil.copy(adb, ori)
                 else:
-                    logger.info(f'{ori} -----> {bak}')
-                    shutil.move(ori, bak)
-                    logger.info(f'{adb} -----> {ori}')
-                    shutil.copy(adb, ori)
-            else:
-                logger.info(f'{ori} not exists, skip')
+                    logger.info(f'{ori} not exists, skip')
+            except OSError as e:
+                logger.warning(f'Failed to replace {ori}, {e}')
 
     def adb_recover(self):
         """ Revert adb replacement """

dev_tools/map_extractor.py

@@ -343,9 +343,18 @@ class MapData:
         self.map_id = data['id']
 
         try:
-            self.spawn_data = self.parse_spawn_data(data)
+            self.event_enemy_data = None
+            self.event_enemy_data_loop = None
+            if self.map_id in MAP_EVENT_LIST:
+                self.event_enemy_data = self.extract_event_enemy_data(MAP_EVENT_LIST[self.map_id]['event_list'])
+                if data_loop is not None:
+                    self.event_enemy_data_loop = self.extract_event_enemy_data(MAP_EVENT_LIST[self.map_id]['event_list_loop'])
+                else:
+                    self.event_enemy_data_loop = None
+
+            self.spawn_data = self.parse_spawn_data(data, self.event_enemy_data)
             if data_loop is not None:
-                self.spawn_data_loop = self.parse_spawn_data(data_loop)
+                self.spawn_data_loop = self.parse_spawn_data(data_loop, self.event_enemy_data_loop)
                 if len(self.spawn_data) == len(self.spawn_data_loop) \
                         and all([s1 == s2 for s1, s2 in zip(self.spawn_data, self.spawn_data_loop)]):
                     self.spawn_data_loop = None
@@ -354,10 +363,10 @@ class MapData:
 
             # map_data
             # {0: {0: 6, 1: 8, 2: False, 3: 0}, ...}
-            self.map_data = self.parse_map_data(data['grids'])
+            self.map_data = self.parse_map_data(data['grids'], self.event_enemy_data)
             self.shape = tuple(np.max(list(self.map_data.keys()), axis=0))
             if self.data_loop is not None:
-                self.map_data_loop = self.parse_map_data(data_loop['grids'])
+                self.map_data_loop = self.parse_map_data(data_loop['grids'], self.event_enemy_data_loop)
                 if all([d1 == d2 for d1, d2 in zip(self.map_data.values(), self.map_data_loop.values())]):
                     self.map_data_loop = None
             else:
@@ -422,7 +431,7 @@ class MapData:
 
     __repr__ = __str__
 
-    def parse_map_data(self, grids):
+    def parse_map_data(self, grids, event_enemy_data=None):
         map_data = {}
         offset_y = min([grid[0] for grid in grids.values()])
         offset_x = min([grid[1] for grid in grids.values()])
@@ -435,11 +444,16 @@ class MapData:
             if info == '??':
                 print(f'Unknown grid info. grid={location2node(loca)}, info={grid[3]}')
             map_data[loca] = info
+        if isinstance(event_enemy_data, list):
+            for wave in event_enemy_data:
+                for enemy in wave.values():
+                    loca = (enemy[1][1] - offset_x, enemy[1][0] - offset_y)
+                    map_data[loca] = 'ME'
 
         return map_data
 
     @staticmethod
-    def parse_spawn_data(data):
+    def parse_spawn_data(data, event_enemy_data=None):
         try:
             battle_count = max(data['boss_refresh'], max(data['enemy_refresh'].keys()))
         except ValueError:
@@ -450,6 +464,11 @@ class MapData:
             if count:
                 spawn = spawn_data[index]
                 spawn['enemy'] = spawn.get('enemy', 0) + count
+        if isinstance(event_enemy_data, list):
+            for index, wave in enumerate(event_enemy_data):
+                if len(wave):
+                    spawn = spawn_data[index]
+                    spawn['enemy'] = spawn.get('enemy', 0) + len(wave)
         if ''.join([str(item) for item in data['elite_refresh'].values()]) != '100':  # Some data is incorrect
             for index, count in data['elite_refresh'].items():
                 if count:
@@ -470,6 +489,15 @@ class MapData:
 
         return spawn_data
 
+    def extract_event_enemy_data(self, data):
+        extracted_data = []
+        for event_id in data.values():
+            event = MAP_EVENT_TEMPLATE[event_id]
+            for effect in event['effect'].values():
+                if effect[0] == 'enemy':
+                    extracted_data.append(effect[1])
+        return extracted_data
+
     def map_file_name(self):
         name = self.chapter_name.replace('-', '_').lower()
         if name[0].isdigit():
@@ -567,6 +595,11 @@ class MapData:
         lines.append(f'    MAP_HAS_FLEET_STEP = {self.MAP_HAS_FLEET_STEP}')
         lines.append(f'    MAP_HAS_AMBUSH = {self.MAP_HAS_AMBUSH}')
         lines.append(f'    MAP_HAS_MYSTERY = {self.MAP_HAS_MYSTERY}')
+        lines.append(f'    MAP_CHAPTER_SWITCH_20241219 = True')
+        lines.append(f"    STAGE_ENTRANCE = ['half', '20240725']")
+        lines.append(f'    MAP_HAS_MODE_SWITCH = True')
+        lines.append(f'    STAGE_INCREASE_AB = True')
+        lines.append(f'    MAP_WALK_USE_CURRENT_FLEET = True')
         if self.MAP_HAS_PORTAL:
             lines.append(f'    MAP_HAS_PORTAL = {self.MAP_HAS_PORTAL}')
         if self.MAP_HAS_LAND_BASED:
@@ -751,8 +784,8 @@ ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
 LOADER = LuaLoader(FILE, server='CN')
 DATA = LOADER.load('./sharecfgdata/chapter_template.lua')
 DATA_LOOP = LOADER.load('./sharecfgdata/chapter_template_loop.lua')
-# MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua')
-# MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua')
+MAP_EVENT_LIST = LOADER.load('./sharecfg/map_event_list.lua')
+MAP_EVENT_TEMPLATE = LOADER.load('./sharecfg/map_event_template.lua')
 EXPECTATION_DATA = LOADER.load('./sharecfgdata/expedition_data_template.lua')
 
 ct = ChapterTemplate()

module/campaign/campaign_ocr.py

@@ -41,11 +41,21 @@ class CampaignOcr(ModuleBase):
     @staticmethod
     def _campaign_ocr_result_process(result):
         # The result will be like '7--2', because tha dash in game is '–' not '-'
-        result = result.lower().replace('--', '-').replace('--', '-')
-        if result.startswith('-'):
-            result = result[1:]
+        result = result.replace('--', '-').replace('--', '-').lstrip('-')
+
+        # Replace wrong 'I' from results like 'I1-1', '1I-1', 'I-I', '11-I', 'I4-4', to '1'
+        # while keeping results like 'isp-2', 'sp1'
+        def replace_func(match):
+            segment = match.group(0)
+            return segment.replace('I', '1')
+
+        result = re.sub(r'[0-9I]+-[0-9I]+', replace_func, result, count=1)
+
+        # Convert '72' to '7-2'
         if len(result) == 2 and result[0].isdigit():
             result = '-'.join(result)
+
+        result = result.lower()
         return result
 
     @staticmethod

module/campaign/gems_farming.py

@@ -708,6 +708,7 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
             total (int):
         """
         self.config.STOP_IF_REACH_LV32 = self.change_flagship
+        ship_change_attempted = False
         while 1:
             self._trigger_lv32 = False
             is_limit = self.config.StopCondition_RunCount
@@ -722,20 +723,39 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
                 else:
                     raise e
             except RequestHumanTakeover as e:
+                if (not e.args or e.args[0] != 'Hard not satisfied' 
+                    or not (self.change_flagship or self.change_vanguard)):
+                    raise
+                
+                if ship_change_attempted:
+                    logger.critical("Hard mode requirements still not satisfied after ship change")
+                    raise
+
+                attack_fleet = ('FLEET_2' if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all' 
+                                else 'FLEET_1')
+                if e.args[1:] != (attack_fleet, ):
+                    logger.critical("Fleet not meeting requirements is not (or not only) the attack fleet, " \
+                    "please check ALAS settings and in-game fleet preparation")
+                    raise
+
+                logger.warning('Hard mode requirements not satisfied, attempting ship change once')
                 try:
-                    if e.args[0] == 'Hard not satisfied' and self.change_flagship and self.change_vanguard:
-                        self.hard_mode_override()
+                    self.hard_mode_override()
+                    if self.change_flagship:
                         self.flagship_change()
+                    if self.change_vanguard:
                         self.vanguard_change()
-                    else:
-                        raise RequestHumanTakeover
-                except RequestHumanTakeover as e:
-                    raise RequestHumanTakeover
-                except Exception as e:
+                    ship_change_attempted = True
+                    continue
+                except RequestHumanTakeover:
+                    logger.warning("Failed to change ship")
+                    raise
+                except Exception:
                     from module.exception import GameStuckError
                     raise GameStuckError
 
-            # End
+            ship_change_attempted = False
+
             if self._trigger_lv32 or self._trigger_emotion:
                 success = True
                 self.hard_mode_override()

module/campaign/run.py

@@ -225,6 +225,7 @@ class CampaignRun(CampaignEvent, ShopStatus):
             'event_20250724_cn',
             'event_20250814_cn',
             'event_20251023_cn',
+            'event_20260326_cn',
             'war_archives_20231026_cn',
         ]:
             name = convert.get(name, name)
@@ -260,6 +261,7 @@ class CampaignRun(CampaignEvent, ShopStatus):
             'event_20250724_cn',
             'event_20250814_cn',
             'event_20251023_cn',
+            'event_20260326_cn',
             'war_archives_20231026_cn',
         ]:
             name = convert.get(name, name)

module/combat/assets.py

@@ -17,7 +17,7 @@ BATTLE_STATUS_B = Button(area={'cn': (625, 297, 712, 317), 'en': (625, 297, 712,
 BATTLE_STATUS_C = Button(area={'cn': (625, 211, 647, 297), 'en': (625, 211, 647, 297), 'jp': (625, 211, 647, 297), 'tw': (625, 211, 647, 297)}, color={'cn': (199, 208, 198), 'en': (199, 208, 198), 'jp': (199, 208, 198), 'tw': (199, 208, 198)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_C.png', 'en': './assets/en/combat/BATTLE_STATUS_C.png', 'jp': './assets/jp/combat/BATTLE_STATUS_C.png', 'tw': './assets/tw/combat/BATTLE_STATUS_C.png'})
 BATTLE_STATUS_D = Button(area={'cn': (618, 191, 639, 317), 'en': (618, 191, 639, 317), 'jp': (618, 191, 639, 317), 'tw': (618, 191, 639, 317)}, color={'cn': (199, 208, 199), 'en': (199, 208, 199), 'jp': (199, 208, 199), 'tw': (199, 208, 199)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png', 'jp': './assets/jp/combat/BATTLE_STATUS_D.png', 'tw': './assets/tw/combat/BATTLE_STATUS_D.png'})
 BATTLE_STATUS_S = Button(area={'cn': (643, 297, 722, 317), 'en': (643, 297, 722, 317), 'jp': (643, 297, 722, 317), 'tw': (643, 297, 722, 317)}, color={'cn': (233, 242, 127), 'en': (233, 242, 127), 'jp': (233, 242, 127), 'tw': (233, 242, 127)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_S.png', 'en': './assets/en/combat/BATTLE_STATUS_S.png', 'jp': './assets/jp/combat/BATTLE_STATUS_S.png', 'tw': './assets/tw/combat/BATTLE_STATUS_S.png'})
-COMBAT_AUTO = Button(area={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, color={'cn': (229, 242, 255), 'en': (229, 242, 255), 'jp': (229, 242, 255), 'tw': (229, 242, 255)}, button={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
+COMBAT_AUTO = Button(area={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
 COMBAT_AUTO_133 = Button(area={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_133.png', 'en': './assets/en/combat/COMBAT_AUTO_133.png', 'jp': './assets/jp/combat/COMBAT_AUTO_133.png', 'tw': './assets/tw/combat/COMBAT_AUTO_133.png'})
 COMBAT_AUTO_150 = Button(area={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, color={'cn': (238, 247, 255), 'en': (238, 247, 255), 'jp': (238, 247, 255), 'tw': (238, 247, 255)}, button={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_150.png', 'en': './assets/en/combat/COMBAT_AUTO_150.png', 'jp': './assets/jp/combat/COMBAT_AUTO_150.png', 'tw': './assets/tw/combat/COMBAT_AUTO_150.png'})
 COMBAT_AUTO_SWITCH = Button(area={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, color={'cn': (179, 198, 235), 'en': (105, 137, 189), 'jp': (160, 177, 220), 'tw': (179, 198, 235)}, button={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_SWITCH.png', 'en': './assets/en/combat/COMBAT_AUTO_SWITCH.png', 'jp': './assets/jp/combat/COMBAT_AUTO_SWITCH.png', 'tw': './assets/tw/combat/COMBAT_AUTO_SWITCH.png'})
@@ -39,6 +39,7 @@ LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680
 MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'})
 MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'})
 MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'})
+MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/MOVE_LEFT_UP.png', 'en': './assets/cn/combat/MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/MOVE_LEFT_UP.png'})
 NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'})
 OPTS_INFO_D = Button(area={'cn': (601, 151, 704, 178), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (158, 110, 113), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'})
 QUIT_RECONFIRM = Button(area={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, color={'cn': (207, 140, 133), 'en': (208, 147, 141), 'jp': (203, 138, 132), 'tw': (211, 158, 152)}, button={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, file={'cn': './assets/cn/combat/QUIT_RECONFIRM.png', 'en': './assets/en/combat/QUIT_RECONFIRM.png', 'jp': './assets/jp/combat/QUIT_RECONFIRM.png', 'tw': './assets/tw/combat/QUIT_RECONFIRM.png'})

module/combat/combat.py

@@ -126,6 +126,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
             return PAUSE_MaidCafe
         if PAUSE_Ancient.match_template_color(self.device.image, offset=(10, 10)):
             return PAUSE_Ancient
+        if PAUSE_SpringInn.match_template_color(self.device.image, offset=(10, 10)):
+            return PAUSE_SpringInn
+        if PAUSE_ElvenVine.match_template_color(self.device.image, offset=(10, 10)):
+            return PAUSE_ElvenVine
         return False
 
     def handle_combat_quit(self, offset=(20, 20), interval=3):
@@ -177,6 +181,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
             self.device.click(QUIT_MaidCafe)
             timer.reset()
             return True
+        if QUIT_SpringInn.match_luma(self.device.image, offset=offset):
+            self.device.click(QUIT_SpringInn)
+            timer.reset()
+            return True
         return False
 
     def handle_combat_quit_reconfirm(self, interval=2):

module/combat/combat_manual.py

@@ -42,6 +42,20 @@ class CombatManual(ModuleBase):
         self.device.long_click(MOVE_LEFT_DOWN, duration=(3.5, 5.5))
         return True
 
+    def handle_combat_stand_still_upper_left(self, auto):
+        """
+        Args:
+            auto (str): Combat auto mode.
+
+        Returns:
+            bool: If executed
+        """
+        if auto != 'hide_in_upper_left':
+            return False
+
+        self.device.long_click(MOVE_LEFT_UP, duration=(1.5, 3.5))
+        return True
+
     def handle_combat_weapon_release(self):
         if self.appear_then_click(READY_AIR_RAID, interval=10):
             return True
@@ -67,5 +81,8 @@ class CombatManual(ModuleBase):
         if self.handle_combat_stand_still_bottom_left(auto):
             self.manual_executed = True
             return True
+        if self.handle_combat_stand_still_upper_left(auto):
+            self.manual_executed = True
+            return True
 
         return False

module/combat_ui/assets.py

@@ -10,6 +10,7 @@ PAUSE_Christmas = Button(area={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250
 PAUSE_Cyber = Button(area={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, color={'cn': (40, 140, 157), 'en': (40, 140, 157), 'jp': (40, 140, 157), 'tw': (40, 140, 157)}, button={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Cyber.png', 'en': './assets/cn/combat_ui/PAUSE_Cyber.png', 'jp': './assets/cn/combat_ui/PAUSE_Cyber.png', 'tw': './assets/cn/combat_ui/PAUSE_Cyber.png'})
 PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'})
 PAUSE_Devil = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (193, 98, 108), 'en': (193, 98, 108), 'jp': (193, 98, 108), 'tw': (193, 98, 108)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Devil.png', 'en': './assets/cn/combat_ui/PAUSE_Devil.png', 'jp': './assets/cn/combat_ui/PAUSE_Devil.png', 'tw': './assets/cn/combat_ui/PAUSE_Devil.png'})
+PAUSE_ElvenVine = Button(area={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, color={'cn': (152, 189, 166), 'en': (152, 189, 166), 'jp': (152, 189, 166), 'tw': (152, 189, 166)}, button={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'en': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'jp': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'tw': './assets/cn/combat_ui/PAUSE_ElvenVine.png'})
 PAUSE_HolyLight = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (54, 40, 27), 'en': (54, 40, 27), 'jp': (54, 40, 27), 'tw': (54, 40, 27)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'en': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'jp': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'tw': './assets/cn/combat_ui/PAUSE_HolyLight.png'})
 PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'})
 PAUSE_MaidCafe = Button(area={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, color={'cn': (159, 145, 139), 'en': (159, 145, 139), 'jp': (159, 145, 139), 'tw': (159, 145, 139)}, button={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, file={'cn': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'en': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'jp': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'tw': './assets/cn/combat_ui/PAUSE_MaidCafe.png'})
@@ -20,6 +21,7 @@ PAUSE_Nurse = Button(area={'cn': (1236, 33, 1251, 50), 'en': (1236, 33, 1251, 50
 PAUSE_Pharaoh = Button(area={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, color={'cn': (164, 119, 78), 'en': (164, 119, 78), 'jp': (164, 119, 78), 'tw': (164, 119, 78)}, button={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, file={'cn': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'en': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'jp': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'tw': './assets/cn/combat_ui/PAUSE_Pharaoh.png'})
 PAUSE_Seaside = Button(area={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, color={'cn': (172, 196, 212), 'en': (172, 196, 212), 'jp': (172, 196, 212), 'tw': (172, 196, 212)}, button={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Seaside.png', 'en': './assets/cn/combat_ui/PAUSE_Seaside.png', 'jp': './assets/cn/combat_ui/PAUSE_Seaside.png', 'tw': './assets/cn/combat_ui/PAUSE_Seaside.png'})
 PAUSE_ShadowPuppetry = Button(area={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, color={'cn': (139, 112, 72), 'en': (139, 112, 72), 'jp': (139, 112, 72), 'tw': (139, 112, 72)}, button={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'en': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'jp': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'tw': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png'})
+PAUSE_SpringInn = Button(area={'cn': (1212, 37, 1235, 61), 'en': (1212, 37, 1235, 61), 'jp': (1212, 37, 1235, 61), 'tw': (1212, 37, 1235, 61)}, color={'cn': (201, 91, 78), 'en': (201, 91, 78), 'jp': (201, 91, 78), 'tw': (201, 91, 78)}, button={'cn': (1212, 37, 1235, 61), 'en': (1212, 37, 1235, 61), 'jp': (1212, 37, 1235, 61), 'tw': (1212, 37, 1235, 61)}, file={'cn': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'en': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'jp': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'tw': './assets/cn/combat_ui/PAUSE_SpringInn.png'})
 PAUSE_Star = Button(area={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, color={'cn': (169, 179, 179), 'en': (169, 179, 179), 'jp': (169, 179, 179), 'tw': (169, 179, 179)}, button={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Star.png', 'en': './assets/cn/combat_ui/PAUSE_Star.png', 'jp': './assets/cn/combat_ui/PAUSE_Star.png', 'tw': './assets/cn/combat_ui/PAUSE_Star.png'})
 QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (216, 168, 164), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/combat_ui/QUIT.png', 'en': './assets/en/combat_ui/QUIT.png', 'jp': './assets/jp/combat_ui/QUIT.png', 'tw': './assets/tw/combat_ui/QUIT.png'})
 QUIT_Christmas = Button(area={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, color={'cn': (195, 139, 166), 'en': (207, 166, 185), 'jp': (195, 139, 166), 'tw': (195, 139, 166)}, button={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Christmas.png', 'en': './assets/en/combat_ui/QUIT_Christmas.png', 'jp': './assets/cn/combat_ui/QUIT_Christmas.png', 'tw': './assets/cn/combat_ui/QUIT_Christmas.png'})
@@ -31,3 +33,4 @@ QUIT_Ninja = Button(area={'cn': (398, 509, 477, 528), 'en': (398, 509, 477, 528)
 QUIT_Nurse = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (254, 193, 170), 'en': (254, 193, 170), 'jp': (254, 193, 170), 'tw': (254, 193, 170)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Nurse.png', 'en': './assets/cn/combat_ui/QUIT_Nurse.png', 'jp': './assets/cn/combat_ui/QUIT_Nurse.png', 'tw': './assets/cn/combat_ui/QUIT_Nurse.png'})
 QUIT_Pharaoh = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (204, 132, 108), 'en': (204, 132, 108), 'jp': (204, 132, 108), 'tw': (204, 132, 108)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'en': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'jp': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'tw': './assets/cn/combat_ui/QUIT_Pharaoh.png'})
 QUIT_Seaside = Button(area={'cn': (398, 509, 476, 528), 'en': (398, 509, 476, 528), 'jp': (398, 509, 476, 528), 'tw': (398, 509, 476, 528)}, color={'cn': (247, 208, 188), 'en': (247, 208, 188), 'jp': (247, 208, 188), 'tw': (247, 208, 188)}, button={'cn': (398, 509, 476, 528), 'en': (398, 509, 476, 528), 'jp': (398, 509, 476, 528), 'tw': (398, 509, 476, 528)}, file={'cn': './assets/cn/combat_ui/QUIT_Seaside.png', 'en': './assets/cn/combat_ui/QUIT_Seaside.png', 'jp': './assets/cn/combat_ui/QUIT_Seaside.png', 'tw': './assets/cn/combat_ui/QUIT_Seaside.png'})
+QUIT_SpringInn = Button(area={'cn': (396, 559, 478, 584), 'en': (396, 559, 478, 584), 'jp': (396, 559, 478, 584), 'tw': (396, 559, 478, 584)}, color={'cn': (145, 88, 80), 'en': (145, 88, 80), 'jp': (145, 88, 80), 'tw': (145, 88, 80)}, button={'cn': (396, 559, 478, 584), 'en': (396, 559, 478, 584), 'jp': (396, 559, 478, 584), 'tw': (396, 559, 478, 584)}, file={'cn': './assets/cn/combat_ui/QUIT_SpringInn.png', 'en': './assets/cn/combat_ui/QUIT_SpringInn.png', 'jp': './assets/cn/combat_ui/QUIT_SpringInn.png', 'tw': './assets/cn/combat_ui/QUIT_SpringInn.png'})

module/config/argument/argument.yaml

@@ -69,6 +69,7 @@ EmulatorInfo:
       LDPlayer3,
       LDPlayer4,
       LDPlayer9,
+      LDPlayer14,
       MuMuPlayer,
       MuMuPlayerX,
       MuMuPlayer12,
@@ -114,6 +115,9 @@ DropRecord:
   OpsiRecord:
     value: do_not
     option: [ do_not, save, upload, save_and_upload ]
+  CL1Record:
+    value: do_not
+    option: [ do_not, save, upload, save_and_upload ]
   AkashiRecord:
     value: do_not
     option: [ do_not, save ]
@@ -182,7 +186,7 @@ Fleet:
     option: [ line_ahead, double_line, diamond ]
   Fleet1Mode:
     value: combat_auto
-    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
+    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
   Fleet1Step:
     value: 3
     option: [ 2, 3, 4, 5 ]
@@ -194,7 +198,7 @@ Fleet:
     option: [ line_ahead, double_line, diamond ]
   Fleet2Mode:
     value: combat_auto
-    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
+    option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
   Fleet2Step:
     value: 2
     option: [ 2, 3, 4, 5 ]
@@ -205,6 +209,7 @@ Submarine:
   Fleet:
     value: 0
     option: [ 0, 1, 2 ]
+  AutoRecommend: false
   Mode:
     value: do_not_use
     option: [ do_not_use, hunt_only, boss_only, hunt_and_boss, every_combat ]
@@ -223,7 +228,7 @@ Emotion:
     value: 2020-01-01 00:00:00
     display: disabled
   Fleet1Control:
-    value: prevent_yellow_face
+    value: prevent_green_face
     option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
   Fleet1Recover:
     value: not_in_dormitory
@@ -235,7 +240,7 @@ Emotion:
     value: 2020-01-01 00:00:00
     display: disabled
   Fleet2Control:
-    value: prevent_yellow_face
+    value: prevent_green_face
     option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
   Fleet2Recover:
     value: not_in_dormitory
@@ -396,7 +401,8 @@ ControlExpOverflow:
   T1Allow: 200
 AddNewStudent:
   Enable: false
-  Favorite: true
+  Favorite: false
+  MinLevel: 50
 Research:
   UseCube:
     value: only_05_hour
@@ -536,6 +542,11 @@ _Island:
       - chao_ho
       - william_d_porter
       - chen_hai
+      - hood
+      - prinz_eugen
+      - tb
+      - oceana
+      - explorer
       - unicorn
       - cheshire
       - amagi_chan
@@ -675,6 +686,8 @@ GeneralShop:
     value: disabled
     option: [ disabled, unlimited, specified ]
   BuySkinBoxAmount: 0
+  SkinBoxPositionFilter: |-
+    1 > 2 > 3
   ConsumeCoins: false
   Filter: |-
     BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2

module/config/config_generated.py

@@ -27,7 +27,7 @@ class GeneratedConfig:
     Emulator_AdbRestart = False
 
     # Group `EmulatorInfo`
-    EmulatorInfo_Emulator = 'auto'  # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer
+    EmulatorInfo_Emulator = 'auto'  # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer
     EmulatorInfo_name = None
     EmulatorInfo_path = None
 
@@ -52,6 +52,7 @@ class GeneratedConfig:
     DropRecord_CommissionRecord = 'do_not'  # do_not, save, upload, save_and_upload
     DropRecord_CombatRecord = 'do_not'  # do_not, save
     DropRecord_OpsiRecord = 'do_not'  # do_not, save, upload, save_and_upload
+    DropRecord_CL1Record = 'do_not'  # do_not, save, upload, save_and_upload
     DropRecord_AkashiRecord = 'do_not'  # do_not, save
     DropRecord_MeowfficerBuy = 'do_not'  # do_not, save
     DropRecord_MeowfficerTalent = 'do_not'  # do_not, save, upload, save_and_upload
@@ -99,16 +100,17 @@ class GeneratedConfig:
     # Group `Fleet`
     Fleet_Fleet1 = 1  # 1, 2, 3, 4, 5, 6
     Fleet_Fleet1Formation = 'double_line'  # line_ahead, double_line, diamond
-    Fleet_Fleet1Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
+    Fleet_Fleet1Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
     Fleet_Fleet1Step = 3  # 2, 3, 4, 5
     Fleet_Fleet2 = 2  # 0, 1, 2, 3, 4, 5, 6
     Fleet_Fleet2Formation = 'double_line'  # line_ahead, double_line, diamond
-    Fleet_Fleet2Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
+    Fleet_Fleet2Mode = 'combat_auto'  # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
     Fleet_Fleet2Step = 2  # 2, 3, 4, 5
     Fleet_FleetOrder = 'fleet1_mob_fleet2_boss'  # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all
 
     # Group `Submarine`
     Submarine_Fleet = 0  # 0, 1, 2
+    Submarine_AutoRecommend = False
     Submarine_Mode = 'do_not_use'  # do_not_use, hunt_only, boss_only, hunt_and_boss, every_combat
     Submarine_AutoSearchMode = 'sub_standby'  # sub_standby, sub_auto_call
     Submarine_DistanceToBoss = '2_grid_to_boss'  # to_boss_position, 1_grid_to_boss, 2_grid_to_boss, use_open_ocean_support
@@ -117,13 +119,13 @@ class GeneratedConfig:
     Emotion_Mode = 'calculate'  # calculate, ignore, calculate_ignore
     Emotion_Fleet1Value = 119
     Emotion_Fleet1Record = datetime.datetime(2020, 1, 1, 0, 0)
-    Emotion_Fleet1Control = 'prevent_yellow_face'  # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
+    Emotion_Fleet1Control = 'prevent_green_face'  # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
     Emotion_Fleet1Recover = 'not_in_dormitory'  # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
     Emotion_Fleet1Oath = False
     Emotion_Fleet1Onsen = False
     Emotion_Fleet2Value = 119
     Emotion_Fleet2Record = datetime.datetime(2020, 1, 1, 0, 0)
-    Emotion_Fleet2Control = 'prevent_yellow_face'  # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
+    Emotion_Fleet2Control = 'prevent_green_face'  # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
     Emotion_Fleet2Recover = 'not_in_dormitory'  # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
     Emotion_Fleet2Oath = False
     Emotion_Fleet2Onsen = False
@@ -220,7 +222,8 @@ class GeneratedConfig:
 
     # Group `AddNewStudent`
     AddNewStudent_Enable = False
-    AddNewStudent_Favorite = True
+    AddNewStudent_Favorite = False
+    AddNewStudent_MinLevel = 50
 
     # Group `Research`
     Research_UseCube = 'only_05_hour'  # always_use, only_05_hour, only_no_project, do_not_use
@@ -279,142 +282,143 @@ class GeneratedConfig:
     # Group `Island1`
     Island1_Receive = False
     Island1_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8
-    Island1_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island1_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island1_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8
-    Island1_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island1_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island1_Option3 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8
-    Island1_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island1_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island1_Option4 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8
-    Island1_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island1_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island2`
     Island2_Receive = False
     Island2_Option1 = 0  # 0, 1
-    Island2_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island2_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island2_Option2 = 0  # 0, 2
-    Island2_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island2_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island2_Option3 = 0  # 0, 3
-    Island2_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island2_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island2_Option4 = 0  # 0, 4
-    Island2_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island2_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island3`
     Island3_Receive = False
     Island3_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-    Island3_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island3_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island3_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-    Island3_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island3_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island3_Option3 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-    Island3_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island3_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island4`
     Island4_Receive = False
     Island4_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island4_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island4_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island4_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island4_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island4_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island4_Option3 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island4_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island4_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island4_Option4 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island4_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island4_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island5`
     Island5_Receive = False
     Island5_Option1 = 0  # 0, 1, 2, 3, 4
-    Island5_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island5_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island5_Option2 = 0  # 0, 1, 2, 3, 4
-    Island5_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island5_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island5_Option3 = 0  # 0, 1, 2, 3, 4
-    Island5_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island5_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island5_Option4 = 0  # 0, 1, 2, 3, 4
-    Island5_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island5_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island6`
     Island6_Receive = False
     Island6_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7
-    Island6_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island6_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island6_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7
-    Island6_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island6_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island6_Option3 = 0  # 0, 1, 2, 3, 4, 5, 6, 7
-    Island6_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island6_Character3 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island6_Option4 = 0  # 0, 1, 2, 3, 4, 5, 6, 7
-    Island6_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island6_Character4 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island7`
     Island7_Receive = False
     Island7_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island7_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island7_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island7_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island7_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island7_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island8`
     Island8_Receive = False
     Island8_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
-    Island8_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island8_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island8_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
-    Island8_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island8_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island9`
     Island9_Receive = False
     Island9_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
-    Island9_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island9_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island9_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
-    Island9_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island9_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island10`
     Island10_Receive = False
     Island10_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-    Island10_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island10_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island10_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-    Island10_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island10_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island11`
     Island11_Receive = False
     Island11_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island11_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island11_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island11_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island11_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island11_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island12`
     Island12_Receive = False
     Island12_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island12_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island12_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island12_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island12_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island12_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island13`
     Island13_Receive = False
     Island13_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island13_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island13_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island13_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6
-    Island13_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island13_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island14`
     Island14_Receive = False
     Island14_Option1 = 0  # 0, 1, 2, 3, 4
-    Island14_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island14_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island14_Option2 = 0  # 0, 1, 2, 3, 4
-    Island14_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island14_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island15`
     Island15_Receive = False
     Island15_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island15_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island15_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island15_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island15_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island15_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `Island16`
     Island16_Receive = False
     Island16_Option1 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island16_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island16_Character1 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
     Island16_Option2 = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    Island16_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
+    Island16_Character2 = 'manjuu'  # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe
 
     # Group `GeneralShop`
     GeneralShop_UseGems = False
     GeneralShop_Refresh = False
     GeneralShop_BuySkinBox = 'disabled'  # disabled, unlimited, specified
     GeneralShop_BuySkinBoxAmount = 0
+    GeneralShop_SkinBoxPositionFilter = '1 > 2 > 3'
     GeneralShop_ConsumeCoins = False
     GeneralShop_Filter = 'BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2\n> Cube\n> FoodT6 > FoodT5'
 

module/config/i18n/en-US.json

@@ -482,6 +482,7 @@
       "LDPlayer3": "LD Player 3",
       "LDPlayer4": "LD Player 4",
       "LDPlayer9": "LD Player 9",
+      "LDPlayer14": "LDPlayer 14",
       "MuMuPlayer": "MuMu Player",
       "MuMuPlayerX": "MuMu Player X",
       "MuMuPlayer12": "MuMu Player 12",
@@ -596,6 +597,14 @@
       "upload": "Upload",
       "save_and_upload": "Save and upload"
     },
+    "CL1Record": {
+      "name": "CL1 Record",
+      "help": "Whether to save CL1 drop screenshots is controlled independently by this option",
+      "do_not": "Do nothing",
+      "save": "Save",
+      "upload": "Upload",
+      "save_and_upload": "Save and upload"
+    },
     "AkashiRecord": {
       "name": "Opsi Akashi Shop Record",
       "help": "",
@@ -770,7 +779,7 @@
       "event_20231026_cn": "Tempesta and the Fountain of Youth",
       "event_20231123_cn": "The Ninja Scrolls: Azur Flash",
       "event_20231221_cn": "Light-Chasing Sea of Stars Rerun",
-      "event_20240229_cn": "Snowrealm Peregrination",
+      "event_20240229_cn": "Snowrealm Peregrination Rerun",
       "event_20240425_cn": "Heart-Linking Harmony",
       "event_20240521_cn": "Light of the Martyrium",
       "event_20240725_cn": "Interlude of Illusions",
@@ -788,6 +797,8 @@
       "event_20250912_cn": "A Dance for Amahara Above",
       "event_20251023_cn": "Tempesta and Islas de Libertád",
       "event_20251218_cn": "A Note Through the Firmament",
+      "event_20260226_cn": "Springtide Inn Online",
+      "event_20260326_cn": "The Vagabond’s Recruitment Plan",
       "raid_20200624": "Air Raid Drills with Essex Rerun",
       "raid_20210708": "Cross Wave rerun",
       "raid_20220127": "Mystery Investigation",
@@ -949,7 +960,8 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left"
+      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet1Step": {
       "name": "Fleet 1 Step Number",
@@ -983,7 +995,8 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left"
+      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet2Step": {
       "name": "Fleet 2 Step Number",
@@ -1014,6 +1027,10 @@
       "1": "1",
       "2": "2"
     },
+    "AutoRecommend": {
+      "name": "Hard Mode Auto-Recommend",
+      "help": "Auto-fills empty submarine fleet if using via recommend button in Hard Mode"
+    },
     "Mode": {
       "name": "Submarine Mode",
       "help": "Effective only when auto search disabled. Reminder: 'Hunt and Boss' is actually a mix of 'Hunt Only' and 'Boss Only', it does hunt and summon submarines at boss if available.",
@@ -1515,6 +1532,10 @@
     "Favorite": {
       "name": "Use Favorite Filter",
       "help": "During student selection apply the favorite filter\nThereby, giving priority to certain ship girls\nApply the favorite status to a ship girl in-game"
+    },
+    "MinLevel": {
+      "name": "Add Students with Level >= X Only",
+      "help": ""
     }
   },
   "Research": {
@@ -1792,6 +1813,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1826,6 +1852,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1860,6 +1891,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1894,6 +1930,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1931,6 +1972,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1958,6 +2004,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1985,6 +2036,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2012,6 +2068,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2064,6 +2125,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2106,6 +2172,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2148,6 +2219,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2190,6 +2266,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2222,6 +2303,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2254,6 +2340,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2286,6 +2377,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2326,6 +2422,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2356,6 +2457,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2386,6 +2492,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2416,6 +2527,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2459,6 +2575,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2492,6 +2613,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2525,6 +2651,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2558,6 +2689,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2603,6 +2739,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2638,6 +2779,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2686,6 +2832,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2724,6 +2875,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2771,6 +2927,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2808,6 +2969,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2854,6 +3020,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2890,6 +3061,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2935,6 +3111,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2970,6 +3151,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3012,6 +3198,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3044,6 +3235,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3086,6 +3282,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3118,6 +3319,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3158,6 +3364,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3188,6 +3399,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3233,6 +3449,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3268,6 +3489,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3313,6 +3539,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3348,6 +3579,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3380,6 +3616,10 @@
       "name": "Purchase X Skin Boxes",
       "help": "Takes effect when \"Purchase Specified Quantity\" is selected."
     },
+    "SkinBoxPositionFilter": {
+      "name": "Specific Skin Box Filter",
+      "help": "Used when multiple skin box types are sold simultaneously in the shop. Enter position(s) to target specific skin boxes; positions start from 1 (left to right). Uses the same format as filters, e.g. 1 > 2 > 3.\nLeave empty for no restriction."
+    },
     "ConsumeCoins": {
       "name": "Consume Spilled Coins",
       "help": "Buy all items when the coins exceed 550000"

module/config/i18n/ja-JP.json

@@ -482,6 +482,7 @@
       "LDPlayer3": "LDPlayer3",
       "LDPlayer4": "LDPlayer4",
       "LDPlayer9": "LDPlayer9",
+      "LDPlayer14": "LDPlayer14",
       "MuMuPlayer": "MuMuPlayer",
       "MuMuPlayerX": "MuMuPlayerX",
       "MuMuPlayer12": "MuMuPlayer12",
@@ -596,6 +597,14 @@
       "upload": "upload",
       "save_and_upload": "save_and_upload"
     },
+    "CL1Record": {
+      "name": "DropRecord.CL1Record.name",
+      "help": "DropRecord.CL1Record.help",
+      "do_not": "do_not",
+      "save": "save",
+      "upload": "upload",
+      "save_and_upload": "save_and_upload"
+    },
     "AkashiRecord": {
       "name": "DropRecord.AkashiRecord.name",
       "help": "DropRecord.AkashiRecord.help",
@@ -770,7 +779,7 @@
       "event_20231026_cn": "テンペスタと若返りの泉",
       "event_20231123_cn": "蒼閃忍法帖",
       "event_20231221_cn": "光追う星の海（復刻）",
-      "event_20240229_cn": "銀界遊廻",
+      "event_20240229_cn": "銀界遊廻（復刻）",
       "event_20240425_cn": "共鳴のパッション",
       "event_20240521_cn": "赫輝のマルティリウム",
       "event_20240725_cn": "夢幻の間奏曲",
@@ -788,6 +797,8 @@
       "event_20250912_cn": "アマハラに舞い奉れ",
       "event_20251023_cn": "テンペスタと自由群島",
       "event_20251218_cn": "天穹に響く音謡",
+      "event_20260226_cn": "春色旅籠Online",
+      "event_20260326_cn": "ワンダラー募集計画",
       "raid_20200624": "特別演習超空強襲波（復刻）",
       "raid_20210708": "交錯する新たな波 (復刻)",
       "raid_20220127": "秘密事件調査",
@@ -949,7 +960,8 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left"
+      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet1Step": {
       "name": "Fleet.Fleet1Step.name",
@@ -983,7 +995,8 @@
       "combat_auto": "combat_auto",
       "combat_manual": "combat_manual",
       "stand_still_in_the_middle": "stand_still_in_the_middle",
-      "hide_in_bottom_left": "hide_in_bottom_left"
+      "hide_in_bottom_left": "hide_in_bottom_left",
+      "hide_in_upper_left": "hide_in_upper_left"
     },
     "Fleet2Step": {
       "name": "Fleet.Fleet2Step.name",
@@ -1014,6 +1027,10 @@
       "1": "1",
       "2": "2"
     },
+    "AutoRecommend": {
+      "name": "Submarine.AutoRecommend.name",
+      "help": "Submarine.AutoRecommend.help"
+    },
     "Mode": {
       "name": "Submarine.Mode.name",
       "help": "Submarine.Mode.help",
@@ -1515,6 +1532,10 @@
     "Favorite": {
       "name": "好ましい選択",
       "help": ""
+    },
+    "MinLevel": {
+      "name": "レベルがX以上のキャラクターのみを追加してください。",
+      "help": ""
     }
   },
   "Research": {
@@ -1792,6 +1813,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1826,6 +1852,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1860,6 +1891,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1894,6 +1930,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1931,6 +1972,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1958,6 +2004,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1985,6 +2036,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2012,6 +2068,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2064,6 +2125,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2106,6 +2172,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2148,6 +2219,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2190,6 +2266,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2222,6 +2303,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2254,6 +2340,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2286,6 +2377,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2326,6 +2422,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2356,6 +2457,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2386,6 +2492,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2416,6 +2527,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2459,6 +2575,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2492,6 +2613,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2525,6 +2651,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2558,6 +2689,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2603,6 +2739,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2638,6 +2779,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2686,6 +2832,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2724,6 +2875,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2771,6 +2927,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2808,6 +2969,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2854,6 +3020,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2890,6 +3061,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2935,6 +3111,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2970,6 +3151,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3012,6 +3198,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3044,6 +3235,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3086,6 +3282,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3118,6 +3319,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3158,6 +3364,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3188,6 +3399,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3233,6 +3449,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3268,6 +3489,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3313,6 +3539,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3348,6 +3579,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3380,6 +3616,10 @@
       "name": "GeneralShop.BuySkinBoxAmount.name",
       "help": "GeneralShop.BuySkinBoxAmount.help"
     },
+    "SkinBoxPositionFilter": {
+      "name": "GeneralShop.SkinBoxPositionFilter.name",
+      "help": "GeneralShop.SkinBoxPositionFilter.help"
+    },
     "ConsumeCoins": {
       "name": "GeneralShop.ConsumeCoins.name",
       "help": "GeneralShop.ConsumeCoins.help"

module/config/i18n/zh-CN.json

@@ -482,6 +482,7 @@
       "LDPlayer3": "雷电模拟器3",
       "LDPlayer4": "雷电模拟器4",
       "LDPlayer9": "雷电模拟器9",
+      "LDPlayer14": "雷电模拟器14",
       "MuMuPlayer": "MuMu模拟器",
       "MuMuPlayerX": "MuMu模拟器X",
       "MuMuPlayer12": "MuMu模拟器12",
@@ -596,6 +597,14 @@
       "upload": "上传",
       "save_and_upload": "保存并上传"
     },
+    "CL1Record": {
+      "name": "侵蚀一掉落截图",
+      "help": "是否保存侵蚀一掉落截图由该选项单独控制，与 “大世界掉落截图” 选项无关",
+      "do_not": "无操作",
+      "save": "保存",
+      "upload": "上传",
+      "save_and_upload": "保存并上传"
+    },
     "AkashiRecord": {
       "name": "大世界明石商店截图",
       "help": "",
@@ -770,7 +779,7 @@
       "event_20231026_cn": "飓风与青春之泉",
       "event_20231123_cn": "苍闪忍法帖",
       "event_20231221_cn": "复刻星海逐光",
-      "event_20240229_cn": "雪境迷踪",
+      "event_20240229_cn": "复刻雪境迷踪",
       "event_20240425_cn": "共鸣的PASSION",
       "event_20240521_cn": "绽放于辉光之城",
       "event_20240725_cn": "幻梦间奏曲",
@@ -788,6 +797,8 @@
       "event_20250912_cn": "起舞于天原之上",
       "event_20251023_cn": "飓风与自由群岛",
       "event_20251218_cn": "响彻于天穹之音",
+      "event_20260226_cn": "春满客栈Online",
+      "event_20260326_cn": "漫游者招募计划",
       "raid_20200624": "复刻特别演习埃塞克斯级",
       "raid_20210708": "复刻穿越彼方的水线",
       "raid_20220127": "演习神秘事件调查",
@@ -949,7 +960,8 @@
       "combat_auto": "自律战斗",
       "combat_manual": "手操",
       "stand_still_in_the_middle": "中路站桩",
-      "hide_in_bottom_left": "躲左下角"
+      "hide_in_bottom_left": "躲左下角",
+      "hide_in_upper_left": "躲左上角"
     },
     "Fleet1Step": {
       "name": "一队步长",
@@ -983,7 +995,8 @@
       "combat_auto": "自律战斗",
       "combat_manual": "手操",
       "stand_still_in_the_middle": "中路站桩",
-      "hide_in_bottom_left": "躲左下角"
+      "hide_in_bottom_left": "躲左下角",
+      "hide_in_upper_left": "躲左上角"
     },
     "Fleet2Step": {
       "name": "二队步长",
@@ -1014,6 +1027,10 @@
       "1": "1 ",
       "2": "2 "
     },
+    "AutoRecommend": {
+      "name": "推荐编队",
+      "help": "困难模式下，如果使用潜艇编队但未配置，会点击推荐自动编队"
+    },
     "Mode": {
       "name": "潜艇出击方案",
       "help": "仅在自律寻敌关闭的情况下生效，提醒: '狩猎及BOSS战'为'仅狩猎'与'仅BOSS战'的混合，它会在道中进行狩猎打击，并在BOSS战尝试召唤潜艇。",
@@ -1515,6 +1532,10 @@
     "Favorite": {
       "name": "优先选择常用",
       "help": ""
+    },
+    "MinLevel": {
+      "name": "仅添加等级 >= X 的角色",
+      "help": ""
     }
   },
   "Research": {
@@ -1792,6 +1813,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1826,6 +1852,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1860,6 +1891,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1894,6 +1930,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1931,6 +1972,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1958,6 +2004,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -1985,6 +2036,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2012,6 +2068,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2064,6 +2125,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2106,6 +2172,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2148,6 +2219,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2190,6 +2266,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2222,6 +2303,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2254,6 +2340,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2286,6 +2377,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2326,6 +2422,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2356,6 +2457,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2386,6 +2492,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2416,6 +2527,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2459,6 +2575,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2492,6 +2613,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2525,6 +2651,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2558,6 +2689,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2603,6 +2739,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2638,6 +2779,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2686,6 +2832,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2724,6 +2875,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2771,6 +2927,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2808,6 +2969,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2854,6 +3020,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2890,6 +3061,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2935,6 +3111,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -2970,6 +3151,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3012,6 +3198,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3044,6 +3235,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3086,6 +3282,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3118,6 +3319,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3158,6 +3364,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3188,6 +3399,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3233,6 +3449,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3268,6 +3489,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3313,6 +3539,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3348,6 +3579,11 @@
       "chao_ho": "肇和",
       "william_d_porter": "威廉·D·波特",
       "chen_hai": "镇海",
+      "hood": "胡德",
+      "prinz_eugen": "欧根亲王",
+      "tb": "领航员-TB",
+      "oceana": "领洋者-娜比娅",
+      "explorer": "探索者-艾普洛",
       "unicorn": "独角兽",
       "cheshire": "柴郡",
       "amagi_chan": "小天城",
@@ -3380,6 +3616,10 @@
       "name": "购买 X 个外观箱",
       "help": "在选择“购买指定数量”时生效"
     },
+    "SkinBoxPositionFilter": {
+      "name": "外观箱位置过滤器",
+      "help": "当商店中同时售卖多种外观箱时，通过填写外观箱位置，指定需要购买的外观箱，位置从左至右，由1开始，如：1 > 2 > 3\n空格表示无限制"
+    },
     "ConsumeCoins": {
       "name": "消耗溢出物资",
       "help": "物资超过550000时购买所有消耗物资的物品"

module/config/i18n/zh-TW.json

@@ -482,6 +482,7 @@
       "LDPlayer3": "雷電模擬器3",
       "LDPlayer4": "雷電模擬器4",
       "LDPlayer9": "雷電模擬器9",
+      "LDPlayer14": "雷電模擬器14",
       "MuMuPlayer": "MuMu模擬器",
       "MuMuPlayerX": "MuMu模擬器X",
       "MuMuPlayer12": "MuMu模擬器12",
@@ -596,6 +597,14 @@
       "upload": "上傳",
       "save_and_upload": "保存並上傳"
     },
+    "CL1Record": {
+      "name": "侵蝕一掉落截圖",
+      "help": "是否保存侵蝕一掉落截圖由該選項單獨控制",
+      "do_not": "無操作",
+      "save": "保存",
+      "upload": "上傳",
+      "save_and_upload": "保存並上傳"
+    },
     "AkashiRecord": {
       "name": "大世界明石商店截圖",
       "help": "",
@@ -757,7 +766,7 @@
       "event_20220414_cn": "復刻-永夜幻光",
       "event_20220428_cn": "復刻虹彩的終幕曲",
       "event_20220526_cn": "泠誓光庭",
-      "event_20220728_cn": "雄鷹的敘事歌",
+      "event_20220728_cn": "復刻雄鷹的敘事歌",
       "event_20220818_cn": "遠匯點作戰",
       "event_20220915_cn": "紫絳槿嵐",
       "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",
@@ -788,6 +797,8 @@
       "event_20250912_cn": "起舞於天原之上",
       "event_20251023_cn": "颶風與自由群島",
       "event_20251218_cn": "響徹於天穹之音",
+      "event_20260226_cn": "春滿客棧Online",
+      "event_20260326_cn": "漫遊者招募計劃",
       "raid_20200624": "特別演習埃塞克斯級(復刻)",
       "raid_20210708": "復刻穿越彼方的水線",
       "raid_20220127": "演習神秘事件調查",
@@ -949,7 +960,8 @@
       "combat_auto": "自律戰鬥",
       "combat_manual": "手動",
       "stand_still_in_the_middle": "中路站樁",
-      "hide_in_bottom_left": "躲左下角"
+      "hide_in_bottom_left": "躲左下角",
+      "hide_in_upper_left": "躲左上角"
     },
     "Fleet1Step": {
       "name": "一隊步幅",
@@ -983,7 +995,8 @@
       "combat_auto": "自律戰鬥",
       "combat_manual": "手動",
       "stand_still_in_the_middle": "中路站樁",
-      "hide_in_bottom_left": "躲左下角"
+      "hide_in_bottom_left": "躲左下角",
+      "hide_in_upper_left": "躲左上角"
     },
     "Fleet2Step": {
       "name": "二隊步幅",
@@ -1014,6 +1027,10 @@
       "1": "1",
       "2": "2"
     },
+    "AutoRecommend": {
+      "name": "推薦編隊",
+      "help": "困難模式下，如果使用潛艦編隊但未配置，會點擊推薦自動編隊"
+    },
     "Mode": {
       "name": "潛艇出擊方案",
       "help": "僅在自律尋敵關閉的情況下生效，提醒: '狩獵及BOSS戰'為'僅狩獵'與'僅BOSS戰'的混合，它會在道中進行狩獵打擊，並在BOSS戰嘗試召喚潛艇。",
@@ -1515,6 +1532,10 @@
     "Favorite": {
       "name": "優先選擇常用",
       "help": ""
+    },
+    "MinLevel": {
+      "name": "僅新增等級 >= X 的角色",
+      "help": ""
     }
   },
   "Research": {
@@ -1792,6 +1813,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1826,6 +1852,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1860,6 +1891,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1894,6 +1930,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1931,6 +1972,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1958,6 +2004,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -1985,6 +2036,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2012,6 +2068,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2064,6 +2125,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2106,6 +2172,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2148,6 +2219,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2190,6 +2266,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2222,6 +2303,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2254,6 +2340,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2286,6 +2377,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2326,6 +2422,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2356,6 +2457,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2386,6 +2492,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2416,6 +2527,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2459,6 +2575,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2492,6 +2613,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2525,6 +2651,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2558,6 +2689,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2603,6 +2739,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2638,6 +2779,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2686,6 +2832,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2724,6 +2875,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2771,6 +2927,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2808,6 +2969,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2854,6 +3020,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2890,6 +3061,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2935,6 +3111,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -2970,6 +3151,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3012,6 +3198,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3044,6 +3235,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3086,6 +3282,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3118,6 +3319,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3158,6 +3364,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3188,6 +3399,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3233,6 +3449,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3268,6 +3489,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3313,6 +3539,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3348,6 +3579,11 @@
       "chao_ho": "chao_ho",
       "william_d_porter": "william_d_porter",
       "chen_hai": "chen_hai",
+      "hood": "hood",
+      "prinz_eugen": "prinz_eugen",
+      "tb": "tb",
+      "oceana": "oceana",
+      "explorer": "explorer",
       "unicorn": "unicorn",
       "cheshire": "cheshire",
       "amagi_chan": "amagi_chan",
@@ -3380,6 +3616,10 @@
       "name": "購買 X 個外觀箱",
       "help": "在選擇「購買指定數量」時生效"
     },
+    "SkinBoxPositionFilter": {
+      "name": "外觀箱位置過濾器",
+      "help": "當商店中同時售賣多種外觀箱時，通過填寫外觀箱位置，指定需要購買的外觀箱，位置從左至右，由1開始，如：1 > 2 > 3\n空格表示無限制"
+    },
     "ConsumeCoins": {
       "name": "消耗溢出物資",
       "help": "物資超過550000時購買所有消耗物資的物品"

module/daemon/benchmark.py

@@ -39,7 +39,7 @@ class Benchmark(DaemonBase, CampaignUI):
         record = []
 
         for n in range(1, self.TEST_TOTAL + 1):
-            start = time.time()
+            start = time.perf_counter()
 
             try:
                 func(*args, **kwargs)
@@ -52,7 +52,7 @@ class Benchmark(DaemonBase, CampaignUI):
                 logger.warning(f'Benchmark tests failed on func: {func.__name__}')
                 return 'Failed'
 
-            cost = time.time() - start
+            cost = time.perf_counter() - start
             logger.attr(
                 f'{str(n).rjust(2, "0")}/{self.TEST_TOTAL}',
                 f'{float2str(cost)}'
@@ -194,6 +194,10 @@ class Benchmark(DaemonBase, CampaignUI):
         if device == 'android_phone_vmos':
             screenshot = ['ADB', 'aScreenCap', 'DroidCast', 'DroidCast_raw']
             click = ['ADB', 'Hermit', 'MaaTouch']
+        # Droidcast on SDK 23 (Android 6.0) to SDK 32 (Android 12)
+        if not (23 <= sdk <= 32):
+            screenshot = remove('DroidCast', 'DroidCast_raw')
+
         if self.device.nemu_ipc_available():
             screenshot.append('nemu_ipc')
         if self.device.ldopengl_available():

module/device/method/adb.py

@@ -433,3 +433,20 @@ class Adb(Connection):
         # Parse with lxml
         hierarchy = etree.fromstring(content)
         return hierarchy
+
+    @retry
+    def is_network_available(self) -> bool:
+        """
+        Check if emulator internet connection is available by pinging public DNS.
+
+        Returns:
+            bool: True if network is available
+        """
+        options = ['-c', '4']
+        if self.is_mumu12_family:
+            options.extend(['-i', '0.2'])
+        for ip in ['223.5.5.5', '8.8.8.8']:
+            result = self.adb_shell(['ping', *options, ip]).lower()
+            if 'ttl=' in result:
+                return True
+        return False

module/device/method/ldopengl.py

@@ -332,7 +332,7 @@ class LDOpenGL(Platform):
         if not self.is_ldplayer_bluestacks_family:
             return False
         logger.attr('EmulatorInfo_Emulator', self.config.EmulatorInfo_Emulator)
-        if self.config.EmulatorInfo_Emulator not in ['LDPlayer9']:
+        if self.config.EmulatorInfo_Emulator not in ['LDPlayer9', 'LDPlayer14']:
             return False
 
         try:

module/device/platform/emulator_base.py

@@ -155,7 +155,8 @@ class EmulatorBase:
     LDPlayer3 = 'LDPlayer3'
     LDPlayer4 = 'LDPlayer4'
     LDPlayer9 = 'LDPlayer9'
-    LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9]
+    LDPlayer14 = 'LDPlayer14'
+    LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14]
     MuMuPlayer = 'MuMuPlayer'
     MuMuPlayerX = 'MuMuPlayerX'
     MuMuPlayer12 = 'MuMuPlayer12'

module/device/platform/emulator_windows.py

@@ -110,6 +110,8 @@ class Emulator(EmulatorBase):
                 return cls.LDPlayer4
             elif dir1 == 'ldplayer9':
                 return cls.LDPlayer9
+            elif dir1 == 'ldplayer14':
+                return cls.LDPlayer14
             else:
                 return cls.LDPlayer3
         if exe == 'nemuplayer.exe':
@@ -538,8 +540,11 @@ class EmulatorManager(EmulatorManagerBase):
                 exe.add(file)
 
         # LDPlayer install path
-        for path in [r'SOFTWARE\leidian\ldplayer',
-                     r'SOFTWARE\leidian\ldplayer9']:
+        for path in [
+            r'SOFTWARE\leidian\ldplayer',
+            r'SOFTWARE\leidian\ldplayer9',
+            r'SOFTWARE\leidian\ldplayer14',
+        ]:
             ld = self.get_install_dir_from_reg(path, 'InstallDir')
             if ld:
                 ld = abspath(os.path.join(ld, './dnplayer.exe'))

module/device/platform/platform_base.py

@@ -181,6 +181,20 @@ class PlatformBase(Connection, EmulatorManagerBase):
                 logger.info(f'Found emulator instance: {instance}')
                 return instance
 
+        # search by emulator type first, which is the easiest setting for user to setup, so more trustworthy
+        # Multiple instances in given serial, name and path, search by emulator
+        if emulator:
+            search_args['type'] = emulator
+            select = instances.select(**search_args)
+            if select.count == 0:
+                logger.warning(f'No emulator instances with {search_args}, type invalid')
+                search_args.pop('type')
+            elif select.count == 1:
+                instance = select[0]
+                logger.hr('Emulator instance', level=2)
+                logger.info(f'Found emulator instance: {instance}')
+                return instance
+
         # Multiple instances in given serial, search by name
         if name:
             search_args['name'] = name
@@ -207,19 +221,6 @@ class PlatformBase(Connection, EmulatorManagerBase):
                 logger.info(f'Found emulator instance: {instance}')
                 return instance
 
-        # Multiple instances in given serial, name and path, search by emulator
-        if emulator:
-            search_args['type'] = emulator
-            select = instances.select(**search_args)
-            if select.count == 0:
-                logger.warning(f'No emulator instances with {search_args}, type invalid')
-                search_args.pop('type')
-            elif select.count == 1:
-                instance = select[0]
-                logger.hr('Emulator instance', level=2)
-                logger.info(f'Found emulator instance: {instance}')
-                return instance
-
         # Still too many instances, search from running emulators
         running = remove_duplicated_path(list(self.iter_running_emulator()))
         logger.info('Running emulators')

module/eventstory/eventstory.py

@@ -202,6 +202,14 @@ class EventStory(CampaignUI, Combat, LoginHandler):
         return 'unknown'
 
     def run(self):
+        event = self.config.cross_get('Event.Campaign.Event', '')
+        if event in [
+            # event story is in event minigame
+            'event_20260226_cn',
+        ]:
+            logger.info(f'Current event ({event}) does not have event story, stopped')
+            return
+
         if not self.device.app_is_running():
             logger.warning('Game is not running, start it')
             self.app_start()

module/exception.py

@@ -53,6 +53,10 @@ class GameNotRunningError(Exception):
     pass
 
 
+class EmulatorNetworkError(Exception):
+    pass
+
+
 class GamePageUnknownError(Exception):
     pass
 

module/exercise/hp_daemon.py

@@ -77,6 +77,8 @@ class HpDaemon(ModuleBase):
             PAUSE_ShadowPuppetry,
             PAUSE_MaidCafe,
             PAUSE_Ancient,
+            PAUSE_SpringInn,
+            PAUSE_ElvenVine,
         ]:
             self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
             self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)

module/handler/assets.py

@@ -4,8 +4,8 @@ from module.base.template import Template
 # This file was automatically generated by dev_tools/button_extract.py.
 # Don't modify it manually.
 
-AIR_STRIKE_CANCEL = Button(area={'cn': (886, 644, 948, 675), 'en': (886, 644, 948, 675), 'jp': (948, 644, 1009, 676), 'tw': (886, 644, 948, 675)}, color={'cn': (195, 144, 139), 'en': (195, 144, 139), 'jp': (194, 124, 117), 'tw': (195, 144, 139)}, button={'cn': (886, 644, 948, 675), 'en': (886, 644, 948, 675), 'jp': (948, 644, 1009, 676), 'tw': (886, 644, 948, 675)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'en': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'jp': './assets/jp/handler/AIR_STRIKE_CANCEL.png', 'tw': './assets/cn/handler/AIR_STRIKE_CANCEL.png'})
-AIR_STRIKE_CONFIRM = Button(area={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, color={'cn': (132, 163, 203), 'en': (132, 163, 203), 'jp': (137, 170, 211), 'tw': (132, 163, 203)}, button={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'en': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'jp': './assets/jp/handler/AIR_STRIKE_CONFIRM.png', 'tw': './assets/cn/handler/AIR_STRIKE_CONFIRM.png'})
+AIR_STRIKE_CANCEL = Button(area={'cn': (887, 644, 948, 676), 'en': (887, 644, 948, 676), 'jp': (948, 644, 1009, 676), 'tw': (887, 644, 948, 676)}, color={'cn': (193, 141, 135), 'en': (193, 141, 135), 'jp': (194, 124, 117), 'tw': (193, 141, 135)}, button={'cn': (887, 644, 948, 676), 'en': (887, 644, 948, 676), 'jp': (948, 644, 1009, 676), 'tw': (887, 644, 948, 676)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'en': './assets/cn/handler/AIR_STRIKE_CANCEL.png', 'jp': './assets/jp/handler/AIR_STRIKE_CANCEL.png', 'tw': './assets/cn/handler/AIR_STRIKE_CANCEL.png'})
+AIR_STRIKE_CONFIRM = Button(area={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, color={'cn': (129, 161, 199), 'en': (129, 161, 199), 'jp': (137, 170, 211), 'tw': (129, 161, 199)}, button={'cn': (1100, 644, 1161, 675), 'en': (1100, 644, 1161, 675), 'jp': (1161, 644, 1222, 675), 'tw': (1100, 644, 1161, 675)}, file={'cn': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'en': './assets/cn/handler/AIR_STRIKE_CONFIRM.png', 'jp': './assets/jp/handler/AIR_STRIKE_CONFIRM.png', 'tw': './assets/cn/handler/AIR_STRIKE_CONFIRM.png'})
 AIR_STRIKE_ENTER = Button(area={'cn': (1194, 456, 1249, 530), 'en': (1194, 456, 1249, 530), 'jp': (1194, 456, 1249, 530), 'tw': (1194, 456, 1249, 530)}, color={'cn': (123, 124, 131), 'en': (123, 124, 131), 'jp': (123, 124, 131), 'tw': (123, 124, 131)}, button={'cn': (1194, 456, 1249, 530), 'en': (1194, 456, 1249, 530), 'jp': (1194, 456, 1249, 530), 'tw': (1194, 456, 1249, 530)}, file={'cn': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'en': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'jp': './assets/cn/handler/AIR_STRIKE_ENTER.png', 'tw': './assets/cn/handler/AIR_STRIKE_ENTER.png'})
 ANDROID_NO_RESPOND = Button(area={'cn': (341, 433, 391, 472), 'en': (341, 433, 391, 472), 'jp': (341, 433, 391, 472), 'tw': (341, 433, 391, 472)}, color={'cn': (217, 237, 235), 'en': (217, 237, 235), 'jp': (217, 237, 235), 'tw': (217, 237, 235)}, button={'cn': (341, 433, 391, 472), 'en': (341, 433, 391, 472), 'jp': (341, 433, 391, 472), 'tw': (341, 433, 391, 472)}, file={'cn': './assets/cn/handler/ANDROID_NO_RESPOND.png', 'en': './assets/en/handler/ANDROID_NO_RESPOND.png', 'jp': './assets/jp/handler/ANDROID_NO_RESPOND.png', 'tw': './assets/tw/handler/ANDROID_NO_RESPOND.png'})
 AUTO_SEARCH_MAP_OPTION_OFF = Button(area={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1204, 547, 1276, 568), 'tw': (1205, 546, 1275, 567)}, color={'cn': (196, 169, 169), 'en': (151, 132, 138), 'jp': (179, 153, 156), 'tw': (153, 132, 137)}, button={'cn': (1205, 549, 1275, 566), 'en': (1203, 552, 1277, 564), 'jp': (1204, 547, 1276, 568), 'tw': (1205, 546, 1275, 567)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'en': './assets/en/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'jp': './assets/jp/handler/AUTO_SEARCH_MAP_OPTION_OFF.png', 'tw': './assets/tw/handler/AUTO_SEARCH_MAP_OPTION_OFF.png'})

module/handler/enemy_searching.py

@@ -121,6 +121,8 @@ class EnemySearchingHandler(InfoHandler):
             if self.handle_in_stage():
                 return True
             if self.handle_auto_search_exit(drop=drop):
+                timeout.limit = 10
+                timeout.reset()
                 continue
 
             # Popups
@@ -148,6 +150,7 @@ class EnemySearchingHandler(InfoHandler):
                 if appeared:
                     self.handle_enemy_flashing()
                     self.device.sleep(0.3)
+                    self.device.screenshot()
                     logger.info('Enemy searching appeared.')
                     break
                 self.enemy_searching_color_initial()
@@ -155,7 +158,6 @@ class EnemySearchingHandler(InfoHandler):
                 logger.info('Enemy searching timeout.')
                 break
 
-        self.device.screenshot()
         return True
 
     def handle_in_map_no_enemy_searching(self, drop=None):
@@ -173,15 +175,15 @@ class EnemySearchingHandler(InfoHandler):
         while 1:
             self.device.screenshot()
 
-            # End
-            if timeout.reached():
-                break
+            if not self.is_in_map():
+                timeout.reset()
 
             # Stage might ends,
             # although here expects an enemy searching animation.
             if self.handle_in_stage():
                 return True
             if self.handle_auto_search_exit(drop=drop):
+                timeout.reset()
                 continue
 
             # Popups
@@ -198,4 +200,9 @@ class EnemySearchingHandler(InfoHandler):
                 timeout.reset()
                 continue
 
+            # End
+            if timeout.reached():
+                logger.info('No enemy searching in map.')
+                break
+
         return True

module/handler/login.py

@@ -8,7 +8,8 @@ from uiautomator2.xpath import XPath, XPathSelector
 
 import module.config.server as server
 from module.base.timer import Timer
-from module.base.utils import color_similarity_2d, crop, random_rectangle_point
+from module.base.utils import color_similarity_2d, crop, random_rectangle_point, rgb2luma
+from module.exception import GameNotRunningError, GameTooManyClickError, EmulatorNetworkError
 from module.handler.assets import *
 from module.logger import logger
 from module.map.assets import *
@@ -18,6 +19,8 @@ from module.ui.ui import UI
 
 
 class LoginHandler(UI):
+    _login_update_error_count = 0
+
     def _handle_app_login(self):
         """
         Pages:
@@ -138,11 +141,20 @@ class LoginHandler(UI):
             GameStuckError:
             GameTooManyClickError:
             GameNotRunningError:
+            EmulatorNetworkError:
         """
         logger.info('handle_app_login')
         self.device.screenshot_interval_set(1.0)
         try:
             self._handle_app_login()
+        except GameTooManyClickError as e:
+            if 'LOGIN_GAME_UPDATE' in str(e):
+                self.__class__._login_update_error_count += 1
+                logger.warning(f'Error on LOGIN_GAME_UPDATE: {self.__class__._login_update_error_count} times')
+                if self.__class__._login_update_error_count >= 3:
+                    self.__class__._login_update_error_count = 0
+                    raise EmulatorNetworkError('Emulator network is offline assumed')
+            raise
         finally:
             self.device.screenshot_interval_set()
 
@@ -163,6 +175,7 @@ class LoginHandler(UI):
         self.device.app_start()
         self.handle_app_login()
         # self.ensure_no_unfinished_campaign()
+        self.config.task_delay(server_update=True)
 
     def ensure_no_unfinished_campaign(self, confirm_wait=3):
         """

module/island/assets.py

@@ -35,15 +35,20 @@ PROJECT_CHAO_HO_CHECK = Button(area={'cn': (1158, 174, 1218, 204), 'en': (1158,
 PROJECT_CHEN_HAI_CHECK = Button(area={'cn': (1162, 175, 1215, 206), 'en': (1162, 175, 1215, 206), 'jp': (1162, 175, 1215, 206), 'tw': (1162, 175, 1215, 206)}, color={'cn': (145, 134, 130), 'en': (145, 134, 130), 'jp': (145, 134, 130), 'tw': (145, 134, 130)}, button={'cn': (1162, 175, 1215, 206), 'en': (1162, 175, 1215, 206), 'jp': (1162, 175, 1215, 206), 'tw': (1162, 175, 1215, 206)}, file={'cn': './assets/cn/island/PROJECT_CHEN_HAI_CHECK.png', 'en': './assets/cn/island/PROJECT_CHEN_HAI_CHECK.png', 'jp': './assets/cn/island/PROJECT_CHEN_HAI_CHECK.png', 'tw': './assets/cn/island/PROJECT_CHEN_HAI_CHECK.png'})
 PROJECT_CHESHIRE_CHECK = Button(area={'cn': (1161, 163, 1224, 207), 'en': (1161, 163, 1224, 207), 'jp': (1161, 163, 1224, 207), 'tw': (1161, 163, 1224, 207)}, color={'cn': (156, 150, 159), 'en': (156, 150, 159), 'jp': (156, 150, 159), 'tw': (156, 150, 159)}, button={'cn': (1161, 163, 1224, 207), 'en': (1161, 163, 1224, 207), 'jp': (1161, 163, 1224, 207), 'tw': (1161, 163, 1224, 207)}, file={'cn': './assets/cn/island/PROJECT_CHESHIRE_CHECK.png', 'en': './assets/cn/island/PROJECT_CHESHIRE_CHECK.png', 'jp': './assets/cn/island/PROJECT_CHESHIRE_CHECK.png', 'tw': './assets/cn/island/PROJECT_CHESHIRE_CHECK.png'})
 PROJECT_COMPLETE = Button(area={'cn': (616, 431, 670, 444), 'en': (616, 431, 670, 444), 'jp': (616, 431, 670, 444), 'tw': (616, 431, 670, 444)}, color={'cn': (158, 222, 255), 'en': (158, 222, 255), 'jp': (158, 222, 255), 'tw': (158, 222, 255)}, button={'cn': (580, 533, 762, 584), 'en': (580, 533, 762, 584), 'jp': (580, 533, 762, 584), 'tw': (580, 533, 762, 584)}, file={'cn': './assets/cn/island/PROJECT_COMPLETE.png', 'en': './assets/cn/island/PROJECT_COMPLETE.png', 'jp': './assets/cn/island/PROJECT_COMPLETE.png', 'tw': './assets/cn/island/PROJECT_COMPLETE.png'})
+PROJECT_EXPLORER_CHECK = Button(area={'cn': (1151, 168, 1223, 220), 'en': (1151, 168, 1223, 220), 'jp': (1151, 168, 1223, 220), 'tw': (1151, 168, 1223, 220)}, color={'cn': (200, 192, 189), 'en': (200, 192, 189), 'jp': (200, 192, 189), 'tw': (200, 192, 189)}, button={'cn': (1151, 168, 1223, 220), 'en': (1151, 168, 1223, 220), 'jp': (1151, 168, 1223, 220), 'tw': (1151, 168, 1223, 220)}, file={'cn': './assets/cn/island/PROJECT_EXPLORER_CHECK.png', 'en': './assets/cn/island/PROJECT_EXPLORER_CHECK.png', 'jp': './assets/cn/island/PROJECT_EXPLORER_CHECK.png', 'tw': './assets/cn/island/PROJECT_EXPLORER_CHECK.png'})
 PROJECT_FRIEDRICH_DER_GROBE_CHECK = Button(area={'cn': (1162, 177, 1217, 215), 'en': (1162, 177, 1217, 215), 'jp': (1162, 177, 1217, 215), 'tw': (1162, 177, 1217, 215)}, color={'cn': (106, 102, 100), 'en': (106, 102, 100), 'jp': (106, 102, 100), 'tw': (106, 102, 100)}, button={'cn': (1162, 177, 1217, 215), 'en': (1162, 177, 1217, 215), 'jp': (1162, 177, 1217, 215), 'tw': (1162, 177, 1217, 215)}, file={'cn': './assets/cn/island/PROJECT_FRIEDRICH_DER_GROBE_CHECK.png', 'en': './assets/cn/island/PROJECT_FRIEDRICH_DER_GROBE_CHECK.png', 'jp': './assets/cn/island/PROJECT_FRIEDRICH_DER_GROBE_CHECK.png', 'tw': './assets/cn/island/PROJECT_FRIEDRICH_DER_GROBE_CHECK.png'})
 PROJECT_HELENA_CHECK = Button(area={'cn': (1164, 175, 1217, 209), 'en': (1164, 175, 1217, 209), 'jp': (1164, 175, 1217, 209), 'tw': (1164, 175, 1217, 209)}, color={'cn': (184, 178, 195), 'en': (184, 178, 195), 'jp': (184, 178, 195), 'tw': (184, 178, 195)}, button={'cn': (1164, 175, 1217, 209), 'en': (1164, 175, 1217, 209), 'jp': (1164, 175, 1217, 209), 'tw': (1164, 175, 1217, 209)}, file={'cn': './assets/cn/island/PROJECT_HELENA_CHECK.png', 'en': './assets/cn/island/PROJECT_HELENA_CHECK.png', 'jp': './assets/cn/island/PROJECT_HELENA_CHECK.png', 'tw': './assets/cn/island/PROJECT_HELENA_CHECK.png'})
+PROJECT_HOOD_CHECK = Button(area={'cn': (1152, 167, 1232, 218), 'en': (1152, 167, 1232, 218), 'jp': (1152, 167, 1232, 218), 'tw': (1152, 167, 1232, 218)}, color={'cn': (203, 185, 173), 'en': (203, 185, 173), 'jp': (203, 185, 173), 'tw': (203, 185, 173)}, button={'cn': (1152, 167, 1232, 218), 'en': (1152, 167, 1232, 218), 'jp': (1152, 167, 1232, 218), 'tw': (1152, 167, 1232, 218)}, file={'cn': './assets/cn/island/PROJECT_HOOD_CHECK.png', 'en': './assets/cn/island/PROJECT_HOOD_CHECK.png', 'jp': './assets/cn/island/PROJECT_HOOD_CHECK.png', 'tw': './assets/cn/island/PROJECT_HOOD_CHECK.png'})
 PROJECT_LEMALIN_CHECK = Button(area={'cn': (1165, 173, 1232, 218), 'en': (1165, 173, 1232, 218), 'jp': (1165, 173, 1232, 218), 'tw': (1165, 173, 1232, 218)}, color={'cn': (225, 217, 221), 'en': (225, 217, 221), 'jp': (225, 217, 221), 'tw': (225, 217, 221)}, button={'cn': (1165, 173, 1232, 218), 'en': (1165, 173, 1232, 218), 'jp': (1165, 173, 1232, 218), 'tw': (1165, 173, 1232, 218)}, file={'cn': './assets/cn/island/PROJECT_LEMALIN_CHECK.png', 'en': './assets/cn/island/PROJECT_LEMALIN_CHECK.png', 'jp': './assets/cn/island/PROJECT_LEMALIN_CHECK.png', 'tw': './assets/cn/island/PROJECT_LEMALIN_CHECK.png'})
 PROJECT_MANJUU_CHECK = Button(area={'cn': (1162, 182, 1214, 205), 'en': (1162, 182, 1214, 205), 'jp': (1162, 182, 1214, 205), 'tw': (1162, 182, 1214, 205)}, color={'cn': (221, 192, 128), 'en': (221, 192, 128), 'jp': (221, 192, 128), 'tw': (221, 192, 128)}, button={'cn': (1162, 182, 1214, 205), 'en': (1162, 182, 1214, 205), 'jp': (1162, 182, 1214, 205), 'tw': (1162, 182, 1214, 205)}, file={'cn': './assets/cn/island/PROJECT_MANJUU_CHECK.png', 'en': './assets/cn/island/PROJECT_MANJUU_CHECK.png', 'jp': './assets/cn/island/PROJECT_MANJUU_CHECK.png', 'tw': './assets/cn/island/PROJECT_MANJUU_CHECK.png'})
 PROJECT_NEW_JERSEY_CHECK = Button(area={'cn': (1158, 170, 1223, 214), 'en': (1158, 170, 1223, 214), 'jp': (1158, 170, 1223, 214), 'tw': (1158, 170, 1223, 214)}, color={'cn': (138, 136, 159), 'en': (138, 136, 159), 'jp': (138, 136, 159), 'tw': (138, 136, 159)}, button={'cn': (1158, 170, 1223, 214), 'en': (1158, 170, 1223, 214), 'jp': (1158, 170, 1223, 214), 'tw': (1158, 170, 1223, 214)}, file={'cn': './assets/cn/island/PROJECT_NEW_JERSEY_CHECK.png', 'en': './assets/cn/island/PROJECT_NEW_JERSEY_CHECK.png', 'jp': './assets/cn/island/PROJECT_NEW_JERSEY_CHECK.png', 'tw': './assets/cn/island/PROJECT_NEW_JERSEY_CHECK.png'})
+PROJECT_OCEANA_CHECK = Button(area={'cn': (1148, 167, 1221, 221), 'en': (1148, 167, 1221, 221), 'jp': (1148, 167, 1221, 221), 'tw': (1148, 167, 1221, 221)}, color={'cn': (215, 208, 216), 'en': (215, 208, 216), 'jp': (215, 208, 216), 'tw': (215, 208, 216)}, button={'cn': (1148, 167, 1221, 221), 'en': (1148, 167, 1221, 221), 'jp': (1148, 167, 1221, 221), 'tw': (1148, 167, 1221, 221)}, file={'cn': './assets/cn/island/PROJECT_OCEANA_CHECK.png', 'en': './assets/cn/island/PROJECT_OCEANA_CHECK.png', 'jp': './assets/cn/island/PROJECT_OCEANA_CHECK.png', 'tw': './assets/cn/island/PROJECT_OCEANA_CHECK.png'})
+PROJECT_PRINZ_EUGEN_CHECK = Button(area={'cn': (1150, 169, 1235, 219), 'en': (1150, 169, 1235, 219), 'jp': (1150, 169, 1235, 219), 'tw': (1150, 169, 1235, 219)}, color={'cn': (200, 180, 177), 'en': (200, 180, 177), 'jp': (200, 180, 177), 'tw': (200, 180, 177)}, button={'cn': (1150, 169, 1235, 219), 'en': (1150, 169, 1235, 219), 'jp': (1150, 169, 1235, 219), 'tw': (1150, 169, 1235, 219)}, file={'cn': './assets/cn/island/PROJECT_PRINZ_EUGEN_CHECK.png', 'en': './assets/cn/island/PROJECT_PRINZ_EUGEN_CHECK.png', 'jp': './assets/cn/island/PROJECT_PRINZ_EUGEN_CHECK.png', 'tw': './assets/cn/island/PROJECT_PRINZ_EUGEN_CHECK.png'})
 PROJECT_SARATOGA_CHECK = Button(area={'cn': (1162, 166, 1223, 219), 'en': (1162, 166, 1223, 219), 'jp': (1162, 166, 1223, 219), 'tw': (1162, 166, 1223, 219)}, color={'cn': (212, 177, 178), 'en': (212, 177, 178), 'jp': (212, 177, 178), 'tw': (212, 177, 178)}, button={'cn': (1162, 166, 1223, 219), 'en': (1162, 166, 1223, 219), 'jp': (1162, 166, 1223, 219), 'tw': (1162, 166, 1223, 219)}, file={'cn': './assets/cn/island/PROJECT_SARATOGA_CHECK.png', 'en': './assets/cn/island/PROJECT_SARATOGA_CHECK.png', 'jp': './assets/cn/island/PROJECT_SARATOGA_CHECK.png', 'tw': './assets/cn/island/PROJECT_SARATOGA_CHECK.png'})
 PROJECT_SHIMAKAZE_CHECK = Button(area={'cn': (1163, 168, 1212, 218), 'en': (1163, 168, 1212, 218), 'jp': (1163, 168, 1212, 218), 'tw': (1163, 168, 1212, 218)}, color={'cn': (218, 199, 196), 'en': (218, 199, 196), 'jp': (218, 199, 196), 'tw': (218, 199, 196)}, button={'cn': (1163, 168, 1212, 218), 'en': (1163, 168, 1212, 218), 'jp': (1163, 168, 1212, 218), 'tw': (1163, 168, 1212, 218)}, file={'cn': './assets/cn/island/PROJECT_SHIMAKAZE_CHECK.png', 'en': './assets/cn/island/PROJECT_SHIMAKAZE_CHECK.png', 'jp': './assets/cn/island/PROJECT_SHIMAKAZE_CHECK.png', 'tw': './assets/cn/island/PROJECT_SHIMAKAZE_CHECK.png'})
 PROJECT_START = Button(area={'cn': (686, 610, 706, 630), 'en': (609, 610, 629, 630), 'jp': (686, 610, 706, 630), 'tw': (686, 610, 706, 630)}, color={'cn': (129, 213, 255), 'en': (128, 212, 254), 'jp': (129, 213, 255), 'tw': (129, 213, 255)}, button={'cn': (494, 599, 1087, 642), 'en': (609, 610, 629, 630), 'jp': (494, 599, 1087, 642), 'tw': (494, 599, 1087, 642)}, file={'cn': './assets/cn/island/PROJECT_START.png', 'en': './assets/en/island/PROJECT_START.png', 'jp': './assets/cn/island/PROJECT_START.png', 'tw': './assets/cn/island/PROJECT_START.png'})
 PROJECT_TASHKENT_CHECK = Button(area={'cn': (1164, 176, 1219, 213), 'en': (1164, 176, 1219, 213), 'jp': (1164, 176, 1219, 213), 'tw': (1164, 176, 1219, 213)}, color={'cn': (176, 146, 173), 'en': (176, 146, 173), 'jp': (176, 146, 173), 'tw': (176, 146, 173)}, button={'cn': (1164, 176, 1219, 213), 'en': (1164, 176, 1219, 213), 'jp': (1164, 176, 1219, 213), 'tw': (1164, 176, 1219, 213)}, file={'cn': './assets/cn/island/PROJECT_TASHKENT_CHECK.png', 'en': './assets/cn/island/PROJECT_TASHKENT_CHECK.png', 'jp': './assets/cn/island/PROJECT_TASHKENT_CHECK.png', 'tw': './assets/cn/island/PROJECT_TASHKENT_CHECK.png'})
+PROJECT_TB_CHECK = Button(area={'cn': (1148, 161, 1230, 218), 'en': (1148, 161, 1230, 218), 'jp': (1148, 161, 1230, 218), 'tw': (1148, 161, 1230, 218)}, color={'cn': (200, 207, 216), 'en': (200, 207, 216), 'jp': (200, 207, 216), 'tw': (200, 207, 216)}, button={'cn': (1148, 161, 1230, 218), 'en': (1148, 161, 1230, 218), 'jp': (1148, 161, 1230, 218), 'tw': (1148, 161, 1230, 218)}, file={'cn': './assets/cn/island/PROJECT_TB_CHECK.png', 'en': './assets/cn/island/PROJECT_TB_CHECK.png', 'jp': './assets/cn/island/PROJECT_TB_CHECK.png', 'tw': './assets/cn/island/PROJECT_TB_CHECK.png'})
 PROJECT_UNICORN_CHECK = Button(area={'cn': (1156, 167, 1224, 209), 'en': (1156, 167, 1224, 209), 'jp': (1156, 167, 1224, 209), 'tw': (1156, 167, 1224, 209)}, color={'cn': (199, 184, 218), 'en': (199, 184, 218), 'jp': (199, 184, 218), 'tw': (199, 184, 218)}, button={'cn': (1156, 167, 1224, 209), 'en': (1156, 167, 1224, 209), 'jp': (1156, 167, 1224, 209), 'tw': (1156, 167, 1224, 209)}, file={'cn': './assets/cn/island/PROJECT_UNICORN_CHECK.png', 'en': './assets/cn/island/PROJECT_UNICORN_CHECK.png', 'jp': './assets/cn/island/PROJECT_UNICORN_CHECK.png', 'tw': './assets/cn/island/PROJECT_UNICORN_CHECK.png'})
 PROJECT_WILLIAM_D_PORTER_CHECK = Button(area={'cn': (1152, 176, 1218, 220), 'en': (1152, 176, 1218, 220), 'jp': (1152, 176, 1218, 220), 'tw': (1152, 176, 1218, 220)}, color={'cn': (210, 179, 166), 'en': (210, 179, 166), 'jp': (210, 179, 166), 'tw': (210, 179, 166)}, button={'cn': (1152, 176, 1218, 220), 'en': (1152, 176, 1218, 220), 'jp': (1152, 176, 1218, 220), 'tw': (1152, 176, 1218, 220)}, file={'cn': './assets/cn/island/PROJECT_WILLIAM_D_PORTER_CHECK.png', 'en': './assets/cn/island/PROJECT_WILLIAM_D_PORTER_CHECK.png', 'jp': './assets/cn/island/PROJECT_WILLIAM_D_PORTER_CHECK.png', 'tw': './assets/cn/island/PROJECT_WILLIAM_D_PORTER_CHECK.png'})
 PROJECT_YING_SWEI_CHECK = Button(area={'cn': (1161, 177, 1217, 210), 'en': (1161, 177, 1217, 210), 'jp': (1161, 177, 1217, 210), 'tw': (1161, 177, 1217, 210)}, color={'cn': (171, 157, 165), 'en': (171, 157, 165), 'jp': (171, 157, 165), 'tw': (171, 157, 165)}, button={'cn': (1161, 177, 1217, 210), 'en': (1161, 177, 1217, 210), 'jp': (1161, 177, 1217, 210), 'tw': (1161, 177, 1217, 210)}, file={'cn': './assets/cn/island/PROJECT_YING_SWEI_CHECK.png', 'en': './assets/cn/island/PROJECT_YING_SWEI_CHECK.png', 'jp': './assets/cn/island/PROJECT_YING_SWEI_CHECK.png', 'tw': './assets/cn/island/PROJECT_YING_SWEI_CHECK.png'})
@@ -61,19 +66,23 @@ TEMPLATE_CHAO_HO = Template(file={'cn': './assets/cn/island/TEMPLATE_CHAO_HO.png
 TEMPLATE_CHEN_HAI = Template(file={'cn': './assets/cn/island/TEMPLATE_CHEN_HAI.png', 'en': './assets/cn/island/TEMPLATE_CHEN_HAI.png', 'jp': './assets/cn/island/TEMPLATE_CHEN_HAI.png', 'tw': './assets/cn/island/TEMPLATE_CHEN_HAI.png'})
 TEMPLATE_CHESHIRE = Template(file={'cn': './assets/cn/island/TEMPLATE_CHESHIRE.png', 'en': './assets/cn/island/TEMPLATE_CHESHIRE.png', 'jp': './assets/cn/island/TEMPLATE_CHESHIRE.png', 'tw': './assets/cn/island/TEMPLATE_CHESHIRE.png'})
 TEMPLATE_COTTON = Template(file={'cn': './assets/cn/island/TEMPLATE_COTTON.png', 'en': './assets/cn/island/TEMPLATE_COTTON.png', 'jp': './assets/cn/island/TEMPLATE_COTTON.png', 'tw': './assets/cn/island/TEMPLATE_COTTON.png'})
+TEMPLATE_EXPLORER = Template(file={'cn': './assets/cn/island/TEMPLATE_EXPLORER.png', 'en': './assets/cn/island/TEMPLATE_EXPLORER.png', 'jp': './assets/cn/island/TEMPLATE_EXPLORER.png', 'tw': './assets/cn/island/TEMPLATE_EXPLORER.png'})
 TEMPLATE_FLEX = Template(file={'cn': './assets/cn/island/TEMPLATE_FLEX.png', 'en': './assets/cn/island/TEMPLATE_FLEX.png', 'jp': './assets/cn/island/TEMPLATE_FLEX.png', 'tw': './assets/cn/island/TEMPLATE_FLEX.png'})
 TEMPLATE_FRESH_MEAT = Template(file={'cn': './assets/cn/island/TEMPLATE_FRESH_MEAT.png', 'en': './assets/cn/island/TEMPLATE_FRESH_MEAT.png', 'jp': './assets/cn/island/TEMPLATE_FRESH_MEAT.png', 'tw': './assets/cn/island/TEMPLATE_FRESH_MEAT.png'})
 TEMPLATE_FRIEDRICH_DER_GROBE = Template(file={'cn': './assets/cn/island/TEMPLATE_FRIEDRICH_DER_GROBE.png', 'en': './assets/cn/island/TEMPLATE_FRIEDRICH_DER_GROBE.png', 'jp': './assets/cn/island/TEMPLATE_FRIEDRICH_DER_GROBE.png', 'tw': './assets/cn/island/TEMPLATE_FRIEDRICH_DER_GROBE.png'})
 TEMPLATE_FRIEND_VISIT = Template(file={'cn': './assets/cn/island/TEMPLATE_FRIEND_VISIT.png', 'en': './assets/cn/island/TEMPLATE_FRIEND_VISIT.png', 'jp': './assets/cn/island/TEMPLATE_FRIEND_VISIT.png', 'tw': './assets/cn/island/TEMPLATE_FRIEND_VISIT.png'})
 TEMPLATE_HELENA = Template(file={'cn': './assets/cn/island/TEMPLATE_HELENA.png', 'en': './assets/cn/island/TEMPLATE_HELENA.png', 'jp': './assets/cn/island/TEMPLATE_HELENA.png', 'tw': './assets/cn/island/TEMPLATE_HELENA.png'})
+TEMPLATE_HOOD = Template(file={'cn': './assets/cn/island/TEMPLATE_HOOD.png', 'en': './assets/cn/island/TEMPLATE_HOOD.png', 'jp': './assets/cn/island/TEMPLATE_HOOD.png', 'tw': './assets/cn/island/TEMPLATE_HOOD.png'})
 TEMPLATE_ITEM_SATISFIED = Template(file={'cn': './assets/cn/island/TEMPLATE_ITEM_SATISFIED.png', 'en': './assets/cn/island/TEMPLATE_ITEM_SATISFIED.png', 'jp': './assets/cn/island/TEMPLATE_ITEM_SATISFIED.png', 'tw': './assets/cn/island/TEMPLATE_ITEM_SATISFIED.png'})
 TEMPLATE_LEMALIN = Template(file={'cn': './assets/cn/island/TEMPLATE_LEMALIN.png', 'en': './assets/cn/island/TEMPLATE_LEMALIN.png', 'jp': './assets/cn/island/TEMPLATE_LEMALIN.png', 'tw': './assets/cn/island/TEMPLATE_LEMALIN.png'})
 TEMPLATE_MANJUU = Template(file={'cn': './assets/cn/island/TEMPLATE_MANJUU.png', 'en': './assets/cn/island/TEMPLATE_MANJUU.png', 'jp': './assets/cn/island/TEMPLATE_MANJUU.png', 'tw': './assets/cn/island/TEMPLATE_MANJUU.png'})
 TEMPLATE_MILK = Template(file={'cn': './assets/cn/island/TEMPLATE_MILK.png', 'en': './assets/cn/island/TEMPLATE_MILK.png', 'jp': './assets/cn/island/TEMPLATE_MILK.png', 'tw': './assets/cn/island/TEMPLATE_MILK.png'})
 TEMPLATE_NAPA_CABBAGE = Template(file={'cn': './assets/cn/island/TEMPLATE_NAPA_CABBAGE.png', 'en': './assets/cn/island/TEMPLATE_NAPA_CABBAGE.png', 'jp': './assets/cn/island/TEMPLATE_NAPA_CABBAGE.png', 'tw': './assets/cn/island/TEMPLATE_NAPA_CABBAGE.png'})
 TEMPLATE_NEW_JERSEY = Template(file={'cn': './assets/cn/island/TEMPLATE_NEW_JERSEY.png', 'en': './assets/cn/island/TEMPLATE_NEW_JERSEY.png', 'jp': './assets/cn/island/TEMPLATE_NEW_JERSEY.png', 'tw': './assets/cn/island/TEMPLATE_NEW_JERSEY.png'})
+TEMPLATE_OCEANA = Template(file={'cn': './assets/cn/island/TEMPLATE_OCEANA.png', 'en': './assets/cn/island/TEMPLATE_OCEANA.png', 'jp': './assets/cn/island/TEMPLATE_OCEANA.png', 'tw': './assets/cn/island/TEMPLATE_OCEANA.png'})
 TEMPLATE_ONION = Template(file={'cn': './assets/cn/island/TEMPLATE_ONION.png', 'en': './assets/cn/island/TEMPLATE_ONION.png', 'jp': './assets/cn/island/TEMPLATE_ONION.png', 'tw': './assets/cn/island/TEMPLATE_ONION.png'})
 TEMPLATE_POULTRY = Template(file={'cn': './assets/cn/island/TEMPLATE_POULTRY.png', 'en': './assets/cn/island/TEMPLATE_POULTRY.png', 'jp': './assets/cn/island/TEMPLATE_POULTRY.png', 'tw': './assets/cn/island/TEMPLATE_POULTRY.png'})
+TEMPLATE_PRINZ_EUGEN = Template(file={'cn': './assets/cn/island/TEMPLATE_PRINZ_EUGEN.png', 'en': './assets/cn/island/TEMPLATE_PRINZ_EUGEN.png', 'jp': './assets/cn/island/TEMPLATE_PRINZ_EUGEN.png', 'tw': './assets/cn/island/TEMPLATE_PRINZ_EUGEN.png'})
 TEMPLATE_PROJECT = Template(file={'cn': './assets/cn/island/TEMPLATE_PROJECT.png', 'en': './assets/cn/island/TEMPLATE_PROJECT.png', 'jp': './assets/cn/island/TEMPLATE_PROJECT.png', 'tw': './assets/cn/island/TEMPLATE_PROJECT.png'})
 TEMPLATE_PROJECT_LOCKED = Template(file={'cn': './assets/cn/island/TEMPLATE_PROJECT_LOCKED.png', 'en': './assets/cn/island/TEMPLATE_PROJECT_LOCKED.png', 'jp': './assets/cn/island/TEMPLATE_PROJECT_LOCKED.png', 'tw': './assets/cn/island/TEMPLATE_PROJECT_LOCKED.png'})
 TEMPLATE_SARATOGA = Template(file={'cn': './assets/cn/island/TEMPLATE_SARATOGA.png', 'en': './assets/cn/island/TEMPLATE_SARATOGA.png', 'jp': './assets/cn/island/TEMPLATE_SARATOGA.png', 'tw': './assets/cn/island/TEMPLATE_SARATOGA.png'})
@@ -81,6 +90,7 @@ TEMPLATE_SHIMAKAZE = Template(file={'cn': './assets/cn/island/TEMPLATE_SHIMAKAZE
 TEMPLATE_SLOT_LOCKED = Template(file={'cn': './assets/cn/island/TEMPLATE_SLOT_LOCKED.png', 'en': './assets/cn/island/TEMPLATE_SLOT_LOCKED.png', 'jp': './assets/cn/island/TEMPLATE_SLOT_LOCKED.png', 'tw': './assets/cn/island/TEMPLATE_SLOT_LOCKED.png'})
 TEMPLATE_STRAWBERRIES = Template(file={'cn': './assets/cn/island/TEMPLATE_STRAWBERRIES.png', 'en': './assets/cn/island/TEMPLATE_STRAWBERRIES.png', 'jp': './assets/cn/island/TEMPLATE_STRAWBERRIES.png', 'tw': './assets/cn/island/TEMPLATE_STRAWBERRIES.png'})
 TEMPLATE_TASHKENT = Template(file={'cn': './assets/cn/island/TEMPLATE_TASHKENT.png', 'en': './assets/cn/island/TEMPLATE_TASHKENT.png', 'jp': './assets/cn/island/TEMPLATE_TASHKENT.png', 'tw': './assets/cn/island/TEMPLATE_TASHKENT.png'})
+TEMPLATE_TB = Template(file={'cn': './assets/cn/island/TEMPLATE_TB.png', 'en': './assets/cn/island/TEMPLATE_TB.png', 'jp': './assets/cn/island/TEMPLATE_TB.png', 'tw': './assets/cn/island/TEMPLATE_TB.png'})
 TEMPLATE_UNICORN = Template(file={'cn': './assets/cn/island/TEMPLATE_UNICORN.png', 'en': './assets/cn/island/TEMPLATE_UNICORN.png', 'jp': './assets/cn/island/TEMPLATE_UNICORN.png', 'tw': './assets/cn/island/TEMPLATE_UNICORN.png'})
 TEMPLATE_WILLIAM_D_PORTER = Template(file={'cn': './assets/cn/island/TEMPLATE_WILLIAM_D_PORTER.png', 'en': './assets/cn/island/TEMPLATE_WILLIAM_D_PORTER.png', 'jp': './assets/cn/island/TEMPLATE_WILLIAM_D_PORTER.png', 'tw': './assets/cn/island/TEMPLATE_WILLIAM_D_PORTER.png'})
 TEMPLATE_YING_SWEI = Template(file={'cn': './assets/cn/island/TEMPLATE_YING_SWEI.png', 'en': './assets/cn/island/TEMPLATE_YING_SWEI.png', 'jp': './assets/cn/island/TEMPLATE_YING_SWEI.png', 'tw': './assets/cn/island/TEMPLATE_YING_SWEI.png'})

module/island/project.py

@@ -345,6 +345,57 @@ class IslandProjectRun(IslandUI):
                                   for button in TEMPLATE_PROJECT.match_multi(image_gray)])
         return projects.select(valid=True)
 
+    def ensure_project(self, name, trial=7, skip_first_screenshot=True):
+        """
+        Ensure the specific project is in the current page.
+
+        Args:
+            name (str|IslandProject): the project name to ensure
+            trial (int): retry times
+            skip_first_screenshot (bool):
+        """
+        logger.hr('Project ensure')
+        if isinstance(name, IslandProject):
+            name = name.name
+        for _ in range(trial):
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                self.device.screenshot()
+
+            projects = self.project_detect(self.device.image)
+            if not projects:
+                continue
+            if name in projects.get('name'):
+                logger.info(f'Ensured project: {name}')
+                break
+
+            keys = list(name_to_slot.keys())
+            if name in keys:
+                project_id = keys.index(name) + 1
+                projects_id = projects.get('id')
+                if project_id > projects_id[0]:
+                    self.drag_page((0, -500), ISLAND_PROJECT_SWIPE.area, 0.6)
+                else:
+                    self.drag_page((0, 500), ISLAND_PROJECT_SWIPE.area, 0.6)
+                continue
+            else:
+                logger.warning(f'Wrong project name {name}, skip ensuring')
+                break
+
+    def drag_page(self, vector, box, sleep=0.5):
+        """
+        Drag the management page.
+
+        Args:
+            vector (tuple):
+            box (tuple):
+            sleep (float):
+        """
+        p1, p2 = random_rectangle_vector(vector, box=box, random_range=(0, -5, 0, 5))
+        self.device.drag(p1, p2, segments=2, shake=(0, 25), point_random=(0, 0, 0, 0), shake_random=(0, -5, 0, 5))
+        self.device.sleep(sleep)
+
     def is_in_enter_page(self):
         return self.image_color_count(ROLE_SELECT_TITLE_AREA, color=(57, 189, 255), threshold=221, count=8000)
 
@@ -571,7 +622,7 @@ class IslandProjectRun(IslandUI):
                 last_item = current
                 bottom_item = current.items[-1]
                 self.device.click(bottom_item.button)
-                self.island_drag_next_page((0, -300), ISLAND_PRODUCT_ITEMS.area, 0.5)
+                self.drag_page((0, -300), ISLAND_PRODUCT_ITEMS.area, 0.5)
 
     def product_select_confirm(self):
         """
@@ -625,45 +676,6 @@ class IslandProjectRun(IslandUI):
                 if self.island_in_management():
                     return True
 
-    def island_drag_next_page(self, vector, box, sleep=0.5):
-        """
-        Drag to the next page.
-
-        Args:
-            vector (tuple):
-            box (tuple):
-            sleep (float):
-        """
-        logger.info('Island drag to next page')
-        p1, p2 = random_rectangle_vector(vector, box=box, random_range=(0, -5, 0, 5))
-        self.device.drag(p1, p2, segments=2, shake=(0, 25), point_random=(0, 0, 0, 0), shake_random=(0, -5, 0, 5))
-        self.device.sleep(sleep)
-
-    def ensure_project(self, project, trial=7, skip_first_screenshot=True):
-        """
-        Ensure the specific project is in the current page.
-
-        Args:
-            project (IslandProject): the project to ensure
-            trial (int): retry times
-            skip_first_screenshot (bool):
-        """
-        logger.hr('Project ensure')
-        for _ in range(trial):
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()
-
-            projects = self.project_detect(self.device.image)
-            if not projects:
-                continue
-            if project.name in projects.get('name'):
-                logger.info(f'Ensured project: {project}')
-                break
-
-            self.island_drag_next_page((0, -500), ISLAND_PROJECT_SWIPE.area, 0.6)
-
     def project_receive_and_start(self, proj, button, character, option, project_id, ensure=True):
         """
         Receive and start a project is in the current page.
@@ -733,6 +745,7 @@ class IslandProjectRun(IslandUI):
             list[timedelta]: future finish timedelta
         """
         logger.hr('Island Project Run', level=1)
+        self.ensure_project(names[0])
         end = False
         timeout = Timer(3, count=3).start()
         for _ in self.loop():
@@ -770,7 +783,7 @@ class IslandProjectRun(IslandUI):
 
             if end:
                 break
-            self.island_drag_next_page((0, -500), ISLAND_PROJECT_SWIPE.area, 0.6)
+            self.drag_page((0, -500), ISLAND_PROJECT_SWIPE.area, 0.6)
 
         # task delay
         future_finish = sorted([f for f in self.total.get('finish_time') if f is not None])

module/map/map.py

@@ -377,12 +377,17 @@ class Map(Fleet):
         grids = self.map.select(may_boss=True, is_accessible=True).sort('weight', 'cost')
         logger.info('May boss: %s' % grids)
         battle_count = self.battle_count
+        is_single_boss = self.map.select(may_boss=True).count == 1
+        if is_single_boss:
+            expected = 'boss'
+        else:
+            expected = ''
 
         for grid in grids:
             logger.hr('Clear potential BOSS')
             grids = grids.sort('weight', 'cost')
             logger.info('Grid: %s' % str(grid))
-            self.fleet_boss.clear_chosen_enemy(grid)
+            self.fleet_boss.clear_chosen_enemy(grid, expected=expected)
             if self.battle_count > battle_count:
                 logger.info('Boss guessing correct.')
                 return True
@@ -397,7 +402,7 @@ class Map(Fleet):
             roadblocks = self.brute_find_roadblocks(grid, fleet=self.fleet_boss_index)
             roadblocks = roadblocks.sort('weight', 'cost')
             logger.info('Grids: %s' % str(roadblocks))
-            self.fleet_1.clear_chosen_enemy(roadblocks[0])
+            self.fleet_1.clear_chosen_enemy(roadblocks[0], expected=expected)
             return True
 
         return False

module/map/map_fleet_preparation.py

@@ -122,12 +122,13 @@ class FleetOperator:
         # logger.attr('Light_orange_line', lines)
         return lines > 0
 
-    def raise_hard_not_satisfied(self):
-        if self.is_hard_satisfied() is False:
-            stage = self.main.config.Campaign_Name
-            logger.critical(f'Stage "{stage}" is a hard mode, '
-                            f'please prepare your fleet "{str(self)}" in game before running Alas')
-            raise RequestHumanTakeover('Hard not satisfied', str(self))
+    # Remove this function, centralized validation and unified error raising
+    # def raise_hard_not_satisfied(self):
+    #     if self.is_hard_satisfied() is False:
+    #         stage = self.main.config.Campaign_Name
+    #         logger.critical(f'Stage "{stage}" is a hard mode, '
+    #                         f'please prepare your fleet "{str(self)}" in game before running Alas')
+    #         raise RequestHumanTakeover('Hard not satisfied', str(self))
 
     def clear(self, skip_first_screenshot=True):
         """
@@ -337,12 +338,27 @@ class FleetPreparation(InfoHandler):
         h1, h2, h3 = fleet_1.is_hard_satisfied(), fleet_2.is_hard_satisfied(), submarine.is_hard_satisfied()
         logger.info(f'Hard satisfied: Fleet_1: {h1}, Fleet_2: {h2}, Submarine: {h3}')
         if self.config.SERVER in ['cn', 'en', 'jp']:
-            if self.config.Fleet_Fleet1:
-                fleet_1.raise_hard_not_satisfied()
-            if self.config.Fleet_Fleet2:
-                fleet_2.raise_hard_not_satisfied()
-            if self.config.Submarine_Fleet:
-                submarine.raise_hard_not_satisfied()
+            unsatisfied = []
+            if self.config.Fleet_Fleet1 and h1 is False:
+                unsatisfied.append(str(fleet_1))
+            if self.config.Fleet_Fleet2 and h2 is False:
+                unsatisfied.append(str(fleet_2))
+            if self.config.Submarine_Fleet and h3 is False:
+                auto_recommend = self.config.Submarine_AutoRecommend
+                logger.attr('Submarine AutoRecommend', auto_recommend)
+                if auto_recommend:
+                    logger.info('Form submarine fleet via Recommend')
+                    submarine.recommend()
+                    self.device.screenshot()
+                    h3 = submarine.is_hard_satisfied()
+                    logger.info(f'Hard satisfied: Fleet_1: {h1}, Fleet_2: {h2}, Submarine: {h3}')
+                if h3 is False:
+                    unsatisfied.append(str(submarine))
+            if unsatisfied:
+                stage = self.config.Campaign_Name
+                logger.critical(f'Stage "{stage}" is a hard mode, '
+                                f'please prepare your fleet(s): {", ".join(unsatisfied)} in game before running Alas')
+                raise RequestHumanTakeover('Hard not satisfied', *unsatisfied)
 
         # Skip fleet preparation in hard mode
         self.map_is_hard_mode = h1 or h2 or h3

module/minigame/minigame.py

@@ -196,6 +196,10 @@ class Minigame(UI):
             if self.ui_page_appear(page_academy, interval=5):
                 self.device.click(ACADEMY_GOTO_GAME_ROOM)
                 continue
+            # You've reached your monthly limit of Game Tickets, and will not be able to earn any more.
+            # Continue playing the minigame?
+            if self.handle_popup_confirm('MINIGAME_ENTER'):
+                continue
 
         # game room and choose game have same header, go to game room first
         self.go_to_main_page()

module/ocr/models.py

@@ -19,15 +19,15 @@ class OcrModel:
     @cached_property
     def azur_lane_jp(self):
         # Folder: ./bin/cnocr_models/azur_lane_jp
-        # Size: 3.29MB
+        # Size: 3.25MB
         # Model: densenet-lite-gru
-        # Epoch: 93
-        # Validation accuracy: 99.38%
-        # Font: Impact, VibeMO Compressed Pro Thin, Folk R
-        # Charset: 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ:/- (Letter 'O' and <space> is not included)
+        # Epoch: 20
+        # Validation accuracy: 99.01%
+        # Font: Impact, VibeMO Compressed Pro Thin, Folk R, Source Han Serif JP
+        # Charset: 0123456789ABCDEFGHIJKLMNPQRSTUVWXYZ:/- (Letter 'O' and <space> is not included)
         # _num_classes: 39
         from module.ocr.al_ocr import AlOcr
-        return AlOcr(model_name='densenet-lite-gru', model_epoch=93, root='./bin/cnocr_models/azur_lane_jp',
+        return AlOcr(model_name='densenet-lite-gru', model_epoch=20, root='./bin/cnocr_models/azur_lane_jp',
                      name='azur_lane_jp')
 
     @cached_property

module/os/fleet.py

@@ -20,7 +20,7 @@ from module.os.assets import FLEET_EMP_DEBUFF, MAP_EXIT, MAP_GOTO_GLOBE, STRONGH
 from module.os.camera import OSCamera
 from module.os.map_base import OSCampaignMap
 from module.os_ash.ash import OSAsh
-from module.os_combat.combat import Combat
+from module.os_combat.combat import Combat, BATTLE_PREPARATION, SIREN_PREPARATION
 from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER
 from module.os_shop.assets import PORT_SUPPLY_CHECK
 from module.ui.assets import BACK_ARROW
@@ -317,8 +317,16 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
         # Record story history to clear click record
         clicked_story = False
         clicked_story_count = 0
+        reset_once = False
         stuck_timer = Timer(20, count=5).start()
         confirm_timer.reset()
+
+        def abyssal_expected_end():
+            # add handle_map_event() because OSCombat.combat_status() removes get_items
+            if self.handle_map_event(drop=drop):
+                return False
+            return self.is_in_map()
+
         for _ in self.loop(skip_first=skip_first_screenshot):
             # Map event
             event = self.handle_map_event(drop=drop)
@@ -335,10 +343,11 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
                     # STORY_OPTION_2_OF_3 -> POPUP_CONFIRM_STORY_SKIP
                     # both of operations return 'story_skip' event
                     # Continuous 2 story_skip means a submission of siren scanning devices
-                    if clicked_story_count >= 11:
+                    # Restrict the fucking unlimited resets
+                    if clicked_story_count >= 11 and not reset_once:
+                        reset_once = True
                         logger.info('Continuous options in story')
                         self.device.click_record_clear()
-                        clicked_story_count = 0
                 elif event == 'map_get_items':
                     # story_skip -> map_get_items means abyssal progress reward is received
                     if clicked_story:
@@ -395,7 +404,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
             if self.combat_appear():
                 # Use ui_back() for testing, because there are too few abyssal loggers every month.
                 # self.ui_back(check_button=self.is_in_map)
-                self.combat(expected_end=self.is_in_map, fleet_index=self.fleet_show_index, save_get_items=drop)
+                self.combat(expected_end=abyssal_expected_end, fleet_index=self.fleet_show_index, save_get_items=drop)
                 confirm_timer.reset()
                 stuck_timer.reset()
                 result.add('event')
@@ -760,6 +769,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
         logger.hr('BOSS leave')
         # Update local view
         self.update_os()
+        self.predict()
 
         click_timer = Timer(3)
         pause_interval = Timer(0.5, count=1)
@@ -773,8 +783,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
 
             # Re-enter boss accidentally
             if pause_interval.reached():
-                if self.combat_appear():
-                    logger.info(f'combat_appear -> {BACK_ARROW}')
+                if self.appear(BATTLE_PREPARATION):
+                    logger.info(f'{BATTLE_PREPARATION} -> {BACK_ARROW}')
+                    self.device.click(BACK_ARROW)
+                    pause_interval.reset()
+                    continue
+                if self.appear(SIREN_PREPARATION, offset=(20, 20)):
+                    logger.info(f'{SIREN_PREPARATION} -> {BACK_ARROW}')
                     self.device.click(BACK_ARROW)
                     pause_interval.reset()
                     continue

module/os/map.py

@@ -956,9 +956,11 @@ class OSMap(OSFleet, Map, GlobeCamera, StorageHandler, StrategicSearchHandler):
 
         logger.info(f'Run auto search, question={question}, rescan={rescan}')
         finished_combat = 0
+        genre = inflection.underscore(self.config.task.command)
         with self.stat.new(
-                genre=inflection.underscore(self.config.task.command),
-                method=self.config.DropRecord_OpsiRecord
+            genre=genre,
+            method=(self.config.DropRecord_CL1Record if genre == 'opsi_hazard1_leveling' 
+                    else self.config.DropRecord_OpsiRecord)
         ) as drop:
             while 1:
                 combat = self.os_auto_search_run(drop, interrupt=interrupt)

module/os_ash/meta.py

@@ -47,10 +47,7 @@ class MetaDigitCounter(DigitCounter):
 class Meta(UI, MapEventHandler):
 
     def digit_ocr_point_and_check(self, button: Button, check_number: int):
-        if server.server != 'jp':
-            point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
-        else:
-            point_ocr = MetaDigitCounter(button, letter=(192, 192, 192), threshold=160, name='POINT_OCR')
+        point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
         point, _, _ = point_ocr.ocr(self.device.image)
         if point >= check_number:
             return True

module/reward/reward.py

@@ -89,6 +89,8 @@ class Reward(UI):
                     click_interval.reset()
                     clicked = True
                     continue
+                if self.appear(MISSION_UNFINISH, offset=(20, 20)):
+                    return clicked
 
     def _reward_mission_claim_receive(self):
         """

module/shop/assets.py

@@ -23,7 +23,8 @@ SHOP_GOLD_COINS = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51
 SHOP_OCR_BALANCE = Button(area={'cn': (972, 164, 1052, 189), 'en': (972, 164, 1052, 189), 'jp': (972, 164, 1052, 189), 'tw': (972, 164, 1052, 189)}, color={'cn': (193, 204, 210), 'en': (193, 204, 210), 'jp': (193, 204, 210), 'tw': (193, 204, 210)}, button={'cn': (972, 164, 1052, 189), 'en': (972, 164, 1052, 189), 'jp': (972, 164, 1052, 189), 'tw': (972, 164, 1052, 189)}, file={'cn': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'en': './assets/en/shop/SHOP_OCR_BALANCE.png', 'jp': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'tw': './assets/cn/shop/SHOP_OCR_BALANCE.png'})
 SHOP_OCR_OIL = Button(area={'cn': (700, 23, 785, 47), 'en': (863, 24, 955, 46), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, color={'cn': (150, 185, 194), 'en': (150, 183, 189), 'jp': (150, 185, 194), 'tw': (150, 185, 194)}, button={'cn': (700, 23, 785, 47), 'en': (863, 24, 955, 46), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL.png', 'en': './assets/en/shop/SHOP_OCR_OIL.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL.png', 'tw': './assets/tw/shop/SHOP_OCR_OIL.png'})
 SHOP_OCR_OIL_CHECK = Button(area={'cn': (666, 30, 682, 43), 'en': (834, 25, 854, 45), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, color={'cn': (73, 73, 73), 'en': (71, 75, 75), 'jp': (73, 73, 73), 'tw': (73, 73, 73)}, button={'cn': (666, 30, 682, 43), 'en': (834, 25, 854, 45), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'en': './assets/en/shop/SHOP_OCR_OIL_CHECK.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'tw': './assets/tw/shop/SHOP_OCR_OIL_CHECK.png'})
-SHOP_REFRESH = Button(area={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, color={'cn': (65, 150, 212), 'en': (65, 150, 212), 'jp': (65, 150, 212), 'tw': (65, 150, 212)}, button={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/en/shop/SHOP_REFRESH.png', 'jp': './assets/cn/shop/SHOP_REFRESH.png', 'tw': './assets/cn/shop/SHOP_REFRESH.png'})
+SHOP_REFRESH = Button(area={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, color={'cn': (65, 150, 212), 'en': (65, 150, 212), 'jp': (65, 150, 212), 'tw': (65, 150, 212)}, button={'cn': (1001, 653, 1070, 690), 'en': (1001, 653, 1070, 690), 'jp': (1001, 653, 1070, 690), 'tw': (1001, 653, 1070, 690)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/cn/shop/SHOP_REFRESH.png', 'jp': './assets/cn/shop/SHOP_REFRESH.png', 'tw': './assets/cn/shop/SHOP_REFRESH.png'})
+SHOP_REFRESH_CHECK = Button(area={'cn': (1024, 660, 1048, 684), 'en': (1024, 660, 1048, 684), 'jp': (1024, 660, 1048, 684), 'tw': (1024, 660, 1048, 684)}, color={'cn': (131, 170, 197), 'en': (131, 170, 197), 'jp': (131, 170, 197), 'tw': (131, 170, 197)}, button={'cn': (1024, 660, 1048, 684), 'en': (1024, 660, 1048, 684), 'jp': (1024, 660, 1048, 684), 'tw': (1024, 660, 1048, 684)}, file={'cn': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'en': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'jp': './assets/cn/shop/SHOP_REFRESH_CHECK.png', 'tw': './assets/cn/shop/SHOP_REFRESH_CHECK.png'})
 SHOP_SELECT_PR1 = Button(area={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, color={'cn': (157, 158, 143), 'en': (157, 158, 143), 'jp': (157, 158, 143), 'tw': (157, 158, 143)}, button={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR1.png', 'en': './assets/en/shop/SHOP_SELECT_PR1.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR1.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR1.png'})
 SHOP_SELECT_PR2 = Button(area={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, color={'cn': (160, 159, 145), 'en': (160, 159, 145), 'jp': (160, 159, 145), 'tw': (160, 159, 145)}, button={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR2.png', 'en': './assets/en/shop/SHOP_SELECT_PR2.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR2.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR2.png'})
 SHOP_SELECT_PR3 = Button(area={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, color={'cn': (156, 156, 142), 'en': (156, 156, 142), 'jp': (156, 156, 142), 'tw': (156, 156, 142)}, button={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR3.png', 'en': './assets/en/shop/SHOP_SELECT_PR3.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR3.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR3.png'})

module/shop/shop_general.py

@@ -1,10 +1,15 @@
+import re
+
 from module.base.decorator import cached_property
+from module.base.filter import Filter
 from module.logger import logger
 from module.shop.base import ShopItemGrid, ShopItemGrid_250814
 from module.shop.clerk import ShopClerk
 from module.shop.shop_status import ShopStatus
 from module.shop.ui import ShopUI
 
+SKINBOX_POSITION_FILTER = Filter(re.compile(r'^(\d+)$'), ('position',))
+
 
 class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
     gems = 0
@@ -18,6 +23,28 @@ class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
         """
         return self.config.GeneralShop_Filter.strip()
 
+    @cached_property
+    def skinbox_allowed_positions(self):
+        """
+        The set of configured absolute grid positions (1-based), 
+        or None if no restrictions are applied.
+        If all the input is invalid, returns an empty set which will block all purchases.
+
+        Returns:
+            set[int]: 
+        """
+        skinbox_filter = self.config.GeneralShop_SkinBoxPositionFilter.strip()
+        if not skinbox_filter:
+            return None
+        SKINBOX_POSITION_FILTER.load(skinbox_filter)
+        allowed = {int(pos) for pos in SKINBOX_POSITION_FILTER.filter_raw if pos.isdigit()}
+        logger.attr('SkinBox_filter', ' > '.join([str(pos) for pos in allowed]))
+
+        if not allowed:
+            logger.warning("No valid positions found")
+
+        return allowed
+
     # New UI in 2025-08-14
     @cached_property
     def shop_general_items(self):
@@ -111,6 +138,24 @@ class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
 
         return False
 
+    def _skinbox_position_check(self, item):
+        """
+        Check if the skin box is at a designated purchase position.
+
+        Args:
+            item: Item to check
+
+        Returns:
+            bool: True if the skin box is targeted for purchase.
+        """
+        allowed = self.skinbox_allowed_positions
+        if allowed is None:
+            return True
+
+        grids = self.shop_general_items.grids
+        abs_pos = round((item.button[0] - grids.origin[0]) / grids.delta[0]) + 1
+        return abs_pos in allowed
+
     def shop_check_custom_item(self, item):
         """
         Check a custom item that should be bought with specific option.
@@ -126,12 +171,15 @@ class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
                 return True
 
         mode = self.config.GeneralShop_BuySkinBox
-        if (mode == 'unlimited' or (mode == 'specified' and self.config.GeneralShop_BuySkinBoxAmount > 0)):
-            if (not item.is_known_item()) and item.amount == 1 and item.cost == 'Coins' and item.price == 7000:
+        if (
+            mode == 'unlimited' 
+            or (mode == 'specified' and self.config.GeneralShop_BuySkinBoxAmount > 0)
+        ):
+            if (not item.is_known_item() and item.amount == 1 and item.cost == 'Coins' and item.price == 7000):
                 # check a custom item that cannot be template matched as color
                 # and design constantly changes i.e. equip skin box
                 logger.info(f'Item {item} is considered to be an equip skin box')
-                if self._currency >= item.price:
+                if self._currency >= item.price and self._skinbox_position_check(item):
                     if mode == 'specified':
                         self.config.GeneralShop_BuySkinBoxAmount -= 1
                     return True

module/shop/ui.py

@@ -83,7 +83,9 @@ class ShopUI(UI):
         for _ in self.loop():
             if self.appear(POPUP_CONFIRM, offset=(30, 30)):
                 break
-            if self.appear(SHOP_REFRESH, offset=(30, 30), interval=3):
+            # SHOP_REFRESH_CHECK is the refresh icon
+            # SHOP_REFRESH is refresh icon with surrounded background
+            if self.appear(SHOP_REFRESH_CHECK, offset=(30, 30), interval=3):
                 # SHOP_REFRESH has two kinds of color when active
                 if self.image_color_count(SHOP_REFRESH.button, color=(49, 142, 207), threshold=221, count=50):
                     self.device.click(SHOP_REFRESH)

module/tactical/tactical_class.py

@@ -373,7 +373,7 @@ class RewardTacticalClass(Dock):
         if self.appear(RAPID_TRAINING, offset=offset, interval=1):
             self.device.click(RAPID_TRAINING)
             # Clear interval to enter _tactical_books_choose fast
-            self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2)
+            self.interval_clear(TACTICAL_CLASS_START, interval=2)
             return True
 
         return False
@@ -444,7 +444,7 @@ class RewardTacticalClass(Dock):
             # Get finish time
             # sometimes you have TACTICAL_CHECK without black-blurred background
             # TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
-            if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
+            if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \
                     and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
                 self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 if book_empty:
@@ -495,11 +495,10 @@ class RewardTacticalClass(Dock):
             if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
                 self.device.click(MISSION_POPUP_ACK)
                 continue
-            if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
-                    and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
+            if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
                 if self._tactical_books_choose():
                     self.dock_select_index = 0
-                    self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP])
+                    self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP])
                     self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 else:
                     study_finished = True
@@ -527,6 +526,8 @@ class RewardTacticalClass(Dock):
                     logger.info('Not going to learn skill but in dock, close it')
                     study_finished = True
                     self.device.click(BACK_ARROW)
+                # reset DOCK_CHECK to Timer(3)
+                self.interval_timer.pop(DOCK_CHECK.name, None)
                 self.interval_reset([BOOK_EMPTY_POPUP, DOCK_CHECK], interval=3)
                 continue
             if self.appear(SKILL_CONFIRM, offset=(20, 20), interval=3):
@@ -644,27 +645,34 @@ class RewardTacticalClass(Dock):
         # Wait until they turn into
         # [120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120]
         level_ocr = LevelOcr(CARD_LEVEL_GRIDS.buttons, name='DOCK_LEVEL_OCR', threshold=64)
-        timeout = Timer(1, count=1).start()
-        while 1:
+        list_level = []
+        for _ in self.loop(timeout=1):
             list_level = level_ocr.ocr(self.device.image)
             first_ship = next((i for i, x in enumerate(list_level) if x > 0), len(list_level))
             first_empty = next((i for i, x in enumerate(list_level) if x == 0), len(list_level))
-            if timeout.reached():
-                logger.warning('Wait ship cards timeout')
-                break
             if first_empty >= first_ship:
                 break
-            self.device.screenshot()
+        else:
+            logger.warning('Wait ship cards timeout')
+
+        try:
+            min_level = int(self.config.AddNewStudent_MinLevel)
+            if min_level < 1:
+                min_level = 1
+        except (ValueError, TypeError) as e:
+            logger.warning(f'Invalid AddNewStudent_MinLevel: {self.config.AddNewStudent_MinLevel}, {e}')
+            min_level = 1
+        logger.attr('AddNewStudent_MinLevel', min_level)
 
         should_select_button = None
         for button, level in list(zip(CARD_GRIDS.buttons, list_level))[self.dock_select_index:]:
             # Select ship LV > 1 only
-            if level > 1:
+            if level >= min_level:
                 should_select_button = button
                 break
 
         if should_select_button is None:
-            logger.info('No ships with level > 1 in dock')
+            logger.info(f'No ships with level >= {min_level} in dock')
             return False
 
         # select a ship

module/webui/app.py

@@ -152,6 +152,11 @@ class AlasGUI(Frame):
     @use_scope("aside", clear=True)
     def set_aside(self) -> None:
         # TODO: update put_icon_buttons()
+
+        current_date = datetime.now().date()
+        if current_date.month == 4 and current_date.day == 1:
+            self.af_flag = True
+
         put_icon_buttons(
             Icon.DEVELOP,
             buttons=[{"label": t("Gui.Aside.Home"), "value": "Home", "color": "aside"}],
@@ -174,9 +179,6 @@ class AlasGUI(Frame):
             onclick=[lambda: go_app("manage", new_window=False)],
         )
 
-        current_date = datetime.now().date()
-        if current_date.month == 4 and current_date.day == 1:
-            self.af_flag = True
 
     @use_scope("aside_instance")
     def set_aside_status(self) -> None: