From 8cab5e0626c05904eb5a5cb6f68f69931f88656f Mon Sep 17 00:00:00 2001
From: Hengyu <h3ngyu@gmail.com>
Date: Thu, 21 Dec 2023 01:51:59 +0800
Subject: [PATCH] Fix: change to match template on detecting whether curio is
 selected

---
 assets/share/rogue/curio/CURIO_SELECTED.png | Bin 0 -> 6395 bytes
 tasks/rogue/assets/assets_rogue_curio.py    |  10 ++++++++++
 tasks/rogue/blessing/curio.py               |   7 ++++---
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 assets/share/rogue/curio/CURIO_SELECTED.png

diff --git a/assets/share/rogue/curio/CURIO_SELECTED.png b/assets/share/rogue/curio/CURIO_SELECTED.png
new file mode 100644
index 0000000000000000000000000000000000000000..d10f1b19bbc59f8aecf5006e55bc1ce89a732697
GIT binary patch
literal 6395
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
JTF2$t{{Rb|Sa1LU

literal 0
HcmV?d00001

diff --git a/tasks/rogue/assets/assets_rogue_curio.py b/tasks/rogue/assets/assets_rogue_curio.py
index 115214bd4..44bad1b09 100644
--- a/tasks/rogue/assets/assets_rogue_curio.py
+++ b/tasks/rogue/assets/assets_rogue_curio.py
@@ -13,6 +13,16 @@ CURIO_ENFORCE = ButtonWrapper(
         button=(465, 114, 815, 545),
     ),
 )
+CURIO_SELECTED = ButtonWrapper(
+    name='CURIO_SELECTED',
+    share=Button(
+        file='./assets/share/rogue/curio/CURIO_SELECTED.png',
+        area=(1024, 116, 1040, 134),
+        search=(1004, 96, 1060, 154),
+        color=(127, 117, 110),
+        button=(1024, 116, 1040, 134),
+    ),
+)
 OCR_ROGUE_CURIO = ButtonWrapper(
     name='OCR_ROGUE_CURIO',
     share=Button(
diff --git a/tasks/rogue/blessing/curio.py b/tasks/rogue/blessing/curio.py
index 9fd297174..273dec1d0 100644
--- a/tasks/rogue/blessing/curio.py
+++ b/tasks/rogue/blessing/curio.py
@@ -4,10 +4,10 @@ import numpy as np
 
 from module.base.filter import MultiLangFilter
 from module.base.timer import Timer
-from module.base.utils import get_color
+from module.base.utils import area_offset, area_pad
 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_curio import CURIO_ENFORCE, OCR_ROGUE_CURIO, CURIO_SELECTED
 from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM, BLESSING_ENHANCED, BLESSING_LOST, BLESSING_OBTAINED
 from tasks.rogue.blessing.preset import CURIO_PRESET
 from tasks.rogue.blessing.selector import RogueSelector
@@ -53,7 +53,8 @@ class RogueCurioSelector(RogueSelector):
 
     def ui_select(self, target: OcrResultButton | None, skip_first_screenshot=True):
         def is_curio_selected():
-            return np.mean(get_color(self.main.device.image, tuple(target.area))) > 60  # shiny background
+            CURIO_SELECTED.matched_button.search = area_pad(area_offset(target.area, (0, -50)), -50)
+            return self.main.appear(CURIO_SELECTED)
 
         def is_select_curio_complete():
             """