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

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
Show Stats 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
return True
# Oil limit
if oil_check and self.config.StopCondition_OilLimit:
if self.get_oil() < self.config.StopCondition_OilLimit:
if oil_check:
if self.get_oil() < max(500, self.config.StopCondition_OilLimit):
logger.hr('Triggered stop condition: Oil limit')
self.config.task_delay(minute=(120, 240))
return True

2
module/combat/auto_search_combat.py
View File

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

7
module/raid/raid.py
View File

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