diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png new file mode 100644 index 000000000..1deb1e701 Binary files /dev/null and b/assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.SEARCH.png similarity index 100% rename from assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png rename to assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.SEARCH.png diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png similarity index 100% rename from assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png rename to assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png diff --git a/tasks/dungeon/assets/assets_dungeon_ui.py b/tasks/dungeon/assets/assets_dungeon_ui.py index 77c5fe3e6..87d79d6f7 100644 --- a/tasks/dungeon/assets/assets_dungeon_ui.py +++ b/tasks/dungeon/assets/assets_dungeon_ui.py @@ -143,10 +143,20 @@ SURVIVAL_INDEX_CLICK = ButtonWrapper( button=(332, 94, 370, 133), ), ) -SURVIVAL_INDEX_LOADED = ButtonWrapper( - name='SURVIVAL_INDEX_LOADED', +SURVIVAL_INDEX_OE_LOADED = ButtonWrapper( + name='SURVIVAL_INDEX_OE_LOADED', share=Button( - file='./assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png', + file='./assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png', + area=(473, 207, 498, 232), + search=(453, 187, 518, 252), + color=(185, 135, 74), + button=(473, 207, 498, 232), + ), +) +SURVIVAL_INDEX_SU_LOADED = ButtonWrapper( + name='SURVIVAL_INDEX_SU_LOADED', + share=Button( + file='./assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png', area=(451, 286, 476, 302), search=(449, 263, 489, 356), color=(142, 150, 197), diff --git a/tasks/dungeon/ui.py b/tasks/dungeon/ui.py index 571771f00..177ccc6bf 100644 --- a/tasks/dungeon/ui.py +++ b/tasks/dungeon/ui.py @@ -296,8 +296,11 @@ class DungeonUI(DungeonState): if timeout.reached(): logger.warning('Wait survival index loaded timeout') return False - if self.appear(SURVIVAL_INDEX_LOADED): - logger.info('Survival index loaded') + if self.appear(SURVIVAL_INDEX_SU_LOADED): + logger.info('Survival index loaded, SURVIVAL_INDEX_SU_LOADED') + return True + if self.appear(SURVIVAL_INDEX_OE_LOADED): + logger.info('Survival index loaded, SURVIVAL_INDEX_OE_LOADED') return True def _dungeon_wait_treasures_lightward_loaded(self, skip_first_screenshot=True): @@ -703,7 +706,7 @@ class DungeonUI(DungeonState): self._rogue_teleport() """ self.dungeon_tab_goto(KEYWORDS_DUNGEON_TAB.Survival_Index) - if self.appear(SURVIVAL_INDEX_LOADED): + if self.appear(SURVIVAL_INDEX_SU_LOADED): logger.info('Already at nav Simulated_Universe') else: self._dungeon_nav_goto(KEYWORDS_DUNGEON_NAV.Simulated_Universe)