From 3a372146de2b2941ba8c184a11c2b102ba5e820a Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Mon, 24 Jul 2023 23:53:59 +0800
Subject: [PATCH] Fix: Handle default state of SALVAGE button

---
 .../share/item/relics/FIRST_RELIC_SELECTED.png   | Bin 0 -> 6564 bytes
 tasks/item/assets/assets_item_relics.py          |  10 ++++++++++
 tasks/item/relics.py                             |  10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 assets/share/item/relics/FIRST_RELIC_SELECTED.png

diff --git a/assets/share/item/relics/FIRST_RELIC_SELECTED.png b/assets/share/item/relics/FIRST_RELIC_SELECTED.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39d0c3b27cbe7d62634863b7e88f633a352b507
GIT binary patch
literal 6564
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
YfO{*X+|1gS|G%)ZqWY5>dGpZ!14vZ4<p2Nx

literal 0
HcmV?d00001

diff --git a/tasks/item/assets/assets_item_relics.py b/tasks/item/assets/assets_item_relics.py
index 4a74732bc..d4060b601 100644
--- a/tasks/item/assets/assets_item_relics.py
+++ b/tasks/item/assets/assets_item_relics.py
@@ -13,6 +13,16 @@ FIRST_RELIC = ButtonWrapper(
         button=(434, 160, 530, 260),
     ),
 )
+FIRST_RELIC_SELECTED = ButtonWrapper(
+    name='FIRST_RELIC_SELECTED',
+    share=Button(
+        file='./assets/share/item/relics/FIRST_RELIC_SELECTED.png',
+        area=(424, 136, 452, 164),
+        search=(404, 116, 472, 184),
+        color=(193, 194, 198),
+        button=(424, 136, 452, 164),
+    ),
+)
 GOTO_SALVAGE = ButtonWrapper(
     name='GOTO_SALVAGE',
     share=Button(
diff --git a/tasks/item/relics.py b/tasks/item/relics.py
index 0f10852a2..2c72b905a 100644
--- a/tasks/item/relics.py
+++ b/tasks/item/relics.py
@@ -21,6 +21,7 @@ class RelicsUI(ItemUI):
                 self.device.screenshot()
 
             if self._is_in_salvage():
+                logger.info('_is_in_salvage')
                 break
             if self.appear_then_click(GOTO_SALVAGE, interval=2):
                 continue
@@ -33,11 +34,16 @@ class RelicsUI(ItemUI):
             else:
                 self.device.screenshot()
 
-            if SALVAGE.match_template_color(self.device.image):
+            # The first frame entering relic page, SALVAGE is a white button as it's the default state.
+            # At the second frame, SALVAGE is disabled since no items are selected.
+            # So here uses the minus button on the first relic.
+            if self.image_color_count(FIRST_RELIC_SELECTED, color=(245, 245, 245), threshold=221, count=50):
+                logger.info('First relic selected')
                 break
             if self.appear_then_click(ORDER_DESCENDING, interval=2):
                 continue
-            if interval.reached() and self.image_color_count(FIRST_RELIC, (233, 192, 108)):
+            if interval.reached() and self.appear(ORDER_ASCENDING) \
+                    and self.image_color_count(FIRST_RELIC, (233, 192, 108)):
                 self.device.click(FIRST_RELIC)
                 interval.reset()
                 continue