From 71e01d9bd832e45475fede588caa40e0228889f4 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 2 Jul 2024 01:25:59 +0800 Subject: [PATCH] Fix: Check save file before entering ornament --- .../DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE.png | Bin 0 -> 27047 bytes .../dungeon/assets/assets_dungeon_ui_rogue.py | 10 ++++++++++ tasks/ornament/combat.py | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 assets/share/dungeon/ui_rogue/DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE.png diff --git a/assets/share/dungeon/ui_rogue/DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE.png b/assets/share/dungeon/ui_rogue/DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE.png new file mode 100644 index 0000000000000000000000000000000000000000..977d2e3cc34ec2572f787376dacb4bc13edb162b GIT binary patch literal 27047 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 literal 0 HcmV?d00001 diff --git a/tasks/dungeon/assets/assets_dungeon_ui_rogue.py b/tasks/dungeon/assets/assets_dungeon_ui_rogue.py index 67deaf095..abf1ebbdf 100644 --- a/tasks/dungeon/assets/assets_dungeon_ui_rogue.py +++ b/tasks/dungeon/assets/assets_dungeon_ui_rogue.py @@ -13,6 +13,16 @@ DIVERGENT_UNIVERSE_LOADED = ButtonWrapper( button=(893, 608, 911, 628), ), ) +DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE = ButtonWrapper( + name='DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE', + share=Button( + file='./assets/share/dungeon/ui_rogue/DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE.png', + area=(437, 316, 1169, 378), + search=(417, 296, 1189, 398), + color=(197, 105, 95), + button=(437, 316, 1169, 378), + ), +) LAST_TELEPORT = ButtonWrapper( name='LAST_TELEPORT', share=Button( diff --git a/tasks/ornament/combat.py b/tasks/ornament/combat.py index d35a3b838..ee8693697 100644 --- a/tasks/ornament/combat.py +++ b/tasks/ornament/combat.py @@ -23,6 +23,23 @@ class OrnamentCombat(DungeonEvent, Combat, RouteLoader): # Different position to OCR return super().get_double_event_remain_at_combat(button) + def _dungeon_wait_until_dungeon_list_loaded(self, skip_first_screenshot=True): + # Check save file before entering + result = super()._dungeon_wait_until_dungeon_list_loaded(skip_first_screenshot) + + if self.image_color_count( + DIVERGENT_UNIVERSE_SAVE_UNAVAILABLE, + color=(195, 89, 79), threshold=221, count=1000, + ): + logger.error( + 'Divergent Universe save unavailable, ' + 'please clear Divergent Universe once before running Ornament Extraction' + ) + self.config.task_delay(server_update=True) + self.config.task_stop() + + return result + def oe_leave(self, skip_first_screenshot=True): self.interval_clear([COMBAT_PREPARE, MAP_EXIT]) logger.hr('OE leave')