sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-15 14:42:26 +08:00
Code Activity

Fix: Oil limit too low

Browse Source
This commit is contained in:
LmeSzinc
2022-11-29 21:15:51 +08:00
parent a0526c74e5
commit 59183aeff1
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/campaign/run.py
View File

@@ -81,8 +81,8 @@ class CampaignRun(CampaignEvent):
self.config.Scheduler_Enable = False self.config.Scheduler_Enable = False
return True return True
# Oil limit # Oil limit
if oil_check and self.config.StopCondition_OilLimit: if oil_check:
if self.get_oil() < 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))
return True return True

2
module/combat/auto_search_combat.py
View File

@@ -101,7 +101,7 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
if oil == 0: if oil == 0:
logger.warning('Oil not found') logger.warning('Oil not found')
else: else:
if oil < self.config.StopCondition_OilLimit: if oil < max(500, self.config.StopCondition_OilLimit):
logger.info('Reach oil limit') logger.info('Reach oil limit')
self.auto_search_oil_limit_triggered = True self.auto_search_oil_limit_triggered = True
else: else:

3
module/raid/raid.py
View File

@@ -137,8 +137,7 @@ class Raid(MapOperation, Combat, CampaignEvent):
@run_once @run_once
def check_oil(): def check_oil():
if self.config.StopCondition_OilLimit: if self.get_oil() < max(500, self.config.StopCondition_OilLimit):
if self.get_oil() < self.config.StopCondition_OilLimit:
logger.hr('Triggered oil limit') logger.hr('Triggered oil limit')
raise OilExhausted raise OilExhausted