From 6c9678cf87613881935b30ae55cf2f6571659cd5 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Wed, 18 Oct 2023 21:28:17 +0800
Subject: [PATCH] Fix: Handle blessing randomized by curio

---
 assets/share/rogue/ui/BLESSING_LOST.png | Bin 0 -> 5743 bytes
 tasks/rogue/assets/assets_rogue_ui.py   |  10 ++++++++++
 tasks/rogue/bleesing/curio.py           |   6 +++++-
 tasks/rogue/bleesing/ui.py              |   5 +++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 assets/share/rogue/ui/BLESSING_LOST.png

diff --git a/assets/share/rogue/ui/BLESSING_LOST.png b/assets/share/rogue/ui/BLESSING_LOST.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8928391b27ac8883096223bc4c81702af143d7e
GIT binary patch
literal 5743
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
Pzy3N}`nRh!93TG=<~QK*

literal 0
HcmV?d00001

diff --git a/tasks/rogue/assets/assets_rogue_ui.py b/tasks/rogue/assets/assets_rogue_ui.py
index b07e0f751..ebd887be1 100644
--- a/tasks/rogue/assets/assets_rogue_ui.py
+++ b/tasks/rogue/assets/assets_rogue_ui.py
@@ -23,6 +23,16 @@ BLESSING_ENHANCED = ButtonWrapper(
         button=(630, 351, 651, 370),
     ),
 )
+BLESSING_LOST = ButtonWrapper(
+    name='BLESSING_LOST',
+    share=Button(
+        file='./assets/share/rogue/ui/BLESSING_LOST.png',
+        area=(51, 530, 81, 552),
+        search=(31, 510, 101, 572),
+        color=(248, 248, 248),
+        button=(51, 530, 81, 552),
+    ),
+)
 BLESSING_OBTAINED = ButtonWrapper(
     name='BLESSING_OBTAINED',
     share=Button(
diff --git a/tasks/rogue/bleesing/curio.py b/tasks/rogue/bleesing/curio.py
index abc97cd23..6da4868a8 100644
--- a/tasks/rogue/bleesing/curio.py
+++ b/tasks/rogue/bleesing/curio.py
@@ -8,7 +8,7 @@ from module.base.utils import get_color
 from module.logger import logger
 from module.ocr.ocr import Ocr, OcrResultButton
 from tasks.rogue.assets.assets_rogue_curio import CURIO_ENFORCE, OCR_ROGUE_CURIO
-from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM, BLESSING_ENHANCED, BLESSING_OBTAINED
+from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM, BLESSING_ENHANCED, BLESSING_LOST, BLESSING_OBTAINED
 from tasks.rogue.bleesing.preset import CURIO_PRESET_1
 from tasks.rogue.bleesing.selector import RogueSelector
 from tasks.rogue.bleesing.utils import get_regex_from_keyword_name, parse_name
@@ -62,6 +62,7 @@ class RogueCurioSelector(RogueSelector):
                 Case 3: is_page_choose_blessing()
                 Case 4: BLESSING_ENHANCED
                 Case 5: BLESSING_OBTAINED
+                Case 6: BLESSING_LOST
             """
             if self.main.is_in_main():
                 logger.info("Main page checked")
@@ -78,6 +79,9 @@ class RogueCurioSelector(RogueSelector):
             if self.main.appear(BLESSING_OBTAINED):
                 logger.info("BLESSING_OBTAINED checked")
                 return True
+            if self.main.appear(BLESSING_LOST):
+                logger.info("BLESSING_LOST checked")
+                return True
             return False
 
         enforce = False
diff --git a/tasks/rogue/bleesing/ui.py b/tasks/rogue/bleesing/ui.py
index ced0b7bb9..8460aacf1 100644
--- a/tasks/rogue/bleesing/ui.py
+++ b/tasks/rogue/bleesing/ui.py
@@ -76,4 +76,9 @@ class RogueUI(UI):
             logger.info(f'{BLESSING_ENHANCED} -> {BLESSING_CONFIRM}')
             self.device.click(BLESSING_CONFIRM)
             return True
+        # Lost and re-obtain blessing, randomized by curio
+        if self.appear(BLESSING_LOST, interval=2):
+            logger.info(f'{BLESSING_LOST} -> {BLESSING_CONFIRM}')
+            self.device.click(BLESSING_CONFIRM)
+            return True
         return False