sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Compare commits

base: sui_feng:a1342048bc2c21347bfd89d5cd72ec6f90e35074
Branches Tags
sui_feng:master
sui_feng:dev
sui_feng:island
sui_feng:shipyard
sui_feng:event_update
sui_feng:logger_unlock_use
sui_feng:war_archives_update
sui_feng:island_project
sui_feng:15-1
...
compare: sui_feng:45cf1c62aed7049890c3b8f7f351bc71429a3792
Branches Tags
sui_feng:dev
sui_feng:master
sui_feng:island
sui_feng:shipyard
sui_feng:event_update
sui_feng:logger_unlock_use
sui_feng:war_archives_update
sui_feng:island_project
sui_feng:15-1

1 Commits
a1342048bc ... 45cf1c62ae

Author SHA1 Message Date
sui-feng-cb
45cf1c62ae Fix: oil_check never triggerred due to opposite coalition_has_oil_icon conditions 2026-01-23 17:22:54 +08:00
1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
module/coalition/coalition.py
View File

@ -97,7 +97,7 @@ class Coalition(CoalitionCombat, CampaignEvent):
self.config.Scheduler_Enable = False self.config.Scheduler_Enable = False
return True return True
# Oil limit # Oil limit
if oil_check and self._coalition_has_oil_icon: if oil_check:
if self.get_oil() < max(500, self.config.StopCondition_OilLimit): if self.get_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))
@ -147,7 +147,7 @@ class Coalition(CoalitionCombat, CampaignEvent):
self.coalition_map_exit(event) self.coalition_map_exit(event)
raise raise
if self.triggered_stop_condition(oil_check=True): if self._coalition_has_oil_icon and self.triggered_stop_condition(oil_check=True):
self.coalition_map_exit(event) self.coalition_map_exit(event)
raise ScriptEnd raise ScriptEnd