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

Opt: Remove OpsiAshBeacon.AshAttack since it should always be True

Browse Source
This commit is contained in:
LmeSzinc
2023-02-17 23:50:01 +08:00
parent 7261235cc4
commit f5f093c67f
19 changed files with 70 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/map.py
View File

@@ -398,7 +398,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
"""
remain = get_os_reset_remain()
if remain <= 0:
if self.config.cross_get('OpsiCrossMonth.Scheduler.Enable', default=False):
if self.config.is_task_enabled('OpsiCrossMonth'):
logger.info('Just less than 1 day to OpSi reset, OpsiCrossMonth is enabled'
'set OpsiMeowfficerFarming.ActionPointPreserve to 300 temporarily')
return 300
@@ -575,7 +575,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
# Continue if was Auto search interrupted by ash popup
# Break if zone cleared
if self.config.OpsiAshBeacon_AshAttack:
if self.config.is_task_enabled('OpsiAshBeacon'):
if self.handle_ash_beacon_attack() or self.ash_popup_canceled:
strategic = False
continue

6
module/os/operation_siren.py
View File

@@ -317,7 +317,7 @@ class OperationSiren(OSMap):
ap_checked = False
while 1:
self.config.OS_ACTION_POINT_PRESERVE = preserve
if self.config.OpsiAshBeacon_AshAttack \
if self.config.is_task_enabled('OpsiAshBeacon') \
and not self._ash_fully_collected \
and self.config.OpsiAshBeacon_EnsureFullyCollected:
logger.info('Ash beacon not fully collected, ignore action point limit temporarily')
@@ -376,12 +376,12 @@ class OperationSiren(OSMap):
OpsiGeneral_DoRandomMapEvent=True,
OpsiGeneral_AkashiShopFilter='ActionPoint',
)
if not self.config.cross_get(keys='OpsiMeowfficerFarming.Scheduler.Enable', default=False):
if not self.config.is_task_enabled('OpsiMeowfficerFarming'):
self.config.cross_set(keys='OpsiMeowfficerFarming.Scheduler.Enable', value=True)
while 1:
# Limited action point preserve of hazard 1 to 200
self.config.OS_ACTION_POINT_PRESERVE = 200
if self.config.OpsiAshBeacon_AshAttack \
if self.config.is_task_enabled('OpsiAshBeacon') \
and not self._ash_fully_collected \
and self.config.OpsiAshBeacon_EnsureFullyCollected:
logger.info('Ash beacon not fully collected, ignore action point limit temporarily')