Opt: always keep common cv at retirement if GemsFarming enabled

LmeSzinc · Jul 19, 2024 · 11e3580 · 11e3580
1 parent a2ebcbe
commit 11e3580
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py
@@ -400,7 +400,6 @@ def run(self, name, folder='campaign_main', mode='normal', total=0):
             total (int):
         """
         self.config.STOP_IF_REACH_LV32 = self.change_flagship
-        self.config.RETIRE_KEEP_COMMON_CV = True
 
         while 1:
             self._trigger_lv32 = False

diff --git a/module/config/config_manual.py b/module/config/config_manual.py
@@ -353,7 +353,6 @@ def SERVER(self):
     """
     DOCK_FULL_TRIGGERED = False
     GET_SHIP_TRIGGERED = False
-    RETIRE_KEEP_COMMON_CV = False
     COMMON_CV_THRESHOLD = 0.9
 
     """

diff --git a/module/retire/retirement.py b/module/retire/retirement.py
@@ -35,6 +35,10 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
     # From MapOperation
     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',)):
         """
         Args:
@@ -114,7 +118,7 @@ def _retirement_confirm(self, skip_first_screenshot=True):
                 else:
                     self.interval_clear(SHIP_CONFIRM)
             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.device.click(SHIP_CONFIRM_2)
                 self.interval_clear(GET_ITEMS_1)
@@ -171,7 +175,7 @@ def retire_ships_one_click(self):
         end = False
         total = 0
 
-        if self.config.RETIRE_KEEP_COMMON_CV:
+        if self.retire_keep_common_cv:
             self._have_kept_cv = False
 
         while 1:
@@ -246,7 +250,7 @@ def retire_ships_old(self, amount=None, rarity=None):
         self.dock_favourite_set(False)
         total = 0
 
-        if self.config.RETIRE_KEEP_COMMON_CV:
+        if self.retire_keep_common_cv:
             self._have_kept_cv = False
 
         while amount: