diff --git a/campaign/event_20241219_cn/a1.py b/campaign/event_20241219_cn/a1.py index 78a1b1b22..9210d6a5a 100644 --- a/campaign/event_20241219_cn/a1.py +++ b/campaign/event_20241219_cn/a1.py @@ -59,6 +59,7 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_CHAPTER_SWITCH_20241219 = True + MAP_HAS_MODE_SWITCH = True MAP_HAS_MOVABLE_NORMAL_ENEMY = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True diff --git a/campaign/event_20241219_cn/b1.py b/campaign/event_20241219_cn/b1.py index 1bb2f5647..21ee7f025 100644 --- a/campaign/event_20241219_cn/b1.py +++ b/campaign/event_20241219_cn/b1.py @@ -60,6 +60,7 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_CHAPTER_SWITCH_20241219 = True + MAP_HAS_MODE_SWITCH = True MAP_HAS_MOVABLE_NORMAL_ENEMY = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True diff --git a/campaign/event_20241219_cn/b3.py b/campaign/event_20241219_cn/b3.py index 57757b55a..6df3e57c7 100644 --- a/campaign/event_20241219_cn/b3.py +++ b/campaign/event_20241219_cn/b3.py @@ -75,7 +75,7 @@ class Campaign(CampaignBase): def battle_0(self): if self.clear_siren(): return True - if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + if self.clear_enemy(sort=('weight', 'cost_2', 'cost_1')): return True return self.battle_default() diff --git a/campaign/event_20241219_cn/c1.py b/campaign/event_20241219_cn/c1.py index c1c9ec977..e920799f7 100644 --- a/campaign/event_20241219_cn/c1.py +++ b/campaign/event_20241219_cn/c1.py @@ -59,6 +59,7 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_CHAPTER_SWITCH_20241219 = True + MAP_HAS_MODE_SWITCH = True MAP_HAS_MOVABLE_NORMAL_ENEMY = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True diff --git a/campaign/event_20241219_cn/d1.py b/campaign/event_20241219_cn/d1.py index 6f4e356d7..f3262f32c 100644 --- a/campaign/event_20241219_cn/d1.py +++ b/campaign/event_20241219_cn/d1.py @@ -60,6 +60,7 @@ class Config: STAGE_ENTRANCE = ['half', '20240725'] MAP_CHAPTER_SWITCH_20241219 = True + MAP_HAS_MODE_SWITCH = True MAP_HAS_MOVABLE_NORMAL_ENEMY = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True diff --git a/campaign/event_20241219_cn/d3.py b/campaign/event_20241219_cn/d3.py index 177658e72..cf5cf8d2e 100644 --- a/campaign/event_20241219_cn/d3.py +++ b/campaign/event_20241219_cn/d3.py @@ -25,11 +25,11 @@ 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 10 50 50 50 50 50 50 50 50 + 50 50 10 10 10 10 10 50 50 50 50 + 50 50 10 10 10 10 10 50 50 50 50 + 50 50 10 10 10 10 10 50 50 50 50 + 50 50 10 10 10 10 10 50 50 50 50 """ MAP.spawn_data = [ {'battle': 0, 'enemy': 2, 'siren': 2}, @@ -76,7 +76,7 @@ class Campaign(CampaignBase): def battle_0(self): if self.clear_siren(): return True - if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): + if self.clear_enemy(sort=('weight', 'cost_2', 'cost_1')): return True return self.battle_default() @@ -84,7 +84,7 @@ class Campaign(CampaignBase): def battle_5(self): if self.clear_siren(): return True - if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + if self.clear_enemy(sort=('weight', 'cost_2', 'cost_1')): return True return self.battle_default() diff --git a/module/campaign/campaign_ui.py b/module/campaign/campaign_ui.py index 38582d37d..32e424b16 100644 --- a/module/campaign/campaign_ui.py +++ b/module/campaign/campaign_ui.py @@ -197,7 +197,7 @@ class CampaignUI(MapOperation, CampaignEvent, CampaignOcr): Button: """ entrance_name = name - if self.config.MAP_HAS_MODE_SWITCH or self.config.MAP_CHAPTER_SWITCH_20241219: + if self.config.MAP_HAS_MODE_SWITCH: for mode_name in self.campaign_get_mode_names(name): if mode_name in self.stage_entrance: name = mode_name diff --git a/module/map/map_operation.py b/module/map/map_operation.py index 2fae8cd76..4a9de599a 100644 --- a/module/map/map_operation.py +++ b/module/map/map_operation.py @@ -265,7 +265,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand bool: If map mode satisfied Always True if map doesn't have mode switch in map preparation """ - if not self.config.MAP_HAS_MODE_SWITCH and not self.config.MAP_CHAPTER_SWITCH_20241219: + if not self.config.MAP_HAS_MODE_SWITCH: return True if mode == 'normal':