From 102b7eeaf7ff0ff6e233d2b396bf5151dd71c867 Mon Sep 17 00:00:00 2001 From: ArecaSapling <115386623+sui-feng-cb@users.noreply.github.com> Date: Wed, 18 Feb 2026 09:10:41 +0800 Subject: [PATCH 01/13] Upd: blueprint purchase for DR5 & PR6 (#5518) --- module/config/argument/args.json | 6 ++++-- module/config/argument/argument.yaml | 4 ++-- module/config/config_generated.py | 4 ++-- module/config/i18n/en-US.json | 6 ++++-- module/config/i18n/ja-JP.json | 6 ++++-- module/config/i18n/zh-CN.json | 6 ++++-- module/config/i18n/zh-TW.json | 6 ++++-- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index ba6a6e53e..d54d06da8 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -7879,7 +7879,8 @@ "option": [ 2, 3, - 4 + 4, + 5 ] }, "ShipIndex": { @@ -7914,7 +7915,8 @@ 2, 3, 4, - 5 + 5, + 6 ] }, "ShipIndex": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index b0a79ab51..4cc3205db 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -541,7 +541,7 @@ CoreShop: ShipyardDr: ResearchSeries: value: 2 - option: [ 2, 3, 4 ] + option: [ 2, 3, 4, 5 ] ShipIndex: value: 0 option: [ 0, 1, 2, 3, 4, 5, 6 ] @@ -550,7 +550,7 @@ ShipyardDr: Shipyard: ResearchSeries: value: 1 - option: [ 1, 2, 3, 4, 5 ] + option: [ 1, 2, 3, 4, 5, 6 ] ShipIndex: value: 0 option: [ 0, 1, 2, 3, 4, 5, 6 ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 808993bb1..7c057779a 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -297,13 +297,13 @@ class GeneratedConfig: CoreShop_Filter = 'Array' # Group `ShipyardDr` - ShipyardDr_ResearchSeries = 2 # 2, 3, 4 + ShipyardDr_ResearchSeries = 2 # 2, 3, 4, 5 ShipyardDr_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6 ShipyardDr_BuyAmount = 2 ShipyardDr_LastRun = datetime.datetime(2020, 1, 1, 0, 0) # Group `Shipyard` - Shipyard_ResearchSeries = 1 # 1, 2, 3, 4, 5 + Shipyard_ResearchSeries = 1 # 1, 2, 3, 4, 5, 6 Shipyard_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6 Shipyard_BuyAmount = 2 Shipyard_LastRun = datetime.datetime(2020, 1, 1, 0, 0) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index adaa84ac0..3eb2b2788 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1888,7 +1888,8 @@ "help": "", "2": "DR2", "3": "DR3", - "4": "DR4" + "4": "DR4", + "5": "DR5" }, "ShipIndex": { "name": "Ship Index", @@ -1922,7 +1923,8 @@ "2": "PR2", "3": "PR3", "4": "PR4", - "5": "PR5" + "5": "PR5", + "6": "PR6" }, "ShipIndex": { "name": "Ship Index", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 9fb20cc05..c0c0e82ab 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1888,7 +1888,8 @@ "help": "ShipyardDr.ResearchSeries.help", "2": "2", "3": "3", - "4": "4" + "4": "4", + "5": "5" }, "ShipIndex": { "name": "ShipyardDr.ShipIndex.name", @@ -1922,7 +1923,8 @@ "2": "2", "3": "3", "4": "4", - "5": "5" + "5": "5", + "6": "6" }, "ShipIndex": { "name": "Shipyard.ShipIndex.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 4f94e0cc8..fe479362c 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1888,7 +1888,8 @@ "help": "", "2": "二期科研", "3": "三期科研", - "4": "四期科研" + "4": "四期科研", + "5": "五期科研" }, "ShipIndex": { "name": "舰船序号", @@ -1922,7 +1923,8 @@ "2": "二期科研", "3": "三期科研", "4": "四期科研", - "5": "五期科研" + "5": "五期科研", + "6": "六期科研" }, "ShipIndex": { "name": "舰船序号", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 10fb4caac..e04b97219 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1888,7 +1888,8 @@ "help": "", "2": "二期科研", "3": "三期科研", - "4": "四期科研" + "4": "四期科研", + "5": "五期科研" }, "ShipIndex": { "name": "艦船序號", @@ -1922,7 +1923,8 @@ "2": "二期科研", "3": "三期科研", "4": "四期科研", - "5": "五期科研" + "5": "五期科研", + "6": "六期科研" }, "ShipIndex": { "name": "艦船序號", From d99b759a08e69acac0927182e6dee243b4dc553d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 18 Feb 2026 07:37:37 +0800 Subject: [PATCH 02/13] Fix: no poor sleep in fleet_preparation_sidebar_ensure --- module/handler/auto_search.py | 58 +++++++++++++---------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/module/handler/auto_search.py b/module/handler/auto_search.py index d5d098791..48e67dfbe 100644 --- a/module/handler/auto_search.py +++ b/module/handler/auto_search.py @@ -2,6 +2,7 @@ import numpy as np from module.base.button import ButtonGrid from module.base.decorator import Config +from module.base.timer import Timer from module.handler.assets import * from module.handler.enemy_searching import EnemySearchingHandler from module.logger import logger @@ -49,21 +50,14 @@ class AutoSearchHandler(EnemySearchingHandler): origin=(1185, 155 + offset), delta=(0, 111), button_shape=(53, 104), grid_shape=(1, 3), name='FLEET_SIDEBAR') - def _fleet_preparation_sidebar_click(self, index): + def _fleet_preparation_get(self): """ - Args: - index (int): + Returns: + int: 1 for formation 2 for meowfficers 3 for auto search setting - - Returns: - bool: If changed. """ - if index <= 0 or index > 3: - logger.warning(f'Sidebar index cannot be clicked, {index}, limit to 1 through 5 only') - return False - current = 0 total = 0 sidebar = self._fleet_sidebar() @@ -81,46 +75,38 @@ class AutoSearchHandler(EnemySearchingHandler): if not current: logger.warning('No fleet sidebar active.') logger.attr('Fleet_sidebar', f'{current}/{total}') - if current == index: - return False + return current - self.device.click(sidebar[0, index - 1]) - return True - - def fleet_preparation_sidebar_ensure(self, index, skip_first_screenshot=True): + def fleet_preparation_sidebar_ensure(self, index): """ Args: index (int): 1 for formation 2 for meowfficers 3 for auto search setting - skip_first_screenshot (bool): - Returns: - bool: whether sidebar could be ensured - at most 3 attempts are made before - return False otherwise True + Returns: + bool: whether sidebar could be ensured + at most 3 attempts are made before + return False otherwise True """ if index <= 0 or index > 5: logger.warning(f'Sidebar index cannot be ensured, {index}, limit 1 through 5 only') return False - counter = 0 - while 1: - if skip_first_screenshot: - skip_first_screenshot = False - else: - self.device.screenshot() - - if self._fleet_preparation_sidebar_click(index): - if counter >= 2: - logger.warning('Sidebar could not be ensured') - return False - counter += 1 - self.device.sleep((0.3, 0.5)) - continue - else: + interval = Timer(1, count=2) + sidebar = self._fleet_sidebar() + for _ in self.loop(timeout=3): + current = self._fleet_preparation_get() + if current == index: return True + if interval.reached(): + self.device.click(sidebar[0, index - 1]) + interval.reset() + continue + else: + logger.warning('Sidebar could not be ensured') + return False def _auto_search_set_click(self, setting): """ From 74bbaf8395605888687aae789cf9e3fe9ffaf478 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 18 Feb 2026 08:57:50 +0800 Subject: [PATCH 03/13] Fix: first ui switch must be ui_ensure --- module/raid/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/raid/run.py b/module/raid/run.py index 2149b9891..d9a26050b 100644 --- a/module/raid/run.py +++ b/module/raid/run.py @@ -95,7 +95,7 @@ class RaidRun(Raid, CampaignEvent): # UI switches if not self._raid_has_oil_icon: - self.ui_goto(page_campaign_menu) + self.ui_ensure(page_campaign_menu) if self.triggered_stop_condition(oil_check=True, coin_check=True): break From 986d825a81cbf30e140ed4c443604635f096432a Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 19 Feb 2026 01:58:10 +0800 Subject: [PATCH 04/13] Fix: [EN] UI switch to page_game_room --- module/minigame/minigame.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/module/minigame/minigame.py b/module/minigame/minigame.py index 6537dc1de..7af152045 100644 --- a/module/minigame/minigame.py +++ b/module/minigame/minigame.py @@ -3,8 +3,8 @@ from module.combat.assets import GET_ITEMS_1 from module.logger import logger from module.minigame.assets import * from module.ocr.ocr import Digit -from module.ui.assets import GAME_ROOM_CHECK -from module.ui.page import page_game_room +from module.ui.assets import ACADEMY_GOTO_GAME_ROOM, GAME_ROOM_CHECK +from module.ui.page import page_academy, page_game_room from module.ui.scroll import Scroll from module.ui.ui import UI @@ -131,6 +131,7 @@ class Minigame(UI): in: page_game_room main_page/choose_game_page out: page_game_room main_page """ + logger.info('minigame go_to_main_page') while 1: if skip_first_screenshot: skip_first_screenshot = False @@ -183,8 +184,19 @@ class Minigame(UI): in: Any page out: page_game_room """ + # TEMP: 2026.02.18 separate self.ui_ensure(page_game_room) into 2 steps + # EN has different page_academy detection, to use ui_ensure(page_game_room), + # ui_goto must use `if self.ui_page_appear(page)` instead of `if self.appear(page.check_button)` + # But that would cause page_main/page_main_white clicking a static switch button + self.ui_ensure(page_academy) + # page_academy -> page_game_room + for _ in self.loop(): + if self.ui_page_appear(page_game_room): + break + if self.ui_page_appear(page_academy, interval=5): + self.device.click(ACADEMY_GOTO_GAME_ROOM) + continue - self.ui_ensure(page_game_room) # game room and choose game have same header, go to game room first self.go_to_main_page() coin_collected = False From 0a4f2a89fc230b314c5b0e5caa64b5612b9072a0 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 19 Feb 2026 02:15:25 +0800 Subject: [PATCH 05/13] Fix: handle raid remain like "915/", "1515" --- module/raid/raid.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/module/raid/raid.py b/module/raid/raid.py index 126247a9c..2d160eb8a 100644 --- a/module/raid/raid.py +++ b/module/raid/raid.py @@ -15,6 +15,15 @@ from module.ui.assets import RAID_CHECK from module.ui.page import page_rpg_stage +class RaidCounterPostMixin(DigitCounter): + def after_process(self, result): + # fix result like "915/", "1515" + result = result.strip('/') + if result.isdigit() and len(result) > 2 and result.endswith('15'): + result = f'{result[:-2]}/15' + return result + + class RaidCounter(DigitCounter): def pre_process(self, image): image = super().pre_process(image) @@ -163,7 +172,7 @@ def raid_ocr(raid, mode): if mode == 'ex': return Digit(button, letter=(255, 239, 215), threshold=128) else: - return DigitCounter(button, lang='cnocr', letter=(154, 148, 133), threshold=128) + return RaidCounterPostMixin(button, lang='cnocr', letter=(154, 148, 133), threshold=128) def pt_ocr(raid): From a538739910e044ca9cee7bb047233d95f507e52f Mon Sep 17 00:00:00 2001 From: gepotumu <116505126+gepotumu@users.noreply.github.com> Date: Thu, 19 Feb 2026 02:19:08 +0800 Subject: [PATCH 06/13] Fix: infinite loop in _handle_use_box_amount when box count insufficient (#5516) When requesting more boxes than available (e.g. requesting 8 but only 3 in stack), the amount-setting loop would never exit because the UI caps at the available count while the script keeps clicking AMOUNT_PLUS. Added click_count tracking: if multi_click() has been called 2 times without the amount reaching the target, treat it as the UI cap and break. Also changed the return value from bool to the actual amount set, so _storage_use_one_box tracks the correct number of boxes used. --- module/storage/storage.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/module/storage/storage.py b/module/storage/storage.py index a18423c6a..62be757ff 100644 --- a/module/storage/storage.py +++ b/module/storage/storage.py @@ -45,8 +45,12 @@ class StorageHandler(StorageUI): def _handle_use_box_amount(self, amount): """ + Args: + amount (int): Expected amount to set + Returns: - bool: if clicked + int: Actual amount set in the UI. + May be less than expected if not enough boxes available. Pages: in: SHOP_BUY_CONFIRM_AMOUNT @@ -84,6 +88,7 @@ class StorageHandler(StorageUI): logger.info(f'Set box amount: {amount}') skip_first = True retry = Timer(1, count=2) + click_count = 0 for _ in self.loop(): if skip_first: skip_first = False @@ -92,13 +97,19 @@ class StorageHandler(StorageUI): diff = amount - current if diff == 0: break + if click_count >= 2: + logger.warning(f'Box amount stuck at {current}, ' + f'requested {amount} but only {current} available') + break if retry.reached(): button = AMOUNT_PLUS if diff > 0 else AMOUNT_MINUS self.device.multi_click(button, n=abs(diff), interval=(0.1, 0.2)) + click_count += 1 retry.reset() - return True + logger.info(f'Box amount set to {current}') + return current def _storage_use_one_box(self, button, amount=1): """ @@ -155,10 +166,10 @@ class StorageHandler(StorageUI): # use match_template_color on BOX_AMOUNT_CONFIRM # a long animation that opens a box, will be on the top of BOX_AMOUNT_CONFIRM if self.match_template_color(BOX_AMOUNT_CONFIRM, offset=(20, 20), interval=5): - self._handle_use_box_amount(amount) + actual = self._handle_use_box_amount(amount) self.device.click(BOX_AMOUNT_CONFIRM) self.interval_reset(BOX_AMOUNT_CONFIRM) - used = amount + used = actual continue if self.appear_then_click(EQUIP_CONFIRM, offset=(20, 20), interval=5): self.interval_reset(MATERIAL_CHECK) From c014140c6e915a4e9ceb58f563e3cdd886641538 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 19 Feb 2026 03:13:43 +0800 Subject: [PATCH 07/13] Fix: [CN] Remove more dash-like characters (fixed #5522) --- module/os/map_operation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/os/map_operation.py b/module/os/map_operation.py index 1330cdfcb..1f9ea5697 100644 --- a/module/os/map_operation.py +++ b/module/os/map_operation.py @@ -47,7 +47,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle name = ocr.ocr(self.device.image) name = "".join(name.split()) name = name.lower() - name = name.strip('\\/-') + name = name.strip('\\/-—–-') if '-' in name: name = name.split('-')[0] if 'é' in name: # Méditerranée name maps @@ -80,7 +80,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For JP only ocr = Ocr(MAP_NAME, lang='jp', letter=(157, 173, 192), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) - name = name.strip('\\/-') + name = name.strip('\\/-—–-') self.is_zone_name_hidden = '安全' in name # Remove punctuations for char in '・': @@ -109,7 +109,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For TW only ocr = Ocr(MAP_NAME, lang='tw', letter=(198, 215, 239), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) - name = name.strip('\\/-') + name = name.strip('\\/-—–-') self.is_zone_name_hidden = '安全' in name # Remove '塞壬要塞海域' if '塞' in name: @@ -123,7 +123,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For CN only ocr = Ocr(MAP_NAME, lang='cnocr', letter=(214, 231, 255), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) - name = name.strip('\\/-') + name = name.strip('\\/-—–-') self.is_zone_name_hidden = '安全' in name if '-' in name: name = name.split('-')[0] From 5c7f57f3b2c9e8c0aaa87ebf34eca2d6ee72ba02 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 19 Feb 2026 10:19:42 +0800 Subject: [PATCH 08/13] Fix: patch_mimetype --- module/webui/patch.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/module/webui/patch.py b/module/webui/patch.py index 1e4d7407f..6f799d85f 100644 --- a/module/webui/patch.py +++ b/module/webui/patch.py @@ -50,20 +50,16 @@ def patch_mimetype(): all deployment, we use the builtin mimetype table only. """ import mimetypes - if mimetypes.inited: - # ohno mimetypes already inited - db = mimetypes.MimeTypes() - mimetypes._db = db - # override global variable - mimetypes.encodings_map = db.encodings_map - mimetypes.suffix_map = db.suffix_map - mimetypes.types_map = db.types_map[True] - mimetypes.common_types = db.types_map[False] - else: - # init db with the default table - db = mimetypes.MimeTypes() - mimetypes._db = db - mimetypes.inited = True + # lock as inited + mimetypes.inited = True + # create a new clean instance + db = mimetypes.MimeTypes(filenames=()) + mimetypes._db = db + # override global variable + mimetypes.encodings_map = db.encodings_map + mimetypes.suffix_map = db.suffix_map + mimetypes.types_map = db.types_map[True] + mimetypes.common_types = db.types_map[False] def fix_py37_subprocess_communicate(): From c8e8d0b2feb344e996b989bf0323b5b47365091f Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Fri, 27 Feb 2026 18:13:17 +0800 Subject: [PATCH 09/13] Add: Event Springtide Inn Online (event_20260226_cn) --- campaign/Readme.md | 1 + campaign/event_20260226_cn/a1.py | 80 ++++++++++++++++++++++++++ campaign/event_20260226_cn/a2.py | 78 +++++++++++++++++++++++++ campaign/event_20260226_cn/a3.py | 81 ++++++++++++++++++++++++++ campaign/event_20260226_cn/b1.py | 81 ++++++++++++++++++++++++++ campaign/event_20260226_cn/b2.py | 82 +++++++++++++++++++++++++++ campaign/event_20260226_cn/b3.py | 88 +++++++++++++++++++++++++++++ campaign/event_20260226_cn/c1.py | 80 ++++++++++++++++++++++++++ campaign/event_20260226_cn/c2.py | 78 +++++++++++++++++++++++++ campaign/event_20260226_cn/c3.py | 82 +++++++++++++++++++++++++++ campaign/event_20260226_cn/d1.py | 81 ++++++++++++++++++++++++++ campaign/event_20260226_cn/d2.py | 91 ++++++++++++++++++++++++++++++ campaign/event_20260226_cn/d3.py | 97 ++++++++++++++++++++++++++++++++ campaign/event_20260226_cn/sp.py | 92 ++++++++++++++++++++++++++++++ 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, 1136 insertions(+), 40 deletions(-) create mode 100644 campaign/event_20260226_cn/a1.py create mode 100644 campaign/event_20260226_cn/a2.py create mode 100644 campaign/event_20260226_cn/a3.py create mode 100644 campaign/event_20260226_cn/b1.py create mode 100644 campaign/event_20260226_cn/b2.py create mode 100644 campaign/event_20260226_cn/b3.py create mode 100644 campaign/event_20260226_cn/c1.py create mode 100644 campaign/event_20260226_cn/c2.py create mode 100644 campaign/event_20260226_cn/c3.py create mode 100644 campaign/event_20260226_cn/d1.py create mode 100644 campaign/event_20260226_cn/d2.py create mode 100644 campaign/event_20260226_cn/d3.py create mode 100644 campaign/event_20260226_cn/sp.py diff --git a/campaign/Readme.md b/campaign/Readme.md index a3701d128..2c9330b53 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -281,3 +281,4 @@ 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 new file mode 100644 index 000000000..cc3b8c59e --- /dev/null +++ b/campaign/event_20260226_cn/a1.py @@ -0,0 +1,80 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('A1') +MAP.shape = 'I8' +MAP.camera_data = ['E2', 'E6'] +MAP.camera_data_spawn_point = ['E2'] +MAP.map_data = """ + -- -- ME -- ME -- -- -- -- + -- ++ -- -- -- ME ++ ++ -- + -- ++ -- SP -- -- Me ++ -- + -- ME -- -- SP -- -- ME -- + ++ -- Me -- -- -- Me -- -- + -- ME ++ MS -- MS ++ ++ ++ + -- -- ME -- __ -- ME ++ -- + -- -- -- -- MB -- -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1, 'boss': 1}, + {'battle': 4, 'enemy': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..1729d1154 --- /dev/null +++ b/campaign/event_20260226_cn/a2.py @@ -0,0 +1,78 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .a1 import Config as ConfigBase + +MAP = CampaignMap('A2') +MAP.shape = 'J7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + -- ME -- -- ME ++ ++ -- -- -- + MB -- ME -- -- -- ++ ME ME ++ + ++ -- ++ ++ Me -- Me -- -- ++ + -- -- ++ ++ -- __ -- -- ME -- + -- MS -- -- MS -- -- ME ++ -- + ME -- -- -- -- -- ME -- -- -- + ++ -- SP SP -- ++ ++ ++ -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..9663cc010 --- /dev/null +++ b/campaign/event_20260226_cn/a3.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 .a1 import Config as ConfigBase + +MAP = CampaignMap('A3') +MAP.shape = 'H8' +MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + ++ ++ -- -- ME -- -- ME + ++ ++ MS -- -- -- ME -- + SP -- -- MS -- ++ -- -- + SP -- -- MS -- ++ ME -- + ++ Me __ -- -- -- -- -- + ++ ME -- Me ++ ++ ++ -- + -- -- -- -- Me -- ME -- + MB ++ Me ME -- ME -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ +A7, B7, C7, D7, E7, F7, G7, H7, \ +A8, B8, C8, D8, E8, F8, G8, H8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..ccf7af706 --- /dev/null +++ b/campaign/event_20260226_cn/b1.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 + +MAP = CampaignMap('B1') +MAP.shape = 'I8' +MAP.camera_data = ['D3', 'D6', 'F3', 'F6'] +MAP.camera_data_spawn_point = ['D6'] +MAP.map_data = """ + ++ -- -- -- -- -- -- -- -- + ME -- ME ++ ++ ++ -- -- ++ + -- ME -- MS -- MS -- ME ++ + -- ++ MS -- -- -- Me -- ME + -- Me -- -- SP -- -- __ Me + -- -- -- SP -- -- Me -- -- + ++ ++ Me -- -- ++ -- MB -- + ++ ++ -- ME ME ++ ME -- ME +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2, 'boss': 1}, + {'battle': 5, 'enemy': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..2e22715d4 --- /dev/null +++ b/campaign/event_20260226_cn/b2.py @@ -0,0 +1,82 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .b1 import Config as ConfigBase + +MAP = CampaignMap('B2') +MAP.shape = 'J8' +MAP.camera_data = ['D2', 'D6', 'G2', 'G6'] +MAP.camera_data_spawn_point = ['G2'] +MAP.map_data = """ + MB ++ ME ME ++ ++ ++ -- -- -- + -- -- -- -- ++ ME MS -- -- SP + -- ME ++ -- Me -- -- MS -- -- + -- -- Me -- -- __ MS -- -- SP + -- ME -- ++ -- -- -- -- -- -- + -- ++ ME -- Me -- Me ++ ++ ME + -- ME -- ME ++ -- -- ME ++ -- + -- -- -- -- ++ ME -- -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 1}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2}, + {'battle': 5, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..72a065516 --- /dev/null +++ b/campaign/event_20260226_cn/b3.py @@ -0,0 +1,88 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .b1 import Config as ConfigBase + +MAP = CampaignMap('B3') +MAP.shape = 'I10' +MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.map_data = """ + ++ ++ ++ SP -- SP ++ ++ ++ + -- -- -- -- -- -- -- -- -- + -- Me ++ -- MS -- ++ Me -- + -- Me ++ MS -- MS ++ Me -- + -- -- Me -- __ -- Me -- -- + ME -- -- -- ++ -- -- -- ME + -- ME -- ++ ++ ++ -- ME -- + ME -- -- ME -- ME -- -- ME + ++ ++ -- -- MB -- -- ++ ++ + ++ ++ -- ME -- ME -- ++ ++ +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2}, + {'battle': 5, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ +A9, B9, C9, D9, E9, F9, G9, H9, I9, \ +A10, B10, C10, D10, E10, F10, G10, H10, I10, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..ca055193c --- /dev/null +++ b/campaign/event_20260226_cn/c1.py @@ -0,0 +1,80 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('C1') +MAP.shape = 'I8' +MAP.camera_data = ['E2', 'E6'] +MAP.camera_data_spawn_point = ['E2'] +MAP.map_data = """ + -- -- ME -- ME -- -- -- -- + -- ++ -- -- -- ME ++ ++ -- + -- ++ -- SP -- -- Me ++ -- + -- ME -- -- SP -- -- ME -- + ++ -- Me -- -- -- Me -- -- + -- ME ++ MS -- MS ++ ++ ++ + -- -- ME -- __ -- ME ++ -- + -- -- -- -- MB -- -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..d4b40db5b --- /dev/null +++ b/campaign/event_20260226_cn/c2.py @@ -0,0 +1,78 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .c1 import Config as ConfigBase + +MAP = CampaignMap('C2') +MAP.shape = 'J7' +MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data_spawn_point = ['D5'] +MAP.map_data = """ + -- ME -- -- ME ++ ++ -- -- -- + MB -- ME -- -- -- ++ ME ME ++ + ++ -- ++ ++ Me -- Me -- -- ++ + -- -- ++ ++ -- __ -- -- ME -- + -- MS -- -- MS -- -- ME ++ -- + ME -- -- -- -- -- ME -- -- -- + ++ -- SP SP -- ++ ++ ++ -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..daa8d23db --- /dev/null +++ b/campaign/event_20260226_cn/c3.py @@ -0,0 +1,82 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .c1 import Config as ConfigBase + +MAP = CampaignMap('C3') +MAP.shape = 'H8' +MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + ++ ++ -- -- ME -- -- ME + ++ ++ MS -- -- -- ME -- + SP -- -- MS -- ++ -- -- + SP -- -- MS -- ++ ME -- + ++ Me __ -- -- -- -- -- + ++ ME -- Me ++ ++ ++ -- + -- -- -- -- Me -- ME -- + MB ++ Me ME -- ME -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 1}, + {'battle': 5, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ +A7, B7, C7, D7, E7, F7, G7, H7, \ +A8, B8, C8, D8, E8, F8, G8, H8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..58bf65ecc --- /dev/null +++ b/campaign/event_20260226_cn/d1.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 + +MAP = CampaignMap('D1') +MAP.shape = 'I8' +MAP.camera_data = ['D3', 'D6', 'F3', 'F6'] +MAP.camera_data_spawn_point = ['D6'] +MAP.map_data = """ + ++ -- -- -- -- -- -- -- -- + ME -- ME ++ ++ ++ -- -- ++ + -- ME -- MS -- MS -- ME ++ + -- ++ MS -- -- -- Me -- ME + -- Me -- -- SP -- -- __ Me + -- -- -- SP -- -- Me -- -- + ++ ++ Me -- -- ++ -- MB -- + ++ ++ -- ME ME ++ ME -- ME +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2}, + {'battle': 5, 'enemy': 1, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..bc86ada32 --- /dev/null +++ b/campaign/event_20260226_cn/d2.py @@ -0,0 +1,91 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .d1 import Config as ConfigBase + +MAP = CampaignMap('D2') +MAP.shape = 'J8' +MAP.camera_data = ['D2', 'D6', 'G2', 'G6'] +MAP.camera_data_spawn_point = ['G2'] +MAP.map_data = """ + MB ++ ME ME ++ ++ ++ -- -- -- + -- -- -- -- ++ ME MS -- -- SP + -- ME ++ -- Me -- -- MS -- -- + -- -- Me -- -- __ MS -- -- SP + -- ME -- ++ -- -- -- -- -- -- + -- ++ ME -- Me -- Me ++ ++ ME + -- ME -- ME ++ -- -- ME ++ -- + -- -- -- -- ++ ME -- -- -- -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2, 'siren': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2}, + {'battle': 5, 'enemy': 1}, + {'battle': 6, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..d6ab29a65 --- /dev/null +++ b/campaign/event_20260226_cn/d3.py @@ -0,0 +1,97 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger +from .d1 import Config as ConfigBase + +MAP = CampaignMap('D3') +MAP.shape = 'I10' +MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.map_data = """ + ++ ++ ++ SP -- SP ++ ++ ++ + -- -- -- -- -- -- -- -- -- + -- Me ++ -- MS -- ++ Me -- + -- Me ++ MS -- MS ++ Me -- + -- -- Me -- __ -- Me -- -- + ME -- -- -- ++ -- -- -- ME + -- ME -- ++ ++ ++ -- ME -- + ME -- -- ME -- ME -- -- ME + ++ ++ -- -- MB -- -- ++ ++ + ++ ++ -- ME -- ME -- ++ ++ +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 2}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2, 'siren': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2}, + {'battle': 5, 'enemy': 1}, + {'battle': 6, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, I1, \ +A2, B2, C2, D2, E2, F2, G2, H2, I2, \ +A3, B3, C3, D3, E3, F3, G3, H3, I3, \ +A4, B4, C4, D4, E4, F4, G4, H4, I4, \ +A5, B5, C5, D5, E5, F5, G5, H5, I5, \ +A6, B6, C6, D6, E6, F6, G6, H6, I6, \ +A7, B7, C7, D7, E7, F7, G7, H7, I7, \ +A8, B8, C8, D8, E8, F8, G8, H8, I8, \ +A9, B9, C9, D9, E9, F9, G9, H9, I9, \ +A10, B10, C10, D10, E10, F10, G10, H10, I10, \ + = MAP.flatten() + + +class Config(ConfigBase): + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = True + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 new file mode 100644 index 000000000..e6ece740c --- /dev/null +++ b/campaign/event_20260226_cn/sp.py @@ -0,0 +1,92 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('SP') +MAP.shape = 'H7' +MAP.camera_data = ['D2', 'D5', 'E2', 'E5'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + -- -- -- -- ++ -- ME -- + -- SP SP -- ++ ME -- ME + -- -- -- -- MS -- ME -- + ++ ++ ++ MS __ -- ++ ++ + -- ME -- -- -- MS -- ++ + ME -- ME -- ++ -- MB -- + -- ME -- ++ ++ ME -- ME +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 10, 'siren': 3}, + {'battle': 1}, + {'battle': 2}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5}, + {'battle': 6}, + {'battle': 7, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ +A7, B7, C7, D7, E7, F7, G7, H7, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = True + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + STAR_REQUIRE_1 = 0 + STAR_REQUIRE_2 = 0 + STAR_REQUIRE_3 = 0 + # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_HAS_MODE_SWITCH = False + STAGE_INCREASE_AB = True + MAP_WALK_USE_CURRENT_FLEET = True + MAP_IS_ONE_TIME_STAGE = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + +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 d54d06da8..fe703db49 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1636,24 +1636,24 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "display": "hide", "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -1917,23 +1917,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -2312,23 +2312,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -4035,23 +4035,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -4447,23 +4447,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -4859,23 +4859,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -5271,23 +5271,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { @@ -5673,23 +5673,23 @@ "value": "campaign_main", "option": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ], "option_cn": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_en": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_jp": [ - "event_20231221_cn" + "event_20260226_cn" ], "option_tw": [ "event_20220526_cn" ], "option_bold": [ "event_20220526_cn", - "event_20231221_cn" + "event_20260226_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 3eb2b2788..153b3f6d9 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -766,6 +766,7 @@ "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 c0c0e82ab..2de0d9a8b 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -766,6 +766,7 @@ "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 fe479362c..5af93089b 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -766,6 +766,7 @@ "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 e04b97219..7687ff8aa 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -766,6 +766,7 @@ "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", "event_20251218_cn": "響徹於天穹之音", + "event_20260226_cn": "Springtide Inn Online", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", From 07bf9d9947e4262c10aa0b41b23bf969bf55df4e Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 28 Feb 2026 03:42:17 +0800 Subject: [PATCH 10/13] Fix: Handle wrong OCR error like "I4-4" (#5532) --- module/campaign/campaign_ocr.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/module/campaign/campaign_ocr.py b/module/campaign/campaign_ocr.py index 9dc04193e..f39a29ae8 100644 --- a/module/campaign/campaign_ocr.py +++ b/module/campaign/campaign_ocr.py @@ -41,11 +41,21 @@ class CampaignOcr(ModuleBase): @staticmethod def _campaign_ocr_result_process(result): # The result will be like '7--2', because tha dash in game is '–' not '-' - result = result.lower().replace('--', '-').replace('--', '-') - if result.startswith('-'): - result = result[1:] + result = result.replace('--', '-').replace('--', '-').lstrip('-') + + # Replace wrong 'I' from results like 'I1-1', '1I-1', 'I-I', '11-I', 'I4-4', to '1' + # while keeping results like 'isp-2', 'sp1' + def replace_func(match): + segment = match.group(0) + return segment.replace('I', '1') + + result = re.sub(r'[0-9I]+-[0-9I]+', replace_func, result, count=1) + + # Convert '72' to '7-2' if len(result) == 2 and result[0].isdigit(): result = '-'.join(result) + + result = result.lower() return result @staticmethod From bd108dc35fefcb2660729e2f38156d586f0f56f4 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 28 Feb 2026 04:09:49 +0800 Subject: [PATCH 11/13] Fix: Clicking BACK_ARROW at combat loading --- module/os/fleet.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/module/os/fleet.py b/module/os/fleet.py index c39c40c3e..5dac41aa9 100644 --- a/module/os/fleet.py +++ b/module/os/fleet.py @@ -20,7 +20,7 @@ from module.os.assets import FLEET_EMP_DEBUFF, MAP_EXIT, MAP_GOTO_GLOBE, STRONGH from module.os.camera import OSCamera from module.os.map_base import OSCampaignMap from module.os_ash.ash import OSAsh -from module.os_combat.combat import Combat +from module.os_combat.combat import Combat, BATTLE_PREPARATION, SIREN_PREPARATION from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER from module.os_shop.assets import PORT_SUPPLY_CHECK from module.ui.assets import BACK_ARROW @@ -713,8 +713,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): # Re-enter boss accidentally if pause_interval.reached(): - if self.combat_appear(): - logger.info(f'combat_appear -> {BACK_ARROW}') + if self.appear(BATTLE_PREPARATION): + logger.info(f'{BATTLE_PREPARATION} -> {BACK_ARROW}') + self.device.click(BACK_ARROW) + pause_interval.reset() + continue + if self.appear(SIREN_PREPARATION, offset=(20, 20)): + logger.info(f'{SIREN_PREPARATION} -> {BACK_ARROW}') self.device.click(BACK_ARROW) pause_interval.reset() continue From bfe67e2922e79d1ddb9c8390208a16614e5f9dd7 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 28 Feb 2026 04:17:37 +0800 Subject: [PATCH 12/13] Opt: swipe multiply in event_20260226_cn --- campaign/event_20260226_cn/a1.py | 4 ++++ campaign/event_20260226_cn/a2.py | 10 +++------- campaign/event_20260226_cn/a3.py | 10 ++-------- campaign/event_20260226_cn/b1.py | 4 ++++ campaign/event_20260226_cn/b2.py | 6 ------ campaign/event_20260226_cn/b3.py | 10 ++-------- campaign/event_20260226_cn/c1.py | 4 ++++ campaign/event_20260226_cn/c2.py | 10 +++------- campaign/event_20260226_cn/c3.py | 10 ++-------- campaign/event_20260226_cn/d1.py | 4 ++++ campaign/event_20260226_cn/d2.py | 6 ------ campaign/event_20260226_cn/d3.py | 10 ++-------- campaign/event_20260226_cn/sp.py | 6 +++++- 13 files changed, 35 insertions(+), 59 deletions(-) diff --git a/campaign/event_20260226_cn/a1.py b/campaign/event_20260226_cn/a1.py index cc3b8c59e..1f30ab703 100644 --- a/campaign/event_20260226_cn/a1.py +++ b/campaign/event_20260226_cn/a1.py @@ -56,12 +56,16 @@ class Config: MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.179, 1.201) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/a2.py b/campaign/event_20260226_cn/a2.py index 1729d1154..b69f02818 100644 --- a/campaign/event_20260226_cn/a2.py +++ b/campaign/event_20260226_cn/a2.py @@ -6,7 +6,7 @@ from .a1 import Config as ConfigBase MAP = CampaignMap('A2') MAP.shape = 'J7' -MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data = ['D2', 'D5', 'E4'] MAP.camera_data_spawn_point = ['D5'] MAP.map_data = """ -- ME -- -- ME ++ ++ -- -- -- @@ -54,12 +54,8 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/a3.py b/campaign/event_20260226_cn/a3.py index 9663cc010..677b7771f 100644 --- a/campaign/event_20260226_cn/a3.py +++ b/campaign/event_20260226_cn/a3.py @@ -6,8 +6,8 @@ from .a1 import Config as ConfigBase MAP = CampaignMap('A3') MAP.shape = 'H8' -MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] -MAP.camera_data_spawn_point = ['D2'] +MAP.camera_data = ['D4', 'D6', 'E3'] +MAP.camera_data_spawn_point = ['D4'] MAP.map_data = """ ++ ++ -- -- ME -- -- ME ++ ++ MS -- -- -- ME -- @@ -57,12 +57,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b1.py b/campaign/event_20260226_cn/b1.py index ccf7af706..88095243d 100644 --- a/campaign/event_20260226_cn/b1.py +++ b/campaign/event_20260226_cn/b1.py @@ -57,12 +57,16 @@ class Config: MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.138, 1.160) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b2.py b/campaign/event_20260226_cn/b2.py index 2e22715d4..78bddb7c5 100644 --- a/campaign/event_20260226_cn/b2.py +++ b/campaign/event_20260226_cn/b2.py @@ -58,12 +58,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/b3.py b/campaign/event_20260226_cn/b3.py index 72a065516..c8032c4ee 100644 --- a/campaign/event_20260226_cn/b3.py +++ b/campaign/event_20260226_cn/b3.py @@ -6,8 +6,8 @@ from .b1 import Config as ConfigBase MAP = CampaignMap('B3') MAP.shape = 'I10' -MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ ++ ++ ++ SP -- SP ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -64,12 +64,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c1.py b/campaign/event_20260226_cn/c1.py index ca055193c..485086cd3 100644 --- a/campaign/event_20260226_cn/c1.py +++ b/campaign/event_20260226_cn/c1.py @@ -56,12 +56,16 @@ class Config: MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.179, 1.201) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c2.py b/campaign/event_20260226_cn/c2.py index d4b40db5b..7879eb122 100644 --- a/campaign/event_20260226_cn/c2.py +++ b/campaign/event_20260226_cn/c2.py @@ -6,7 +6,7 @@ from .c1 import Config as ConfigBase MAP = CampaignMap('C2') MAP.shape = 'J7' -MAP.camera_data = ['D2', 'D5', 'F2', 'F5'] +MAP.camera_data = ['D2', 'D5', 'E4'] MAP.camera_data_spawn_point = ['D5'] MAP.map_data = """ -- ME -- -- ME ++ ++ -- -- -- @@ -54,12 +54,8 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True + + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left' class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/c3.py b/campaign/event_20260226_cn/c3.py index daa8d23db..ffba35361 100644 --- a/campaign/event_20260226_cn/c3.py +++ b/campaign/event_20260226_cn/c3.py @@ -6,8 +6,8 @@ from .c1 import Config as ConfigBase MAP = CampaignMap('C3') MAP.shape = 'H8' -MAP.camera_data = ['D2', 'D6', 'E2', 'E6'] -MAP.camera_data_spawn_point = ['D2'] +MAP.camera_data = ['D4', 'D6', 'E3'] +MAP.camera_data_spawn_point = ['D4'] MAP.map_data = """ ++ ++ -- -- ME -- -- ME ++ ++ MS -- -- -- ME -- @@ -58,12 +58,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d1.py b/campaign/event_20260226_cn/d1.py index 58bf65ecc..14139ff3a 100644 --- a/campaign/event_20260226_cn/d1.py +++ b/campaign/event_20260226_cn/d1.py @@ -57,12 +57,16 @@ class Config: MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = True STAGE_INCREASE_AB = True MAP_WALK_USE_CURRENT_FLEET = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.138, 1.160) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088) class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d2.py b/campaign/event_20260226_cn/d2.py index bc86ada32..c009cb3b7 100644 --- a/campaign/event_20260226_cn/d2.py +++ b/campaign/event_20260226_cn/d2.py @@ -59,12 +59,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/d3.py b/campaign/event_20260226_cn/d3.py index d6ab29a65..cc783a8b7 100644 --- a/campaign/event_20260226_cn/d3.py +++ b/campaign/event_20260226_cn/d3.py @@ -6,8 +6,8 @@ from .d1 import Config as ConfigBase MAP = CampaignMap('D3') MAP.shape = 'I10' -MAP.camera_data = ['D2', 'D6', 'D8', 'F2', 'F6', 'F8'] -MAP.camera_data_spawn_point = ['F2', 'D2'] +MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8'] +MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ ++ ++ ++ SP -- SP ++ ++ ++ -- -- -- -- -- -- -- -- -- @@ -65,12 +65,6 @@ class Config(ConfigBase): MAP_HAS_AMBUSH = False MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_CHAPTER_SWITCH_20241219 = True - STAGE_ENTRANCE = ['half', '20240725'] - MAP_HAS_MODE_SWITCH = True - STAGE_INCREASE_AB = True - MAP_WALK_USE_CURRENT_FLEET = True - MAP_SIREN_HAS_BOSS_ICON_SMALL = True class Campaign(CampaignBase): diff --git a/campaign/event_20260226_cn/sp.py b/campaign/event_20260226_cn/sp.py index e6ece740c..0352d024f 100644 --- a/campaign/event_20260226_cn/sp.py +++ b/campaign/event_20260226_cn/sp.py @@ -5,7 +5,7 @@ from module.logger import logger MAP = CampaignMap('SP') MAP.shape = 'H7' -MAP.camera_data = ['D2', 'D5', 'E2', 'E5'] +MAP.camera_data = ['D5', 'E2', 'E5'] MAP.camera_data_spawn_point = ['D2'] MAP.map_data = """ -- -- -- -- ++ -- ME -- @@ -59,6 +59,7 @@ class Config: STAR_REQUIRE_2 = 0 STAR_REQUIRE_3 = 0 # ===== End of generated config ===== + MAP_CHAPTER_SWITCH_20241219 = True STAGE_ENTRANCE = ['half', '20240725'] MAP_HAS_MODE_SWITCH = False @@ -66,6 +67,9 @@ class Config: MAP_WALK_USE_CURRENT_FLEET = True MAP_IS_ONE_TIME_STAGE = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True + MAP_SWIPE_MULTIPLY = (1.162, 1.184) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.124, 1.145) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.091, 1.111) class Campaign(CampaignBase): From 66fa598e758c34703749db6371e08c8b4f863d6b Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 28 Feb 2026 04:29:43 +0800 Subject: [PATCH 13/13] Fix: Abyssal combat with handle_map_event (#5328) --- module/os/fleet.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/module/os/fleet.py b/module/os/fleet.py index 5dac41aa9..6d0f20bf2 100644 --- a/module/os/fleet.py +++ b/module/os/fleet.py @@ -283,6 +283,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): clicked_story = False stuck_timer = Timer(20, count=5).start() confirm_timer.reset() + + def abyssal_expected_end(): + # add handle_map_event() because OSCombat.combat_status() removes get_items + if self.handle_map_event(drop=drop): + return False + return self.is_in_map() + for _ in self.loop(skip_first=skip_first_screenshot): # Map event event = self.handle_map_event(drop=drop) @@ -347,7 +354,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): if self.combat_appear(): # Use ui_back() for testing, because there are too few abyssal loggers every month. # self.ui_back(check_button=self.is_in_map) - self.combat(expected_end=self.is_in_map, fleet_index=self.fleet_show_index, save_get_items=drop) + self.combat(expected_end=abyssal_expected_end, fleet_index=self.fleet_show_index, save_get_items=drop) confirm_timer.reset() stuck_timer.reset() result.add('event') @@ -700,6 +707,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): logger.hr('BOSS leave') # Update local view self.update_os() + self.predict() click_timer = Timer(3) pause_interval = Timer(0.5, count=1)