diff --git a/campaign/event_20221222_cn/a1.py b/campaign/event_20221222_cn/a1.py index f6e980041..3b2c8f854 100644 --- a/campaign/event_20221222_cn/a1.py +++ b/campaign/event_20221222_cn/a1.py @@ -57,7 +57,7 @@ class Config: MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 33), 'width': (1.5, 10), diff --git a/campaign/event_20221222_cn/b1.py b/campaign/event_20221222_cn/b1.py index 473cad7ee..bcae61ae5 100644 --- a/campaign/event_20221222_cn/b1.py +++ b/campaign/event_20221222_cn/b1.py @@ -58,7 +58,7 @@ class Config: MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 33), 'width': (1.5, 10), diff --git a/campaign/event_20221222_cn/c1.py b/campaign/event_20221222_cn/c1.py index bc47b32db..bf5499f07 100644 --- a/campaign/event_20221222_cn/c1.py +++ b/campaign/event_20221222_cn/c1.py @@ -57,7 +57,7 @@ class Config: MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 24), 'width': (1.5, 10), diff --git a/campaign/event_20221222_cn/d1.py b/campaign/event_20221222_cn/d1.py index a08c78a5a..664def63c 100644 --- a/campaign/event_20221222_cn/d1.py +++ b/campaign/event_20221222_cn/d1.py @@ -58,7 +58,7 @@ class Config: MAP_HAS_MYSTERY = False # ===== End of generated config ===== - MAP_SIREN_HAS_BOSS_ICON = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 24), 'width': (1.5, 10), diff --git a/module/os_shop/shop.py b/module/os_shop/shop.py index a581a29a6..08271b0a3 100644 --- a/module/os_shop/shop.py +++ b/module/os_shop/shop.py @@ -1,5 +1,6 @@ from module.base.decorator import cached_property from module.base.timer import Timer +from module.combat.assets import GET_ITEMS_1 from module.config.utils import get_os_reset_remain from module.exception import GameStuckError, ScriptError from module.logger import logger @@ -23,10 +24,10 @@ class OSShop(PortShop, AkashiShop): """ success = False amount_finish = False - self.interval_clear(PORT_SUPPLY_CHECK) - self.interval_clear(SHOP_BUY_CONFIRM) - self.interval_clear(SHOP_BUY_CONFIRM_AMOUNT) - self.interval_clear(OS_SHOP_BUY_CONFIRM) + self.interval_clear([ + PORT_SUPPLY_CHECK, SHOP_BUY_CONFIRM_AMOUNT, + SHOP_BUY_CONFIRM, OS_SHOP_BUY_CONFIRM, GET_ITEMS_1 + ]) while True: if skip_first_screenshot: