mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 19:33:33 +08:00
Upd: Opsi tasks
This commit is contained in:
@@ -11,10 +11,11 @@ class OpsiMeowfficerFarming(OSMap):
|
||||
Recommend 3 or 5 for higher meowfficer searching point per action points ratio.
|
||||
"""
|
||||
logger.hr(f'OS meowfficer farming, hazard_level={self.config.OpsiMeowfficerFarming_HazardLevel}', level=1)
|
||||
if self.is_cl1_enabled and self.config.OpsiMeowfficerFarming_ActionPointPreserve < 1000:
|
||||
logger.info('With CL1 leveling enabled, set action point preserve to 1000')
|
||||
self.config.OpsiMeowfficerFarming_ActionPointPreserve = 1000
|
||||
preserve = min(self.get_action_point_limit(), self.config.OpsiMeowfficerFarming_ActionPointPreserve, 2000)
|
||||
if self.is_cl1_enabled and self.config.OpsiMeowfficerFarming_ActionPointPreserve < 500:
|
||||
logger.info('With CL1 leveling enabled, set action point preserve to 500')
|
||||
self.config.OpsiMeowfficerFarming_ActionPointPreserve = 500
|
||||
preserve = min(self.get_action_point_limit(self.config.OpsiMeowfficerFarming_APPreserveUntilReset),
|
||||
self.config.OpsiMeowfficerFarming_ActionPointPreserve)
|
||||
if preserve == 0:
|
||||
self.config.override(OpsiFleet_Submarine=False)
|
||||
if self.is_cl1_enabled:
|
||||
@@ -52,7 +53,7 @@ class OpsiMeowfficerFarming(OSMap):
|
||||
# When not running CL1 and use oil
|
||||
keep_current_ap = True
|
||||
check_rest_ap = True
|
||||
if self.is_cl1_enabled and self.get_yellow_coins() >= self.config.OS_CL1_YELLOW_COINS_PRESERVE:
|
||||
if self.is_cl1_enabled and self.cl1_enough_yellow_coins:
|
||||
check_rest_ap = False
|
||||
if not self.is_cl1_enabled and self.config.OpsiGeneral_BuyActionPointLimit > 0:
|
||||
keep_current_ap = False
|
||||
@@ -68,12 +69,9 @@ class OpsiMeowfficerFarming(OSMap):
|
||||
raise RequestHumanTakeover('wrong input, task stopped')
|
||||
else:
|
||||
logger.hr(f'OS meowfficer farming, zone_id={zone.zone_id}', level=1)
|
||||
self.globe_goto(zone, refresh=True)
|
||||
self.globe_goto(zone, types='SAFE', refresh=True)
|
||||
self.fleet_set(self.config.OpsiFleet_Fleet)
|
||||
self.os_order_execute(
|
||||
recon_scan=False,
|
||||
submarine_call=self.config.OpsiFleet_Submarine)
|
||||
self.run_auto_search()
|
||||
self.run_strategic_search()
|
||||
self.handle_after_auto_search()
|
||||
self.config.check_task_switch()
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user