sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-21 13:45:34 +08:00
Code Activity

Revert "Fix: triggered_stop_condition in coalition"

Browse Source 
This reverts commit ad2c9ef5ec.
This commit is contained in:
sui-feng-cb
2025-11-26 15:10:51 +08:00
parent 36a9ca3315
commit d2f0ceef81
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/coalition/coalition.py
View File

@@ -85,8 +85,7 @@ class Coalition(CoalitionCombat, CampaignEvent):
return True return True
# Oil limit # Oil limit
if oil_check: if oil_check:
_oil = self.get_oil() if self.check_oil():
if _oil < max(500, self.config.StopCondition_OilLimit):
logger.hr('Triggered stop condition: Oil limit') logger.hr('Triggered stop condition: Oil limit')
self.config.task_delay(minute=(120, 240)) self.config.task_delay(minute=(120, 240))
return True return True
@@ -136,11 +135,12 @@ class Coalition(CoalitionCombat, CampaignEvent):
self.coalition_map_exit(event) self.coalition_map_exit(event)
raise 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) 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() self.coalition_combat()
@staticmethod @staticmethod