diff --git a/campaign/event_20211125_cn/campaign_base.py b/campaign/event_20211125_cn/campaign_base.py index e515c94bc..cd76cc861 100644 --- a/campaign/event_20211125_cn/campaign_base.py +++ b/campaign/event_20211125_cn/campaign_base.py @@ -6,6 +6,11 @@ MASK_MAP_UI_20211125 = Mask(file='./assets/mask/MASK_MAP_UI_20211125.png') class CampaignBase(CampaignBase_): + STAGE_INCREASE = [ + 'T1 > T2 > T3 > T4', + 'TSS1 > TSS2 > TSS3 > TSS4 > TSS5', + ] + def map_data_init(self, map_): super().map_data_init(map_) # Patch ui_mask, get rid of map mechanism diff --git a/campaign/event_20211125_cn/tss1.py b/campaign/event_20211125_cn/tss1.py index 751a72ce6..ad7244b4d 100644 --- a/campaign/event_20211125_cn/tss1.py +++ b/campaign/event_20211125_cn/tss1.py @@ -56,11 +56,5 @@ 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_filter_enemy(self.ENEMY_FILTER, preserve=0): - return True - - return self.battle_default() - def battle_0(self): return self.clear_boss() \ No newline at end of file diff --git a/campaign/event_20211125_cn/tss2.py b/campaign/event_20211125_cn/tss2.py index c1e6bcf7b..546c8356e 100644 --- a/campaign/event_20211125_cn/tss2.py +++ b/campaign/event_20211125_cn/tss2.py @@ -51,11 +51,5 @@ 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_filter_enemy(self.ENEMY_FILTER, preserve=0): - return True - - return self.battle_default() - def battle_0(self): return self.clear_boss() \ No newline at end of file diff --git a/campaign/event_20211125_cn/tss3.py b/campaign/event_20211125_cn/tss3.py index c5ff7ad35..770521a9d 100644 --- a/campaign/event_20211125_cn/tss3.py +++ b/campaign/event_20211125_cn/tss3.py @@ -51,11 +51,5 @@ 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_filter_enemy(self.ENEMY_FILTER, preserve=0): - return True - - return self.battle_default() - def battle_0(self): return self.clear_boss() \ No newline at end of file diff --git a/campaign/event_20211125_cn/tss4.py b/campaign/event_20211125_cn/tss4.py index 627217aa1..56435f5f2 100644 --- a/campaign/event_20211125_cn/tss4.py +++ b/campaign/event_20211125_cn/tss4.py @@ -57,11 +57,5 @@ 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_filter_enemy(self.ENEMY_FILTER, preserve=0): - return True - - return self.battle_default() - def battle_0(self): return self.clear_boss() \ No newline at end of file diff --git a/campaign/event_20211125_cn/tss5.py b/campaign/event_20211125_cn/tss5.py index e67102632..e8ebd42e9 100644 --- a/campaign/event_20211125_cn/tss5.py +++ b/campaign/event_20211125_cn/tss5.py @@ -57,11 +57,5 @@ 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_filter_enemy(self.ENEMY_FILTER, preserve=0): - return True - - return self.battle_default() - def battle_0(self): return self.clear_boss() \ No newline at end of file diff --git a/module/campaign/run.py b/module/campaign/run.py index 12f274a48..95eff2d7d 100644 --- a/module/campaign/run.py +++ b/module/campaign/run.py @@ -239,6 +239,16 @@ class CampaignRun(CampaignEvent): logger.info(f'When running chapter TH of event_20221124_cn, ' f'StopCondition.MapAchievement is forced set to threat_safe') self.config.override(StopCondition_MapAchievement='threat_safe') + # event_20211125_cn, TSS maps are on time maps + if folder == 'event_20211125_cn' and 'tss' in name: + self.config.override( + StopCondition_OilLimit=0, # No oil cost + StopCondition_MapAchievement='100_percent_clear', + StopCondition_StageIncrease=True, + Emotion_Mode='ignore', # No emotion cost + Fleet_Fleet2=0, # Has only one fleet + Submarine_Fleet=0, # No submarine + ) # Stage loop for alias, stages in self.config.STAGE_LOOP_ALIAS.items(): alias_folder, alias = alias