From f4fdde02285df90df41dceec05bfb5bb6d05b404 Mon Sep 17 00:00:00 2001 From: silvergundam Date: Fri, 14 Mar 2025 01:38:20 +0800 Subject: [PATCH] Remove the 71 AP_preserve during OsExplore,because now 71 can't run before OsExplore finished by Lme/master(#4602) --- module/os/operation_siren.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index 4295ae137..c113f9ba7 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -430,10 +430,6 @@ class OperationSiren(OSMap): and self.config.OpsiAshBeacon_EnsureFullyCollected: logger.info('Ash beacon not fully collected, ignore action point limit temporarily') self.config.OS_ACTION_POINT_PRESERVE = 0 - preserve = deep_get(self.config.data, "OpsiMeowfficerFarming.OpsiMeowfficerFarming.ActionPointPreserve", 1000) - ap_preserve = min(self.get_action_point_limit(), max(preserve, 1000, key=int), 10000, key=int) - if self.is_in_opsi_explore(): - self.config.OS_ACTION_POINT_PRESERVE = ap_preserve logger.attr('OS_ACTION_POINT_PRESERVE', self.config.OS_ACTION_POINT_PRESERVE) IsDisableOpsiHazard1LevelingYellowCoinLimit = deep_get(self.config.data, "SomethingSpecial.TurnOffForcedOnSettings.OpsiHazard1LevelingYellowCoinLimit") @@ -453,12 +449,11 @@ class OperationSiren(OSMap): # Preset action point to 70 # When running CL1 oil is for running CL1, not meowfficer farming keep_current_ap = True - check_rest_ap = True if self.config.OpsiGeneral_BuyActionPointLimit > 0: keep_current_ap = False - if self.is_in_opsi_explore(): - check_rest_ap = False - self.action_point_set(cost=70, keep_current_ap=keep_current_ap, check_rest_ap=check_rest_ap) + self.action_point_set(cost=70, keep_current_ap=keep_current_ap, check_rest_ap=True) + preserve = deep_get(self.config.data, "OpsiMeowfficerFarming.OpsiMeowfficerFarming.ActionPointPreserve", 1000) + ap_preserve = min(self.get_action_point_limit(), max(preserve, 1000, key=int), 10000, key=int) if self._action_point_total >= (ap_preserve + 1200) \ and not IsDisableOpsiMeowfficerFarming \ and not self.is_in_opsi_explore():