From 47d2779bcb8da1710da7f9d63113874e6089de32 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Wed, 20 May 2026 22:45:04 +0800 Subject: [PATCH 1/7] Fix: story option detection pre_process (#5669) --- module/handler/info_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/module/handler/info_handler.py b/module/handler/info_handler.py index 89d2e9355..55b20a4ee 100644 --- a/module/handler/info_handler.py +++ b/module/handler/info_handler.py @@ -345,6 +345,7 @@ class InfoHandler(ModuleBase): story_option_color = (247, 247, 247) image = color_similarity_2d(self.image_crop(story_detect_area, copy=False), color=story_option_color) + cv2.morphologyEx(image, cv2.MORPH_CLOSE, kernel=np.ones((5, 5), dtype=np.uint8), dst=image) line = cv2.reduce(image, 1, cv2.REDUCE_AVG).flatten() line[line < 200] = 0 line[line >= 200] = 255 From aa996ce1b6e5002d5d1b88cdec65dc0ff7553b72 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Wed, 20 May 2026 21:28:26 +0800 Subject: [PATCH 2/7] Revert "Upd: [JP] TEMPLATE_COMBAT_LOADING (#5393)" This reverts commit e51aed9ed6f6bfa778f50f79bad1b4bc1195f1cb. --- assets/jp/template/TEMPLATE_COMBAT_LOADING.png | Bin 781 -> 746 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/jp/template/TEMPLATE_COMBAT_LOADING.png b/assets/jp/template/TEMPLATE_COMBAT_LOADING.png index 2bf0123f5bd05ceebbd81243e1a5e5c419a24549..9086656f04cf95773ab7511a0bbc9f3d62cbf568 100644 GIT binary patch literal 746 zcmV=F!rJ zk9CcO5Ms;cVkpR>&TUOm$k*@n zw6~^dB1Ds<12?Kwxz?%>1fjzO;eXgANgJ6gNv@BLv`#6?G+Lw-G5}dLK%yIF^BcFX zT_Tzp+Ta+SM>?hNSCNQD!auin2^NV&y1h_)a`k`X}PMj zD?Cnz1wb$qE*6XVd|uP)=;q+b_ix??9Td;ibyaSvRRL*JcV}vqN~QFdE|+D}6kK*YCt_xW6fLeYV#&E@n$zF=`^^cJ8Q44D1CdwPQ7<5w0| z)&&-ykpiHuca_t^YL`lqWdP) zj12FkNv5Xdm}q&|j?Vp@Gw0GCr4|eJ-s{`n$G7&{aIpLSeC%h(wRQl&{z3fJ`!5e3 z_oUJpr^^MWqfZ;_LV#-TMkeb*mCmx7nYnLO6#H>LgWbsF~%Hc;Ve90XOIt=+27L?#csFf zucG53$S)9p;_8~LBn8UL6-8zhEvFvoA;6M{FfJwBSa-V}h9M&;BQuNQf23oDfX}nwB%94rN;yiAw7sJ$3d1-`STi1{gH=nWn;a?B@hu`I5wZ|+Mf)@rZn47TzX z!aDGIiu`^*d(yqbL@K9)j0`YQlL^uk@|ys@{xt1&6snq9A8y=PT$U*9ADJYK{yDZ< zS?2K-yD&m;mRB%FcOLbmRf9}?UpaZARJ6Nx4&oVE=^q?<*7ueXyk0LcRnuyBsKgxm z5$hYBmh#R(Lqo%*3$0{vait+#^I==BI(H>GIwuHRXJ= Date: Wed, 20 May 2026 22:49:15 +0800 Subject: [PATCH 3/7] Add: Event Alliance Before the Hagiobull (event_20260520_cn) (#5675) --- campaign/Readme.md | 1 + campaign/event_20260520_cn/a1.py | 84 ++++++++++++++++ campaign/event_20260520_cn/a2.py | 77 +++++++++++++++ campaign/event_20260520_cn/a3.py | 83 ++++++++++++++++ campaign/event_20260520_cn/b1.py | 82 ++++++++++++++++ campaign/event_20260520_cn/b2.py | 81 ++++++++++++++++ campaign/event_20260520_cn/b3.py | 84 ++++++++++++++++ campaign/event_20260520_cn/c1.py | 84 ++++++++++++++++ campaign/event_20260520_cn/c2.py | 77 +++++++++++++++ campaign/event_20260520_cn/c3.py | 84 ++++++++++++++++ campaign/event_20260520_cn/d1.py | 82 ++++++++++++++++ campaign/event_20260520_cn/d2.py | 90 +++++++++++++++++ campaign/event_20260520_cn/d3.py | 93 ++++++++++++++++++ campaign/event_20260520_cn/sp.py | 105 ++++++++++++++++++++ module/config/argument/args.json | 160 ++++++++----------------------- 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, 1151 insertions(+), 120 deletions(-) create mode 100644 campaign/event_20260520_cn/a1.py create mode 100644 campaign/event_20260520_cn/a2.py create mode 100644 campaign/event_20260520_cn/a3.py create mode 100644 campaign/event_20260520_cn/b1.py create mode 100644 campaign/event_20260520_cn/b2.py create mode 100644 campaign/event_20260520_cn/b3.py create mode 100644 campaign/event_20260520_cn/c1.py create mode 100644 campaign/event_20260520_cn/c2.py create mode 100644 campaign/event_20260520_cn/c3.py create mode 100644 campaign/event_20260520_cn/d1.py create mode 100644 campaign/event_20260520_cn/d2.py create mode 100644 campaign/event_20260520_cn/d3.py create mode 100644 campaign/event_20260520_cn/sp.py diff --git a/campaign/Readme.md b/campaign/Readme.md index 7e458683f..34cc7460a 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -295,3 +295,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 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 | 聖印前の同盟 | - | diff --git a/campaign/event_20260520_cn/a1.py b/campaign/event_20260520_cn/a1.py new file mode 100644 index 000000000..4282bf15d --- /dev/null +++ b/campaign/event_20260520_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 = ['D2', 'D6', 'F2', 'F6'] +MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.map_data = """ + -- -- -- SP -- SP -- -- -- + -- ME ++ -- -- -- -- ME -- + -- ++ Me -- __ -- ++ ++ -- + -- ++ -- MS -- MS -- ++ -- + ME -- ME -- -- -- Me Me -- + ++ -- -- -- ++ -- -- -- 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': 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== End of generated config ===== + + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.238, 1.261) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.197, 1.219) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.162, 1.183) + + +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_20260520_cn/a2.py b/campaign/event_20260520_cn/a2.py new file mode 100644 index 000000000..d305c5484 --- /dev/null +++ b/campaign/event_20260520_cn/a2.py @@ -0,0 +1,77 @@ +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 = 'I7' +MAP.camera_data = ['D2', 'D5', 'E2', 'E5'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + -- ++ ++ -- Me ++ ME -- -- + ME ++ ++ SP -- -- -- ME -- + -- -- SP -- -- MS ++ ++ ++ + Me -- -- -- MS -- Me -- -- + -- ++ -- MS -- __ -- 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 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, \ +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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/a3.py b/campaign/event_20260520_cn/a3.py new file mode 100644 index 000000000..9bd6fcc7b --- /dev/null +++ b/campaign/event_20260520_cn/a3.py @@ -0,0 +1,83 @@ +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 = 'H9' +MAP.camera_data = ['D2', 'D6', 'D7', 'E2', 'E6', 'E7'] +MAP.camera_data_spawn_point = ['D2', 'D6'] +MAP.map_data = """ + -- -- ++ -- -- ME -- -- + -- -- ++ Me Me -- -- -- + ++ ++ ++ -- -- ME -- -- + SP -- -- MS -- -- -- -- + -- -- MS -- __ Me ++ -- + SP -- -- MS -- -- 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 +""" +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, \ +A9, B9, C9, D9, E9, F9, G9, H9, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/b1.py b/campaign/event_20260520_cn/b1.py new file mode 100644 index 000000000..f50f96ac5 --- /dev/null +++ b/campaign/event_20260520_cn/b1.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 + +MAP = CampaignMap('B1') +MAP.shape = 'I7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + -- Me -- -- -- -- -- ++ -- + ME -- ME ++ ++ -- ME ++ -- + ++ -- ++ ++ ++ Me -- ME -- + -- MS -- ME Me -- -- ++ ++ + -- -- MS -- -- __ -- MB ++ + SP -- -- MS -- Me -- -- ME + -- 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 +""" +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, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== End of generated config ===== + + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.132, 1.154) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.095, 1.115) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.063, 1.082) + + +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_20260520_cn/b2.py b/campaign/event_20260520_cn/b2.py new file mode 100644 index 000000000..6081d74d5 --- /dev/null +++ b/campaign/event_20260520_cn/b2.py @@ -0,0 +1,81 @@ +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 = ['D3', 'D6', 'G3', 'G6'] +MAP.camera_data_spawn_point = ['G3'] +MAP.map_data = """ + -- ++ -- -- -- -- -- ++ ++ ++ + -- ++ ME ME ++ -- MS -- -- SP + -- Me -- -- Me -- -- MS -- -- + MB -- -- -- __ -- 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/b3.py b/campaign/event_20260520_cn/b3.py new file mode 100644 index 000000000..6c38279b6 --- /dev/null +++ b/campaign/event_20260520_cn/b3.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 +from .b1 import Config as ConfigBase + +MAP = CampaignMap('B3') +MAP.shape = 'I9' +MAP.camera_data = ['D3', 'D7', 'F3', 'F7'] +MAP.camera_data_spawn_point = ['F7', 'D7'] +MAP.map_data = """ + ++ ++ ++ -- -- -- ++ ++ ++ + -- -- ME -- -- -- ME -- -- + -- ME -- ME -- ME -- ME -- + -- ++ -- -- ++ -- -- ++ -- + ME ++ Me -- -- -- Me ++ ME + -- Me -- -- MB -- -- Me -- + -- -- MS -- MS -- MS -- -- + ++ ++ -- -- __ -- -- ++ ++ + ++ ++ -- 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 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, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/c1.py b/campaign/event_20260520_cn/c1.py new file mode 100644 index 000000000..b373b5a60 --- /dev/null +++ b/campaign/event_20260520_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 = ['D2', 'D6', 'F2', 'F6'] +MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.map_data = """ + -- -- -- SP -- SP -- -- -- + -- ME ++ -- -- -- -- ME -- + -- ++ Me -- __ -- ++ ++ -- + -- ++ -- MS -- MS -- ++ -- + ME -- ME -- -- -- Me Me -- + ++ -- -- -- ++ -- -- -- 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': 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== End of generated config ===== + + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.238, 1.261) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.197, 1.219) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.162, 1.183) + + +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_20260520_cn/c2.py b/campaign/event_20260520_cn/c2.py new file mode 100644 index 000000000..23fc76d7a --- /dev/null +++ b/campaign/event_20260520_cn/c2.py @@ -0,0 +1,77 @@ +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 = 'I7' +MAP.camera_data = ['D2', 'D5', 'E2', 'E5'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + -- ++ ++ -- Me ++ ME -- -- + ME ++ ++ SP -- -- -- ME -- + -- -- SP -- -- MS ++ ++ ++ + Me -- -- -- MS -- Me -- -- + -- ++ -- MS -- __ -- 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 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, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/c3.py b/campaign/event_20260520_cn/c3.py new file mode 100644 index 000000000..c390b6f22 --- /dev/null +++ b/campaign/event_20260520_cn/c3.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 +from .c1 import Config as ConfigBase + +MAP = CampaignMap('C3') +MAP.shape = 'H9' +MAP.camera_data = ['D2', 'D6', 'D7', 'E2', 'E6', 'E7'] +MAP.camera_data_spawn_point = ['D2', 'D6'] +MAP.map_data = """ + -- -- ++ -- -- ME -- -- + -- -- ++ Me Me -- -- -- + ++ ++ ++ -- -- ME -- -- + SP -- -- MS -- -- -- -- + -- -- MS -- __ Me ++ -- + SP -- -- MS -- -- 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 +""" +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, \ +A9, B9, C9, D9, E9, F9, G9, H9, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/d1.py b/campaign/event_20260520_cn/d1.py new file mode 100644 index 000000000..5573b142a --- /dev/null +++ b/campaign/event_20260520_cn/d1.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 + +MAP = CampaignMap('D1') +MAP.shape = 'I7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + -- Me -- -- -- -- -- ++ -- + ME -- ME ++ ++ -- ME ++ -- + ++ -- ++ ++ ++ Me -- ME -- + -- MS -- ME Me -- -- ++ ++ + -- -- MS -- -- __ -- MB ++ + SP -- -- MS -- Me -- -- ME + -- 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 +""" +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, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== End of generated config ===== + + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.132, 1.154) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.095, 1.115) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.063, 1.082) + + +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_20260520_cn/d2.py b/campaign/event_20260520_cn/d2.py new file mode 100644 index 000000000..84d326066 --- /dev/null +++ b/campaign/event_20260520_cn/d2.py @@ -0,0 +1,90 @@ +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 = ['D3', 'D6', 'G3', 'G6'] +MAP.camera_data_spawn_point = ['G3'] +MAP.map_data = """ + -- ++ -- -- -- -- -- ++ ++ ++ + -- ++ ME ME ++ -- MS -- -- SP + -- Me -- -- Me -- -- MS -- -- + MB -- -- -- __ -- 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/d3.py b/campaign/event_20260520_cn/d3.py new file mode 100644 index 000000000..5cba7d0e8 --- /dev/null +++ b/campaign/event_20260520_cn/d3.py @@ -0,0 +1,93 @@ +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 = 'I9' +MAP.camera_data = ['D3', 'D7', 'F3', 'F7'] +MAP.camera_data_spawn_point = ['F7', 'D7'] +MAP.map_data = """ + ++ ++ ++ -- -- -- ++ ++ ++ + -- -- ME -- -- -- ME -- -- + -- ME -- ME -- ME -- ME -- + -- ++ -- -- ++ -- -- ++ -- + ME ++ Me -- -- -- Me ++ ME + -- Me -- -- MB -- -- Me -- + -- -- MS -- MS -- MS -- -- + ++ ++ -- -- __ -- -- ++ ++ + ++ ++ -- 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 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, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + # ===== 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_20260520_cn/sp.py b/campaign/event_20260520_cn/sp.py new file mode 100644 index 000000000..71a9a5a86 --- /dev/null +++ b/campaign/event_20260520_cn/sp.py @@ -0,0 +1,105 @@ +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 = 'I10' +MAP.camera_data = ['D6', 'D8'] +MAP.camera_data_spawn_point = ['D6'] +MAP.map_data = """ + -- -- -- ++ ++ ++ -- -- -- + -- ++ -- -- -- -- -- ++ -- + -- -- -- -- -- -- -- -- -- + ++ ++ ++ -- ++ -- ++ ++ ++ + -- -- ME SP -- SP ME -- -- + -- -- -- -- __ -- -- -- -- + -- -- ME -- MS -- ME -- -- + -- -- -- MS -- MS -- -- -- + -- ++ ME -- MB -- ME ++ -- + -- -- -- ME -- ME -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 8, 'siren': 3}, + {'battle': 1}, + {'battle': 2}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5}, + {'battle': 6}, + {'battle': 7, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ +A9, B9, C9, D9, E9, F9, G9, H9, I9, \ +A10, B10, C10, D10, E10, F10, G10, H10, I10, \ + = 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 + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = False + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + STAR_REQUIRE_1 = 0 + STAR_REQUIRE_2 = 0 + STAR_REQUIRE_3 = 0 + # ===== End of generated config ===== + + MAP_IS_ONE_TIME_STAGE = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.071, 1.091) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.036, 1.055) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.006, 1.024) + + +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 4fd39b0f4..3dc51978b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1642,34 +1642,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -1934,34 +1924,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -2341,34 +2321,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -4088,34 +4058,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -4512,34 +4472,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -4936,34 +4886,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -5360,34 +5300,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { @@ -5774,34 +5704,24 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_cn": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_en": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_jp": [ - "event_20250424_cn", - "event_20201126_cn", - "event_20260417_cn" + "event_20260520_cn" ], "option_tw": [ "event_20221222_cn" ], "option_bold": [ - "event_20201126_cn", "event_20221222_cn", - "event_20250424_cn", - "event_20260417_cn" + "event_20260520_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 690eb97f5..e421bc159 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -770,6 +770,7 @@ "event_20260226_cn": "Springtide Inn Online", "event_20260326_cn": "The Vagabond’s Recruitment Plan", "event_20260417_cn": "Vacation Lane – Beachside Brilliance", + "event_20260520_cn": "Alliance Before the Hagiobull", "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 b98863229..5d2c6a480 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -770,6 +770,7 @@ "event_20260226_cn": "春色旅籠Online", "event_20260326_cn": "ワンダラー募集計画", "event_20260417_cn": "バケーションレーン・きらめく砂浜", + "event_20260520_cn": "聖印前の同盟", "raid_20200624": "特別演習超空強襲波（復刻）", "raid_20210708": "交錯する新たな波 (復刻)", "raid_20220127": "秘密事件調査", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 9a0dd5810..3286c52fd 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -770,6 +770,7 @@ "event_20260226_cn": "春满客栈Online", "event_20260326_cn": "漫游者招募计划", "event_20260417_cn": "假日航线闪耀海滨", + "event_20260520_cn": "圣印前的同盟", "raid_20200624": "复刻特别演习埃塞克斯级", "raid_20210708": "复刻穿越彼方的水线", "raid_20220127": "演习神秘事件调查", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 2fdca0af2..5150741d2 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -770,6 +770,7 @@ "event_20260226_cn": "春滿客棧Online", "event_20260326_cn": "漫遊者招募計劃", "event_20260417_cn": "假日航線閃耀海濱", + "event_20260520_cn": "Alliance Before the Hagiobull", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", From 7955a5aaad414efb0fd3bd4ff942023ffe01e2bb Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 20 May 2026 23:04:59 +0800 Subject: [PATCH 4/7] Opt: camera data in event_20260520_cn --- campaign/event_20260520_cn/a1.py | 3 ++- campaign/event_20260520_cn/a3.py | 4 ++-- campaign/event_20260520_cn/b1.py | 1 + campaign/event_20260520_cn/b3.py | 4 ++-- campaign/event_20260520_cn/c1.py | 3 ++- campaign/event_20260520_cn/c3.py | 4 ++-- campaign/event_20260520_cn/d1.py | 1 + campaign/event_20260520_cn/d3.py | 4 ++-- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/campaign/event_20260520_cn/a1.py b/campaign/event_20260520_cn/a1.py index 4282bf15d..b1bb95ea5 100644 --- a/campaign/event_20260520_cn/a1.py +++ b/campaign/event_20260520_cn/a1.py @@ -6,7 +6,7 @@ from module.logger import logger MAP = CampaignMap('A1') MAP.shape = 'I8' MAP.camera_data = ['D2', 'D6', 'F2', 'F6'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ -- -- -- SP -- SP -- -- -- -- ME ++ -- -- -- -- ME -- @@ -63,6 +63,7 @@ class Config: # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SWIPE_MULTIPLY = (1.238, 1.261) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.197, 1.219) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.162, 1.183) diff --git a/campaign/event_20260520_cn/a3.py b/campaign/event_20260520_cn/a3.py index 9bd6fcc7b..823a4f773 100644 --- a/campaign/event_20260520_cn/a3.py +++ b/campaign/event_20260520_cn/a3.py @@ -6,8 +6,8 @@ from .a1 import Config as ConfigBase MAP = CampaignMap('A3') MAP.shape = 'H9' -MAP.camera_data = ['D2', 'D6', 'D7', 'E2', 'E6', 'E7'] -MAP.camera_data_spawn_point = ['D2', 'D6'] +MAP.camera_data = ['E3', 'E5', 'E7'] +MAP.camera_data_spawn_point = ['D6'] MAP.map_data = """ -- -- ++ -- -- ME -- -- -- -- ++ Me Me -- -- -- diff --git a/campaign/event_20260520_cn/b1.py b/campaign/event_20260520_cn/b1.py index f50f96ac5..fb4dba54c 100644 --- a/campaign/event_20260520_cn/b1.py +++ b/campaign/event_20260520_cn/b1.py @@ -61,6 +61,7 @@ class Config: # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SWIPE_MULTIPLY = (1.132, 1.154) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.095, 1.115) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.063, 1.082) diff --git a/campaign/event_20260520_cn/b3.py b/campaign/event_20260520_cn/b3.py index 6c38279b6..2833dce2d 100644 --- a/campaign/event_20260520_cn/b3.py +++ b/campaign/event_20260520_cn/b3.py @@ -6,8 +6,8 @@ from .b1 import Config as ConfigBase MAP = CampaignMap('B3') MAP.shape = 'I9' -MAP.camera_data = ['D3', 'D7', 'F3', 'F7'] -MAP.camera_data_spawn_point = ['F7', 'D7'] +MAP.camera_data = ['D3', 'D5', 'D7', 'F3', 'F5', 'F7'] +MAP.camera_data_spawn_point = ['D7'] MAP.map_data = """ ++ ++ ++ -- -- -- ++ ++ ++ -- -- ME -- -- -- ME -- -- diff --git a/campaign/event_20260520_cn/c1.py b/campaign/event_20260520_cn/c1.py index b373b5a60..142b51fa6 100644 --- a/campaign/event_20260520_cn/c1.py +++ b/campaign/event_20260520_cn/c1.py @@ -6,7 +6,7 @@ from module.logger import logger MAP = CampaignMap('C1') MAP.shape = 'I8' MAP.camera_data = ['D2', 'D6', 'F2', 'F6'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ -- -- -- SP -- SP -- -- -- -- ME ++ -- -- -- -- ME -- @@ -63,6 +63,7 @@ class Config: # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SWIPE_MULTIPLY = (1.238, 1.261) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.197, 1.219) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.162, 1.183) diff --git a/campaign/event_20260520_cn/c3.py b/campaign/event_20260520_cn/c3.py index c390b6f22..edbf619d8 100644 --- a/campaign/event_20260520_cn/c3.py +++ b/campaign/event_20260520_cn/c3.py @@ -6,8 +6,8 @@ from .c1 import Config as ConfigBase MAP = CampaignMap('C3') MAP.shape = 'H9' -MAP.camera_data = ['D2', 'D6', 'D7', 'E2', 'E6', 'E7'] -MAP.camera_data_spawn_point = ['D2', 'D6'] +MAP.camera_data = ['E3', 'E5', 'E7'] +MAP.camera_data_spawn_point = ['D6'] MAP.map_data = """ -- -- ++ -- -- ME -- -- -- -- ++ Me Me -- -- -- diff --git a/campaign/event_20260520_cn/d1.py b/campaign/event_20260520_cn/d1.py index 5573b142a..0a873db80 100644 --- a/campaign/event_20260520_cn/d1.py +++ b/campaign/event_20260520_cn/d1.py @@ -61,6 +61,7 @@ class Config: # ===== End of generated config ===== MAP_SIREN_HAS_BOSS_ICON_SMALL = True + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SWIPE_MULTIPLY = (1.132, 1.154) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.095, 1.115) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.063, 1.082) diff --git a/campaign/event_20260520_cn/d3.py b/campaign/event_20260520_cn/d3.py index 5cba7d0e8..a450c4227 100644 --- a/campaign/event_20260520_cn/d3.py +++ b/campaign/event_20260520_cn/d3.py @@ -6,8 +6,8 @@ from .d1 import Config as ConfigBase MAP = CampaignMap('D3') MAP.shape = 'I9' -MAP.camera_data = ['D3', 'D7', 'F3', 'F7'] -MAP.camera_data_spawn_point = ['F7', 'D7'] +MAP.camera_data = ['D3', 'D5', 'D7', 'F3', 'F5', 'F7'] +MAP.camera_data_spawn_point = ['D7'] MAP.map_data = """ ++ ++ ++ -- -- -- ++ ++ ++ -- -- ME -- -- -- ME -- -- From d6cd9fb20dabbb3d8de7ec0a936985742b27ab9d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 21 May 2026 00:26:59 +0800 Subject: [PATCH 5/7] Fix: Handle big pillar covers map grids --- campaign/event_20260520_cn/a3.py | 13 ++++++----- campaign/event_20260520_cn/b3.py | 21 ++++++++++++++---- campaign/event_20260520_cn/c3.py | 13 ++++++----- campaign/event_20260520_cn/d3.py | 37 ++++++++++++++++++++++++++++---- 4 files changed, 66 insertions(+), 18 deletions(-) diff --git a/campaign/event_20260520_cn/a3.py b/campaign/event_20260520_cn/a3.py index 823a4f773..8d40fb339 100644 --- a/campaign/event_20260520_cn/a3.py +++ b/campaign/event_20260520_cn/a3.py @@ -8,12 +8,15 @@ MAP = CampaignMap('A3') MAP.shape = 'H9' MAP.camera_data = ['E3', 'E5', 'E7'] MAP.camera_data_spawn_point = ['D6'] +# Big pillar at G5 covering G1:H4 +# Smoke covering fleet ammo icon and current fleet indicator if fleet is at F4 +# mark covering grids as land, since we won't go there anyway MAP.map_data = """ - -- -- ++ -- -- ME -- -- - -- -- ++ Me Me -- -- -- - ++ ++ ++ -- -- ME -- -- - SP -- -- MS -- -- -- -- - -- -- MS -- __ Me ++ -- + -- -- ++ -- -- ME ++ ++ + -- -- ++ Me Me -- ++ ++ + ++ ++ ++ -- -- ME ++ ++ + SP -- -- MS -- ++ ++ ++ + -- -- MS -- __ Me ++ ++ SP -- -- MS -- -- MB -- ++ ++ ++ -- -- -- -- ME -- -- ++ -- Me -- ME -- diff --git a/campaign/event_20260520_cn/b3.py b/campaign/event_20260520_cn/b3.py index 2833dce2d..8f4beaa26 100644 --- a/campaign/event_20260520_cn/b3.py +++ b/campaign/event_20260520_cn/b3.py @@ -1,17 +1,21 @@ +from module.base.utils import location2node from module.campaign.campaign_base import CampaignBase -from module.map.map_base import CampaignMap +from module.map.map_base import CampaignMap, location_ensure from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger from .b1 import Config as ConfigBase +from .d3 import GridCurrentFleet MAP = CampaignMap('B3') MAP.shape = 'I9' MAP.camera_data = ['D3', 'D5', 'D7', 'F3', 'F5', 'F7'] MAP.camera_data_spawn_point = ['D7'] +# Big pillar at E4 covering D1:F2 +# mark covering grids as land, since we won't go there anyway MAP.map_data = """ - ++ ++ ++ -- -- -- ++ ++ ++ - -- -- ME -- -- -- ME -- -- - -- ME -- ME -- ME -- ME -- + ++ ++ ++ ++ ++ ++ ++ ++ ++ + -- -- ME ++ ++ ++ ME -- -- + -- ME -- ME ++ ME -- ME -- -- ++ -- -- ++ -- -- ++ -- ME ++ Me -- -- -- Me ++ ME -- Me -- -- MB -- -- Me -- @@ -71,6 +75,15 @@ class Config(ConfigBase): class Campaign(CampaignBase): MAP = MAP ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + grid_class = GridCurrentFleet + + def in_sight(self, location, sight=None): + # Focus E3 when insight E3, to avoid ammo icon covered by pillar + location = location_ensure(location) + node = location2node(location) + if node == 'E3': + return self.focus_to('E3') + return super().in_sight(location, sight=sight) def battle_0(self): if self.clear_siren(): diff --git a/campaign/event_20260520_cn/c3.py b/campaign/event_20260520_cn/c3.py index edbf619d8..4ce57bffd 100644 --- a/campaign/event_20260520_cn/c3.py +++ b/campaign/event_20260520_cn/c3.py @@ -8,12 +8,15 @@ MAP = CampaignMap('C3') MAP.shape = 'H9' MAP.camera_data = ['E3', 'E5', 'E7'] MAP.camera_data_spawn_point = ['D6'] +# Big pillar at G5 covering G1:H4 +# Smoke covering fleet ammo icon and current fleet indicator if fleet is at F4 +# mark covering grids as land, since we won't go there anyway MAP.map_data = """ - -- -- ++ -- -- ME -- -- - -- -- ++ Me Me -- -- -- - ++ ++ ++ -- -- ME -- -- - SP -- -- MS -- -- -- -- - -- -- MS -- __ Me ++ -- + -- -- ++ -- -- ME ++ ++ + -- -- ++ Me Me -- ++ ++ + ++ ++ ++ -- -- ME ++ ++ + SP -- -- MS -- ++ ++ ++ + -- -- MS -- __ Me ++ ++ SP -- -- MS -- -- MB -- ++ ++ ++ -- -- -- -- ME -- -- ++ -- Me -- ME -- diff --git a/campaign/event_20260520_cn/d3.py b/campaign/event_20260520_cn/d3.py index a450c4227..9dd9ef004 100644 --- a/campaign/event_20260520_cn/d3.py +++ b/campaign/event_20260520_cn/d3.py @@ -1,17 +1,22 @@ +from module.base.utils import color_similarity_2d, location2node from module.campaign.campaign_base import CampaignBase -from module.map.map_base import CampaignMap +from module.map.map_base import CampaignMap, location_ensure from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger +from module.map_detection.grid import Grid +from module.template.assets import TEMPLATE_FLEET_CURRENT from .d1 import Config as ConfigBase MAP = CampaignMap('D3') MAP.shape = 'I9' MAP.camera_data = ['D3', 'D5', 'D7', 'F3', 'F5', 'F7'] MAP.camera_data_spawn_point = ['D7'] +# Big pillar at E4 covering D1:F2 +# mark covering grids as land, since we won't go there anyway MAP.map_data = """ - ++ ++ ++ -- -- -- ++ ++ ++ - -- -- ME -- -- -- ME -- -- - -- ME -- ME -- ME -- ME -- + ++ ++ ++ ++ ++ ++ ++ ++ ++ + -- -- ME ++ ++ ++ ME -- -- + -- ME -- ME ++ ME -- ME -- -- ++ -- -- ++ -- -- ++ -- ME ++ Me -- -- -- Me ++ ME -- Me -- -- MB -- -- Me -- @@ -69,9 +74,33 @@ class Config(ConfigBase): # ===== End of generated config ===== +class GridCurrentFleet(Grid): + def predict_current_fleet(self): + # lower count threshold for D3 + count = self.relative_hsv_count(area=(-0.5, -3.5, 0.5, -2.5), h=(141 - 3, 141 + 10), shape=(50, 50)) + if count < 150: + return False + + image = self.relative_crop((-0.5, -3.5, 0.5, -2.5), shape=(60, 60)) + image = color_similarity_2d(image, color=(24, 255, 107)) + if not TEMPLATE_FLEET_CURRENT.match(image): + return False + + return True + + class Campaign(CampaignBase): MAP = MAP ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + grid_class = GridCurrentFleet + + def in_sight(self, location, sight=None): + # Focus E3 when insight E3, to avoid ammo icon covered by pillar + location = location_ensure(location) + node = location2node(location) + if node == 'E3': + return self.focus_to('E3') + return super().in_sight(location, sight=sight) def battle_0(self): if self.clear_siren(): From 4aeaf1d598846890683db69c2369222b74d1aab8 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 21 May 2026 00:35:29 +0800 Subject: [PATCH 6/7] Upd: Battle UI GildedReverie --- assets/cn/combat_ui/PAUSE_GildedReverie.png | Bin 0 -> 3613 bytes assets/cn/combat_ui/QUIT_GildedReverie.png | Bin 0 -> 6315 bytes module/combat/combat.py | 6 ++++++ module/combat_ui/assets.py | 2 ++ module/exercise/hp_daemon.py | 1 + 5 files changed, 9 insertions(+) create mode 100644 assets/cn/combat_ui/PAUSE_GildedReverie.png create mode 100644 assets/cn/combat_ui/QUIT_GildedReverie.png diff --git a/assets/cn/combat_ui/PAUSE_GildedReverie.png b/assets/cn/combat_ui/PAUSE_GildedReverie.png new file mode 100644 index 0000000000000000000000000000000000000000..b1ecbd40789cf5aa1a14ee48b04bf3e9f918ca0f GIT binary patch literal 3613 zcmeAS@N?(olHy`uVBq!ia0y~yURRFu4$T3qL<|H{?Ppcv8z~OROWIE|B<{S zp|a5HhNGC*lHc{;&-9#sBkK25X-(vg4>m^=zn{_Lc^+baZ)Uj@(82)(4gcN0Z~*PU zaWVS+p6_2~tGBnG)=aw=wcPsh*X!TwfA9WYU%w&d-tO}4{x9|A|NZQ)ua#53oZ-E= zbnnUhKYzsk|M`;tduGaeTVRN7SiJmy-KTr{@&AAHzc2f1Aan2C?|0_)zkb)xv!8vw z{q?Erl@C8IZr@+^IbHtm!?&}JH(#AA@#rtVUG0|#tM~c_F|aW(B!q9TE4oq|yTUa8 zT6chV=0@|S?+Ui|EZn~*VtGUqkKFayoB!+O-~C-@Tjb>l((vF|2KTIFpT7ptvcA`2 zva+%lI$uBA7j{})|NOc0{_C&3w$Zi5_=zVS{oc>fj|zTahXhX2=1n?B8RMdrI-1ou|2VTfkpWneh4E~?Krv#{pI zw*S{AnJ3Rbbm9B;kK3*k?6K-GoEr1m>e#-k4W})x{q+NT{DJ$0(%AhmKJv#tuReRT zGH2&@*^Vj8*33SfWcWU6|LPlJO7c@CINQe`*>ZhxrEViQsFqHd<9*gL|5#$>g-Q9` z`)@Nh#{X3*s}6Vrca0 z7hivRo}6B}Igk+)_RpT)kH|imt6HM5HU3OePpNd*`fI^ga=YgRXGPZ?U)_E7=IO6j zU03t@KVHfKa>pHs*z2u9%UJg8Dy^<9ytm8gc-f`*Ctp4l>AGC%{z7DVO^jK%VQH@S z2ZJX@*EZ}AyD%#Ol&)4sE&md|-&Xd#lXzR`ELq>m&k0*+y=&VhyaSl5e&)yp?UDMl z!((%u;gfa#u_qtjQ(MWz0}B75bEa3WKF#E4zh0iyv-HZ0pf#y>(vQBmJg~a<@k!FJ z3wvMnn*O~glmT>EUf<%!kDsT1T|eJehdthZp;_yfM$KT7=<#IJY ze@w2o(b&qjvER_Pwr-!?>gDV}t)pNx1V%$(Gz3ONU^E0qLtr!nMnhnzgn<1E>*V@E UIRV~zy&xxhy85}Sb4q9e0K#wYI{*Lx literal 0 HcmV?d00001 diff --git a/assets/cn/combat_ui/QUIT_GildedReverie.png b/assets/cn/combat_ui/QUIT_GildedReverie.png new file mode 100644 index 0000000000000000000000000000000000000000..564b395af925308b6580d94f7cd7406c448bb923 GIT binary patch literal 6315 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 Date: Thu, 21 May 2026 00:36:06 +0800 Subject: [PATCH 7/7] Fix: Handle big pillar in SP --- campaign/event_20260520_cn/sp.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/campaign/event_20260520_cn/sp.py b/campaign/event_20260520_cn/sp.py index 71a9a5a86..db571bb55 100644 --- a/campaign/event_20260520_cn/sp.py +++ b/campaign/event_20260520_cn/sp.py @@ -7,11 +7,12 @@ MAP = CampaignMap('SP') MAP.shape = 'I10' MAP.camera_data = ['D6', 'D8'] MAP.camera_data_spawn_point = ['D6'] +# Big pillar at E4, block D4 F4 to block the upper part of map MAP.map_data = """ -- -- -- ++ ++ ++ -- -- -- -- ++ -- -- -- -- -- ++ -- -- -- -- -- -- -- -- -- -- - ++ ++ ++ -- ++ -- ++ ++ ++ + ++ ++ ++ ++ ++ ++ ++ ++ ++ -- -- ME SP -- SP ME -- -- -- -- -- -- __ -- -- -- -- -- -- ME -- MS -- ME -- -- @@ -76,6 +77,9 @@ class Config: MAP_IS_ONE_TIME_STAGE = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' MAP_SWIPE_MULTIPLY = (1.071, 1.091) MAP_SWIPE_MULTIPLY_MINITOUCH = (1.036, 1.055) MAP_SWIPE_MULTIPLY_MAATOUCH = (1.006, 1.024)