LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:49:25 +08:00
Code Activity

Merge remote-tracking branch 'LmeSzinc/master' into refactor

Browse Source 
# Conflicts:
#	module/config/argument/args.json
#	module/shop/shop_reward.py
This commit is contained in:
0O0o0oOoO00
2025-10-16 23:04:57 +08:00
parent 5f7878420f d91abd8470
commit d1256f3866
69 changed files with 735 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/os/operation_siren.py
View File

@@ -13,7 +13,7 @@ from module.map.map_grids import SelectedGrids
from module.os.fleet import BossFleet
from module.os.globe_operation import OSExploreError
from module.os.map import OSMap
from module.os_handler.action_point import OCR_OS_ADAPTABILITY, ActionPointLimit
from module.os_handler.action_point import OCR_OS_ADAPTABILITY
from module.os_handler.assets import OS_MONTHBOSS_NORMAL, OS_MONTHBOSS_HARD, EXCHANGE_CHECK, EXCHANGE_ENTER
from module.os_shop.assets import OS_SHOP_CHECK
from module.shop.shop_voucher import VoucherShop
@@ -358,18 +358,11 @@ class OperationSiren(OSMap):
# When not running CL1 and use oil
keep_current_ap = True
check_rest_ap = True
if not self.is_cl1_enabled and self.config.OpsiGeneral_BuyActionPointLimit > 0:
keep_current_ap = False
if self.is_cl1_enabled and self.get_yellow_coins() >= self.config.OS_CL1_YELLOW_COINS_PRESERVE:
check_rest_ap = False
try:
self.action_point_set(cost=0, keep_current_ap=keep_current_ap, check_rest_ap=check_rest_ap)
except ActionPointLimit:
self.config.task_delay(server_update=True)
self.config.task_call('OpsiHazard1Leveling')
self.config.task_stop()
else:
self.action_point_set(cost=0, keep_current_ap=keep_current_ap, check_rest_ap=check_rest_ap)
if not self.is_cl1_enabled and self.config.OpsiGeneral_BuyActionPointLimit > 0:
keep_current_ap = False
self.action_point_set(cost=0, keep_current_ap=keep_current_ap, check_rest_ap=check_rest_ap)
ap_checked = True
# (1252, 1012) is the coordinate of zone 134 (the center zone) in os_globe_map.png