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

Opt: always keep common cv at retirement if GemsFarming enabled

Browse Source
This commit is contained in:
guoh064
2024-07-09 14:36:34 +08:00
committed by LmeSzinc
parent a2ebcbef1b
commit 11e3580c61
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/campaign/gems_farming.py
View File

@@ -400,7 +400,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock):
total (int): total (int):
""" """
self.config.STOP_IF_REACH_LV32 = self.change_flagship self.config.STOP_IF_REACH_LV32 = self.change_flagship
self.config.RETIRE_KEEP_COMMON_CV = True
while 1: while 1:
self._trigger_lv32 = False self._trigger_lv32 = False

1
module/config/config_manual.py
View File

@@ -353,7 +353,6 @@ class ManualConfig:
""" """
DOCK_FULL_TRIGGERED = False DOCK_FULL_TRIGGERED = False
GET_SHIP_TRIGGERED = False GET_SHIP_TRIGGERED = False
RETIRE_KEEP_COMMON_CV = False
COMMON_CV_THRESHOLD = 0.9 COMMON_CV_THRESHOLD = 0.9
""" """

10
module/retire/retirement.py
View File

@@ -35,6 +35,10 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
# From MapOperation # From MapOperation
map_cat_attack_timer = Timer(2) map_cat_attack_timer = Timer(2)
@property
def retire_keep_common_cv(self):
return self.config.is_task_enabled('GemsFarming')
def _retirement_choose(self, amount=10, target_rarity=('N',)): def _retirement_choose(self, amount=10, target_rarity=('N',)):
""" """
Args: Args:
@@ -114,7 +118,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
else: else:
self.interval_clear(SHIP_CONFIRM) self.interval_clear(SHIP_CONFIRM)
if self.appear(SHIP_CONFIRM_2, offset=(30, 30), interval=2): if self.appear(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
if self.config.RETIRE_KEEP_COMMON_CV and not self._have_kept_cv: if self.retire_keep_common_cv and not self._have_kept_cv:
self.keep_one_common_cv() self.keep_one_common_cv()
self.device.click(SHIP_CONFIRM_2) self.device.click(SHIP_CONFIRM_2)
self.interval_clear(GET_ITEMS_1) self.interval_clear(GET_ITEMS_1)
@@ -171,7 +175,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
end = False end = False
total = 0 total = 0
if self.config.RETIRE_KEEP_COMMON_CV: if self.retire_keep_common_cv:
self._have_kept_cv = False self._have_kept_cv = False
while 1: while 1:
@@ -246,7 +250,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self.dock_favourite_set(False) self.dock_favourite_set(False)
total = 0 total = 0
if self.config.RETIRE_KEEP_COMMON_CV: if self.retire_keep_common_cv:
self._have_kept_cv = False self._have_kept_cv = False
while amount: while amount: