Merge pull request #4523 from LmeSzinc/dev

Add: Event Spring Fashion Festa (raid_20250116)

bin/cnocr_models/azur_lane_jp/label_cn.txt

@@ -0,0 +1,38 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+:
+/
+-

campaign/Readme.md

@@ -49,6 +49,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20240718   | war archives 20210916 cn | Upon the Shimmering Blue                     | 碧海光粼               | Upon the Shimmering Blue                     | 駆けよ 碧海の吹き風                  | 碧海光粼                 |
 | 20240829   | war archives 20210422 cn | Daedalian Hymn                               | 复兴的赞美诗           | Daedalian Hymn                               | 讃える復興の迷路                     | 復興的讚美詩             |
 | 20241017   | war archives 20211229 cn | Tower of Transcendence                       | 逆转彩虹之塔           | Tower of Transcendence                       | 遡望せし虹彩の塔                     | 逆轉彩虹之塔             |
+| 20250109   | war archives 20220224 cn | Abyssal Refrain                              | 深度回音               | Abyssal Refrain                              | 鳴動せし星霜の淵                     | 深度回音                 |
 | 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                            | 闇靄払う銀翼                         | -                        |
@@ -227,3 +228,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20241219   | event 20231221 cn        | Light-Chasing Sea of Stars                   | -                      | -                                            | -                                    | 星海逐光                 |
 | 20250102   | raid 20240130            | Spring Festive Fiasco                        | -                      | -                                            | -                                    | 寰昌宇定家事忙           |
 | 20250109   | event 20221222 cn        | Parallel Superimposition Rerun               | 复刻定向折叠           | Parallel Superimposition Rerun               | 積重なる事象の幻界（復刻）           | -                        |
+| 20250116   | raid 20250116            | Spring Fashion Festa                         | 华裳巧展喜事长         | Spring Fashion Festa                         | 新春華裳協奏曲                       | -                        |

campaign/event_20221222_cn/a1.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -84,7 +84,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/a2.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -65,7 +65,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/a3.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -68,7 +68,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/b1.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -85,7 +85,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/b2.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -73,7 +73,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/b3.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -76,7 +76,6 @@ class Campaign(CampaignBase):
     ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
-        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

campaign/event_20221222_cn/campaign_base.py

@@ -0,0 +1,14 @@
+from module.campaign.campaign_base import CampaignBase as CampaignBase_
+from module.ui.page import page_event
+
+
+class CampaignBase(CampaignBase_):
+    def handle_exp_info(self):
+        # Random background of hits EXP_INFO_B
+        if self.ui_page_appear(page_event):
+            return False
+        return super().handle_exp_info()
+
+    def map_data_init(self, map_):
+        super().map_data_init(map_)
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')

campaign/war_archives_20220224_cn/a1.py

@@ -0,0 +1,91 @@
+from module.logger import logger
+from module.map.map_base import CampaignMap
+from module.map.map_grids import RoadGrids, SelectedGrids
+
+from ..campaign_war_archives.campaign_base import CampaignBase
+
+MAP = CampaignMap('A1')
+MAP.shape = 'J6'
+MAP.camera_data = ['D2', 'D4', 'G2', 'G4']
+MAP.camera_data_spawn_point = ['D2', 'D4']
+MAP.map_data = """
+    ++ Me Me ++ ++ ++ ME -- ME ++
+    -- -- -- ME -- -- -- -- -- --
+    SP -- -- __ -- -- -- -- -- MB
+    SP -- -- ME -- -- -- -- -- ME
+    ++ -- -- -- ++ -- ME -- ME --
+    ++ Me Me ++ ++ ME -- ++ ++ ++
+"""
+MAP.map_data_loop = """
+    ++ Me Me ++ ++ ++ ME -- ME ++
+    -- -- -- ME -- -- -- -- -- --
+    SP -- -- __ -- MS -- MS -- MB
+    SP -- -- 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
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1, 'boss': 1},
+    {'battle': 4, 'enemy': 1},
+]
+MAP.spawn_data_loop = [
+    {'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, 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, \
+    = MAP.flatten()
+
+MAP.bouncing_enemy_data = [(C2, C3, C4), ]
+MAP.fortress_data = [E3, (E2, F2, F3, E4, F4)]
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_HAS_MAP_STORY = True
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_HAS_FORTRESS = True
+    MAP_HAS_BOUNCING_ENEMY = True
+    MAP_SWIPE_MULTIPLY = (1.111, 1.132)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.075, 1.094)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.043, 1.062)
+
+
+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_bouncing_enemy():
+            return True
+        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/war_archives_20220224_cn/a2.py

@@ -0,0 +1,105 @@
+from module.logger import logger
+from module.map.map_base import CampaignMap
+from module.map.map_grids import RoadGrids, SelectedGrids
+
+from .a1 import Config as ConfigBase
+from ..campaign_war_archives.campaign_base import CampaignBase
+
+MAP = CampaignMap('A2')
+MAP.shape = 'H10'
+MAP.camera_data = ['D2', 'E5', 'E7']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    ++ -- SP SP -- -- ++ ++
+    -- Me -- -- -- Me ++ ++
+    Me -- -- -- -- -- Me --
+    ++ ++ -- __ -- Me -- --
+    -- ++ -- -- -- ++ ++ ++
+    -- ME -- -- -- -- ME --
+    ++ ME -- -- -- -- -- MB
+    -- ME -- ME -- -- ME --
+    -- ++ ME -- ME ME ++ ++
+    -- -- -- -- -- -- -- ++
+"""
+MAP.map_data_loop = """
+    ++ -- SP SP -- -- ++ ++
+    -- Me -- -- -- Me ++ ++
+    Me -- -- MS -- -- Me --
+    ++ ++ -- __ -- Me -- --
+    -- ++ -- MS -- ++ ++ ++
+    -- ME -- -- ME -- ME --
+    ++ ME -- -- -- -- -- MB
+    -- 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': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+MAP.spawn_data_loop = [
+    {'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, \
+A9, B9, C9, D9, E9, F9, G9, H9, \
+A10, B10, C10, D10, E10, F10, G10, H10, \
+    = MAP.flatten()
+
+MAP.bouncing_enemy_data = [(B3, C3, D3, E3, F3), ]
+MAP.fortress_data = [D5, (C5, E5, C6, D6, E6)]
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_HAS_MAP_STORY = True
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_SWIPE_MULTIPLY = (1.216, 1.239)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.176, 1.198)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.142, 1.163)
+
+
+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_bouncing_enemy():
+            return True
+        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()