From 3b8271fbcafcbf1f15d01b8a519edc66b6103a01 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Fri, 27 Feb 2026 17:10:42 +0800 Subject: [PATCH] Revert "Upd: [tmp] event entrance of event_20260226_cn" This reverts commit 8f933b5468ce6735b1eef61817e30dcf6706ffcd. --- campaign/Readme.md | 1 - campaign/event_20260226_cn/a1.py | 97 -------------------------- campaign/event_20260226_cn/a2.py | 75 --------------------- campaign/event_20260226_cn/a3.py | 81 ---------------------- campaign/event_20260226_cn/b1.py | 97 -------------------------- campaign/event_20260226_cn/b2.py | 76 --------------------- campaign/event_20260226_cn/b3.py | 82 ---------------------- campaign/event_20260226_cn/c1.py | 97 -------------------------- campaign/event_20260226_cn/c2.py | 75 --------------------- campaign/event_20260226_cn/c3.py | 82 ---------------------- campaign/event_20260226_cn/d1.py | 98 --------------------------- campaign/event_20260226_cn/d2.py | 85 ----------------------- campaign/event_20260226_cn/d3.py | 91 ------------------------- campaign/event_20260226_cn/sp.py | 112 ------------------------------- module/config/argument/args.json | 80 +++++++++++----------- module/config/i18n/en-US.json | 1 - module/config/i18n/ja-JP.json | 1 - module/config/i18n/zh-CN.json | 1 - module/config/i18n/zh-TW.json | 1 - 19 files changed, 40 insertions(+), 1193 deletions(-) delete mode 100644 campaign/event_20260226_cn/a1.py delete mode 100644 campaign/event_20260226_cn/a2.py delete mode 100644 campaign/event_20260226_cn/a3.py delete mode 100644 campaign/event_20260226_cn/b1.py delete mode 100644 campaign/event_20260226_cn/b2.py delete mode 100644 campaign/event_20260226_cn/b3.py delete mode 100644 campaign/event_20260226_cn/c1.py delete mode 100644 campaign/event_20260226_cn/c2.py delete mode 100644 campaign/event_20260226_cn/c3.py delete mode 100644 campaign/event_20260226_cn/d1.py delete mode 100644 campaign/event_20260226_cn/d2.py delete mode 100644 campaign/event_20260226_cn/d3.py delete mode 100644 campaign/event_20260226_cn/sp.py diff --git a/campaign/Readme.md b/campaign/Readme.md index 45596360c..55e3a91ff 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -282,4 +282,3 @@ 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 | - | diff --git a/campaign/event_20260226_cn/a1.py b/campaign/event_20260226_cn/a1.py deleted file mode 100644 index a017abcd1..000000000 --- a/campaign/event_20260226_cn/a1.py +++ /dev/null @@ -1,97 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['D3', 'D6', 'G3', 'G6'] -MAP.camera_data_spawn_point = ['G2'] -MAP.map_data = """ - ++ -- -- -- -- -- ++ -- SP -- - ++ ME ++ ++ ++ Me -- -- -- SP - -- -- -- -- Me -- -- MS -- -- - ME -- ME -- -- -- __ -- ++ ++ - ++ -- ++ ++ -- MS -- -- ++ ++ - -- -- -- ++ 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 -""" -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, 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: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.232, 1.255) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.191, 1.213) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.156, 1.177) - - -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() diff --git a/campaign/event_20260226_cn/a2.py b/campaign/event_20260226_cn/a2.py deleted file mode 100644 index 40e981981..000000000 --- a/campaign/event_20260226_cn/a2.py +++ /dev/null @@ -1,75 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['E3', 'E6', 'F3', 'F6'] -MAP.camera_data_spawn_point = ['E6'] -MAP.map_data = """ - -- -- -- -- -- ++ ME ++ -- -- - -- -- MB -- -- ME -- ME -- -- - ++ ++ -- ++ ++ -- -- -- ME -- - ++ -- __ -- ++ Me -- ++ ++ ++ - -- MS -- MS -- -- -- Me -- -- - -- -- 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 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, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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() diff --git a/campaign/event_20260226_cn/a3.py b/campaign/event_20260226_cn/a3.py deleted file mode 100644 index 368b00817..000000000 --- a/campaign/event_20260226_cn/a3.py +++ /dev/null @@ -1,81 +0,0 @@ -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 = 'K10' -MAP.camera_data = ['F3', 'F6'] -MAP.camera_data_spawn_point = ['F6'] -MAP.map_data = """ - -- ++ ++ ++ -- -- -- ++ ++ ++ -- - -- ++ -- Me -- MB -- Me -- ++ -- - -- -- ME -- Me -- Me -- ME -- -- - -- -- ++ MS -- __ -- MS ++ -- -- - -- -- ++ -- -- MS -- -- ++ -- -- - ++ ++ ME -- -- -- -- -- ME ++ ++ - ++ ++ -- -- SP -- SP -- -- ++ ++ - -- -- ME -- ++ ++ ++ -- ME -- -- - -- ++ -- -- ++ ++ ++ -- -- ++ -- - -- -- -- -- ++ ++ ++ -- -- -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 -""" -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, K1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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() diff --git a/campaign/event_20260226_cn/b1.py b/campaign/event_20260226_cn/b1.py deleted file mode 100644 index b87ff6fa4..000000000 --- a/campaign/event_20260226_cn/b1.py +++ /dev/null @@ -1,97 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['D3', 'D6', 'G3', 'G6'] -MAP.camera_data_spawn_point = ['G2'] -MAP.map_data = """ - ++ -- -- -- -- -- ++ -- SP -- - ++ ME ++ ++ ++ Me -- -- -- SP - -- -- -- -- Me -- -- MS -- -- - ME -- ME -- -- -- __ -- ++ ++ - ++ -- ++ ++ -- MS -- -- ++ ++ - -- -- -- ++ 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 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 1}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4, '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: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Lovers'] - 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 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.217, 1.240) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.177, 1.199) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.143, 1.163) - - -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() diff --git a/campaign/event_20260226_cn/b2.py b/campaign/event_20260226_cn/b2.py deleted file mode 100644 index 10a60a465..000000000 --- a/campaign/event_20260226_cn/b2.py +++ /dev/null @@ -1,76 +0,0 @@ -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 = ['E3', 'E6', 'F3', 'F6'] -MAP.camera_data_spawn_point = ['E6'] -MAP.map_data = """ - -- -- -- -- -- ++ ME ++ -- -- - -- -- MB -- -- ME -- ME -- -- - ++ ++ -- ++ ++ -- -- -- ME -- - ++ -- __ -- ++ Me -- ++ ++ ++ - -- MS -- MS -- -- -- Me -- -- - -- -- 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 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 1}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5, 'boss': 1}, -] -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 = ['Vboss_Hermit', 'Vboss_Chariot'] - 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() diff --git a/campaign/event_20260226_cn/b3.py b/campaign/event_20260226_cn/b3.py deleted file mode 100644 index 12af0244b..000000000 --- a/campaign/event_20260226_cn/b3.py +++ /dev/null @@ -1,82 +0,0 @@ -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 = 'K10' -MAP.camera_data = ['F3', 'F6'] -MAP.camera_data_spawn_point = ['F6'] -MAP.map_data = """ - -- ++ ++ ++ -- -- -- ++ ++ ++ -- - -- ++ -- Me -- MB -- Me -- ++ -- - -- -- ME -- Me -- Me -- ME -- -- - -- -- ++ MS -- __ -- MS ++ -- -- - -- -- ++ -- -- MS -- -- ++ -- -- - ++ ++ ME -- -- -- -- -- ME ++ ++ - ++ ++ -- -- SP -- SP -- -- ++ ++ - -- -- ME -- ++ ++ ++ -- ME -- -- - -- ++ -- -- ++ ++ ++ -- -- ++ -- - -- -- -- -- ++ ++ ++ -- -- -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 2}, - {'battle': 1}, - {'battle': 2}, - {'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, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Lovers', 'Vboss_Chariot'] - 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() diff --git a/campaign/event_20260226_cn/c1.py b/campaign/event_20260226_cn/c1.py deleted file mode 100644 index ae69348f5..000000000 --- a/campaign/event_20260226_cn/c1.py +++ /dev/null @@ -1,97 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['D3', 'D6', 'G3', 'G6'] -MAP.camera_data_spawn_point = ['G2'] -MAP.map_data = """ - ++ -- -- -- -- -- ++ -- SP -- - ++ ME ++ ++ ++ Me -- -- -- SP - -- -- -- -- Me -- -- MS -- -- - ME -- ME -- -- -- __ -- ++ ++ - ++ -- ++ ++ -- MS -- -- ++ ++ - -- -- -- ++ 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 -""" -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, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.232, 1.255) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.191, 1.213) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.156, 1.177) - - -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() diff --git a/campaign/event_20260226_cn/c2.py b/campaign/event_20260226_cn/c2.py deleted file mode 100644 index 87e2ebf10..000000000 --- a/campaign/event_20260226_cn/c2.py +++ /dev/null @@ -1,75 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['E3', 'E6', 'F3', 'F6'] -MAP.camera_data_spawn_point = ['E6'] -MAP.map_data = """ - -- -- -- -- -- ++ ME ++ -- -- - -- -- MB -- -- ME -- ME -- -- - ++ ++ -- ++ ++ -- -- -- ME -- - ++ -- __ -- ++ Me -- ++ ++ ++ - -- MS -- MS -- -- -- Me -- -- - -- -- 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 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, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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() diff --git a/campaign/event_20260226_cn/c3.py b/campaign/event_20260226_cn/c3.py deleted file mode 100644 index 99f63596e..000000000 --- a/campaign/event_20260226_cn/c3.py +++ /dev/null @@ -1,82 +0,0 @@ -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 = 'K10' -MAP.camera_data = ['F3', 'F6'] -MAP.camera_data_spawn_point = ['F6'] -MAP.map_data = """ - -- ++ ++ ++ -- -- -- ++ ++ ++ -- - -- ++ -- Me -- MB -- Me -- ++ -- - -- -- ME -- Me -- Me -- ME -- -- - -- -- ++ MS -- __ -- MS ++ -- -- - -- -- ++ -- -- MS -- -- ++ -- -- - ++ ++ ME -- -- -- -- -- ME ++ ++ - ++ ++ -- -- SP -- SP -- -- ++ ++ - -- -- ME -- ++ ++ ++ -- ME -- -- - -- ++ -- -- ++ ++ ++ -- -- ++ -- - -- -- -- -- ++ ++ ++ -- -- -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 -""" -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, I1, J1, K1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Star'] - 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() diff --git a/campaign/event_20260226_cn/d1.py b/campaign/event_20260226_cn/d1.py deleted file mode 100644 index 4fdd5db3d..000000000 --- a/campaign/event_20260226_cn/d1.py +++ /dev/null @@ -1,98 +0,0 @@ -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 = 'J8' -MAP.camera_data = ['D3', 'D6', 'G3', 'G6'] -MAP.camera_data_spawn_point = ['G2'] -MAP.map_data = """ - ++ -- -- -- -- -- ++ -- SP -- - ++ ME ++ ++ ++ Me -- -- -- SP - -- -- -- -- Me -- -- MS -- -- - ME -- ME -- -- -- __ -- ++ ++ - ++ -- ++ ++ -- MS -- -- ++ ++ - -- -- -- ++ 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 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 2}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5, '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: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Lovers'] - 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 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.217, 1.240) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.177, 1.199) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.143, 1.163) - - -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() diff --git a/campaign/event_20260226_cn/d2.py b/campaign/event_20260226_cn/d2.py deleted file mode 100644 index ddf96d6e7..000000000 --- a/campaign/event_20260226_cn/d2.py +++ /dev/null @@ -1,85 +0,0 @@ -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 = ['E3', 'E6', 'F3', 'F6'] -MAP.camera_data_spawn_point = ['E6'] -MAP.map_data = """ - -- -- -- -- -- ++ ME ++ -- -- - -- -- MB -- -- ME -- ME -- -- - ++ ++ -- ++ ++ -- -- -- ME -- - ++ -- __ -- ++ Me -- ++ ++ ++ - -- MS -- MS -- -- -- Me -- -- - -- -- 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 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 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 = ['Vboss_Hermit', 'Vboss_Chariot'] - 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() diff --git a/campaign/event_20260226_cn/d3.py b/campaign/event_20260226_cn/d3.py deleted file mode 100644 index 107d0066e..000000000 --- a/campaign/event_20260226_cn/d3.py +++ /dev/null @@ -1,91 +0,0 @@ -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 = 'K10' -MAP.camera_data = ['F3', 'F6'] -MAP.camera_data_spawn_point = ['F6'] -MAP.map_data = """ - -- ++ ++ ++ -- -- -- ++ ++ ++ -- - -- ++ -- Me -- MB -- Me -- ++ -- - -- -- ME -- Me -- Me -- ME -- -- - -- -- ++ MS -- __ -- MS ++ -- -- - -- -- ++ -- -- MS -- -- ++ -- -- - ++ ++ ME -- -- -- -- -- ME ++ ++ - ++ ++ -- -- SP -- SP -- -- ++ ++ - -- -- ME -- ++ ++ ++ -- ME -- -- - -- ++ -- -- ++ ++ ++ -- -- ++ -- - -- -- -- -- ++ ++ ++ -- -- -- -- -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 9, 'siren': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 6, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \ -A9, B9, C9, D9, E9, F9, G9, H9, I9, J9, K9, \ -A10, B10, C10, D10, E10, F10, G10, H10, I10, J10, K10, \ - = MAP.flatten() - - -class Config(ConfigBase): - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Lovers', 'Vboss_Chariot'] - 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() diff --git a/campaign/event_20260226_cn/sp.py b/campaign/event_20260226_cn/sp.py deleted file mode 100644 index 8cec53c7b..000000000 --- a/campaign/event_20260226_cn/sp.py +++ /dev/null @@ -1,112 +0,0 @@ -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 = 'I8' -MAP.camera_data = ['D3', 'D6', 'F3', 'F6'] -MAP.camera_data_spawn_point = ['F2'] -MAP.map_data = """ - ++ ++ ++ -- -- -- -- SP -- - -- ME -- -- -- MS -- -- SP - -- -- ME ++ -- -- MS -- -- - ME -- -- -- ME __ -- MS -- - -- ME -- ME ++ -- ++ ++ ME - ++ -- -- -- -- -- ++ ++ -- - -- MB -- ++ ME -- ME -- -- - -- -- -- ++ -- ME ++ ++ ++ -""" -MAP.weight_data = """ - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 -""" -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, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Vboss_Hermit', 'Vboss_Lovers', 'Vboss_Chariot'] - 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'] - STAGE_INCREASE_AB = True - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) - HOMO_EDGE_COLOR_RANGE = (0, 17) - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SWIPE_MULTIPLY = (1.180, 1.202) - MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162) - MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128) - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - MAP_IS_ONE_TIME_STAGE = True - - -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() diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 59228fe03..c8791715f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1939,24 +1939,24 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "display": "hide", "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -2354,23 +2354,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -2762,23 +2762,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -4557,23 +4557,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -4983,23 +4983,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -5409,23 +5409,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -5835,23 +5835,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { @@ -6251,23 +6251,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_en": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20231221_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20260226_cn" + "event_20231221_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index e1a61eea1..d7da10608 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -788,7 +788,6 @@ "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", "raid_20200624": "Air Raid Drills with Essex Rerun", "raid_20210708": "Cross Wave rerun", "raid_20220127": "Mystery Investigation", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 6ccb08e28..fdcfa4485 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -788,7 +788,6 @@ "event_20250912_cn": "アマハラに舞い奉れ", "event_20251023_cn": "テンペスタと自由群島", "event_20251218_cn": "天穹に響く音謡", - "event_20260226_cn": "春色旅籠Online", "raid_20200624": "特別演習超空強襲波(復刻)", "raid_20210708": "交錯する新たな波 (復刻)", "raid_20220127": "秘密事件調査", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 2d0dd7bef..1350a92c4 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -788,7 +788,6 @@ "event_20250912_cn": "起舞于天原之上", "event_20251023_cn": "飓风与自由群岛", "event_20251218_cn": "响彻于天穹之音", - "event_20260226_cn": "春满客栈Online", "raid_20200624": "复刻特别演习埃塞克斯级", "raid_20210708": "复刻穿越彼方的水线", "raid_20220127": "演习神秘事件调查", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index cd00aa855..90eb67d4b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -788,7 +788,6 @@ "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", "event_20251218_cn": "響徹於天穹之音", - "event_20260226_cn": "Springtide Inn Online", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查",