From d2f0ceef81fa301719402b64270e9a3ecfc22763 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Wed, 26 Nov 2025 15:10:51 +0800 Subject: [PATCH] Revert "Fix: triggered_stop_condition in coalition" This reverts commit ad2c9ef5ec414e508c6ce8a3bbefa2fc9ef1a84a. --- module/coalition/coalition.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/coalition/coalition.py b/module/coalition/coalition.py index cddcdc085..9e98fe296 100644 --- a/module/coalition/coalition.py +++ b/module/coalition/coalition.py @@ -85,8 +85,7 @@ class Coalition(CoalitionCombat, CampaignEvent): return True # Oil limit if oil_check: - _oil = self.get_oil() - if _oil < max(500, self.config.StopCondition_OilLimit): + if self.check_oil(): logger.hr('Triggered stop condition: Oil limit') self.config.task_delay(minute=(120, 240)) return True @@ -136,11 +135,12 @@ class Coalition(CoalitionCombat, CampaignEvent): self.coalition_map_exit(event) raise - oil_check_boolean = True if self.config.SERVER not in ['tw'] else False - if self.triggered_stop_condition(oil_check=oil_check_boolean): - self.coalition_map_exit(event) - raise ScriptEnd + self.enter_map(event=event, stage=stage, mode=fleet, map_mode=map_mode) + oil_check_boolean = True if self.config.SERVER not in ['tw'] else False + # if self.triggered_stop_condition(oil_check=oil_check_boolean): + # self.coalition_map_exit(event) + # raise ScriptEnd self.coalition_combat() @staticmethod