Add: Event Alliance Before the Hagiobull (event_20260520_cn)

* Fix: [TW] Enter event 20201126

* Upd: detect 5 story options at max (#5653)

* Add: war_archives_20220818_cn and war_archives_20230803_cn (#5660)

---------

Co-authored-by: ArecaSapling <115386623+sui-feng-cb@users.noreply.github.com>

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

@@ -58,6 +58,8 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20251106   | war archives 20220915 cn | Violet Tempest Blooming Lycoris              | 紫绛槿岚                   | Violet Tempest Blooming Lycoris                    | 赫の涙月 菫の暁風                    | 紫絳槿嵐                   |
 | 20251218   | war archives 20221222 cn | Parallel Superimposition                     | 定向折叠                   | Parallel Superimposition                           | 積重なる事象の幻界                   | 定向折疊                   |
 | 20260129   | war archives 20230223 cn | Revelations of Dust                          | 湮烬尘墟                   | Revelations of Dust                                | 黙示の遺構                           | 湮燼塵墟                   |
+| 20260409   | war archives 20220818 cn | Operation Convergence                        | 远汇点作战                 | Operation Convergence                              | 結像点作戦                           | 遠匯點作戰                 |
+| 20260507   | war archives 20230803 cn | Anthem of Remembrance                        | 奏响鸢尾之歌               | Anthem of Remembrance                              | 燃ゆる聖都の回想曲                   | 奏響鳶尾之歌               |
 | 20200227   | event 20200227 cn        | Northern Overture                            | 北境序曲                   | Northern Overture                                  | 凍絶の北海                           | -                          |
 | 20200312   | event 20200312 cn        | The Solomon Ranger                           | 复刻斯图尔特的硝烟         | The Solomon Ranger Rerun                           | 南洋に靡く硝煙（復刻）               | -                          |
 | 20200326   | event 20200326 cn        | Microlayer Medley                            | 微层混合                   | Microlayer Medley                                  | 闇靄払う銀翼                         | -                          |
@@ -281,4 +283,16 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20260129   | coalition 20260122       | Light & Shadow Fashion Shoot!                | -                          | -                                                  | -                                    | 光影風尚-拍攝進行時        |
 | 20260205   | raid 20240328            | From Zero to Hero                            | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun                            | ゼロから頑張る魔王討伐（復刻）       | -                          |
 | 20260212   | raid 20260212            | Spring Auction Adventure                     | 春宴怀玉香满庭             | Spring Auction Adventure                           | 新春玉逸品会                         | 春宴懷玉香滿庭             |
-| 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | -                          |
+| 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | 春滿客棧Online             |
+| 20260312   | event 20240229 cn        | Snowrealm Peregrination Rerun                | 复刻雪境迷踪               | Snowrealm Peregrination Rerun                      | 銀界遊廻（復刻）                     | -                          |
+| 20260319   | event 20220728 cn        | Aquilifer's Ballade                          | -                          | -                                                  | -                                    | 復刻雄鷹的敘事歌           |
+| 20260326   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | 漫游者招募计划             | The Vagabond’s Recruitment Plan                    | ワンダラー募集計画                   | -                          |
+| 20260402   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | -                          | -                                                  | -                                    | 漫遊者招募計劃             |
+| 20260416   | event 20220915 cn        | Violet Tempest Blooming Lycoris              | -                          | -                                                  | -                                    | 復刻紫絳槿嵐               |
+| 20260417   | event 20260417 cn        | Vacation Lane – Beachside Brilliance         | 假日航线闪耀海滨           | Vacation Lane – Beachside Brilliance               | バケーションレーン・きらめく砂浜     | -                          |
+| 20260417   | event 20201126 cn        | Vacation Lane Rerun                          | 复刻假日航线               | Vacation Lane Rerun                                | バケーションレーン（復刻）           | -                          |
+| 20260417   | event 20250424 cn        | Toward Tulipa’s Seas Rerun                   | 复刻扬起郁金之旗           | Toward Tulipa’s Seas Rerun                         | チュリッパの海へ（復刻）             | -                          |
+| 20260417   | event 20260417 cn        | Vacation Lane – Beachside Brilliance         | -                          | -                                                  | -                                    | 假日航線閃耀海濱           |
+| 20260417   | event 20201126 cn        | Vacation Lane Rerun                          | -                          | -                                                  | -                                    | 復刻假日航線               |
+| 20260514   | event 20221222 cn        | Parallel Superimposition                     | -                          | -                                                  | -                                    | 復刻定向折疊               |
+| 20260520   | event 20260520 cn        | Alliance Before the Hagiobull                | 圣印前的同盟               | Alliance Before the Hagiobull                      | 聖印前の同盟                         | -                          |

campaign/campaign_main/campaign_14_4.py

@@ -107,9 +107,10 @@ class Campaign(CampaignBase):
 
     def map_data_init(self, map_):
         super().map_data_init(map_)
-        for override_grid in OVERRIDE:
-            # Set may_enemy, but keep may_ambush
-            self.map[override_grid.location].may_enemy = override_grid.may_enemy
+        if not self.map_is_clear_mode:
+            for override_grid in OVERRIDE:
+                # Set may_enemy, but keep may_ambush
+                self.map[override_grid.location].may_enemy = override_grid.may_enemy
 
     def battle_0(self):
         self.pick_up_light_house(A9)

campaign/campaign_main/campaign_15_base.py

@@ -1,15 +1,13 @@
 from module.base.mask import Mask
 from module.base.timer import Timer
-from module.campaign.campaign_base import CampaignBase as CampaignBase_
 from module.handler.assets import STRATEGY_OPENED
 from module.handler.strategy import MOB_MOVE_OFFSET
 from module.logger import logger
 from module.map.map_grids import SelectedGrids
 from module.map.utils import location_ensure
 from module.map_detection.grid import GridInfo
-from module.map_detection.utils_assets import ASSETS
 
-MASK_MAP_UI_W15 = Mask(file='./assets/mask/MASK_MAP_UI_W15.png')
+from .campaign_support_fleet import CampaignBase as CampaignBase_
 
 
 class Config:
@@ -45,12 +43,6 @@ class W15GridInfo(GridInfo):
 class CampaignBase(CampaignBase_):
     ENEMY_FILTER = '1L > 1M > 1E > 2L > 3L > 2M > 2E > 1C > 2C > 3M > 3E > 3C'
 
-    def map_data_init(self, map_):
-        super().map_data_init(map_)
-        # Patch ui_mask, get rid of supporting fleet
-        _ = ASSETS.ui_mask
-        ASSETS.ui_mask = MASK_MAP_UI_W15.image
-
     map_has_mob_move = True
 
     def strategy_set_execute(self, formation=None, sub_view=None, sub_hunt=None):
@@ -61,10 +53,6 @@ class CampaignBase(CampaignBase_):
         )
         logger.attr("Map has mob move", self.strategy_has_mob_move())
 
-    def _map_swipe(self, vector, box=(239, 159, 1175, 628)):
-        # Left border to 239, avoid swiping on support fleet
-        return super()._map_swipe(vector, box=box)
-
     def mob_movable(self, location, target):
         """
         Check if mob is movable from location to target.
@@ -217,3 +205,4 @@ class CampaignBase(CampaignBase_):
         self._mob_move_info_change(location, target)
         self.find_path_initial()
         self.map.show()
+        return True