1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 18:19:26 +08:00

Remove the 71 AP_preserve during OsExplore,because now 71 can't run before OsExplore finished by Lme/master(#4602)

This commit is contained in:
silvergundam
2025-03-14 01:38:20 +08:00
parent b82b79988d
commit f4fdde0228

View File

@@ -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():