From 1450e158f530be17c90d7233963a5bf13b90f99f Mon Sep 17 00:00:00 2001
From: aeon0 <aeon4@pm.me>
Date: Thu, 2 Dec 2021 11:41:00 +0100
Subject: [PATCH] Fix NPC highlighted action btn (#175)

---
 .../resurrect.png}                            | Bin
 assets/npc/action_btn/resurrect_blue.png      | Bin 0 -> 3925 bytes
 .../trade_btn.png => action_btn/trade.png}    | Bin
 assets/npc/action_btn/trade_blue.png          | Bin 0 -> 1927 bytes
 .../trade_repair.png}                         | Bin
 assets/npc/action_btn/trade_repair_blue.png   | Bin 0 -> 3447 bytes
 src/npc_manager.py                            |  37 ++++++++++++++----
 src/template_finder.py                        |  11 ++++--
 8 files changed, 36 insertions(+), 12 deletions(-)
 rename assets/npc/{qual_kehk/resurrect_btn.png => action_btn/resurrect.png} (100%)
 create mode 100644 assets/npc/action_btn/resurrect_blue.png
 rename assets/npc/{anya/trade_btn.png => action_btn/trade.png} (100%)
 create mode 100644 assets/npc/action_btn/trade_blue.png
 rename assets/npc/{larzuk/trade_repair_btn.png => action_btn/trade_repair.png} (100%)
 create mode 100644 assets/npc/action_btn/trade_repair_blue.png

diff --git a/assets/npc/qual_kehk/resurrect_btn.png b/assets/npc/action_btn/resurrect.png
similarity index 100%
rename from assets/npc/qual_kehk/resurrect_btn.png
rename to assets/npc/action_btn/resurrect.png
diff --git a/assets/npc/action_btn/resurrect_blue.png b/assets/npc/action_btn/resurrect_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5183714960570c54b5f519a4801f4c38fe397ea
GIT binary patch
literal 3925
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

literal 0
HcmV?d00001

diff --git a/assets/npc/anya/trade_btn.png b/assets/npc/action_btn/trade.png
similarity index 100%
rename from assets/npc/anya/trade_btn.png
rename to assets/npc/action_btn/trade.png
diff --git a/assets/npc/action_btn/trade_blue.png b/assets/npc/action_btn/trade_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..f49b9b3d8684c9b1be7b15569aef5a0f9fcd9614
GIT binary patch
literal 1927
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
N002ovPDHLkV1m<_rQ!ep

literal 0
HcmV?d00001

diff --git a/assets/npc/larzuk/trade_repair_btn.png b/assets/npc/action_btn/trade_repair.png
similarity index 100%
rename from assets/npc/larzuk/trade_repair_btn.png
rename to assets/npc/action_btn/trade_repair.png
diff --git a/assets/npc/action_btn/trade_repair_blue.png b/assets/npc/action_btn/trade_repair_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..a801a6e892baf380065ae66293e5849f804b7914
GIT binary patch
literal 3447
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
Z`!69J1oiD4g=GK$002ovPDHLkV1i^zn(+Vt

literal 0
HcmV?d00001

diff --git a/src/npc_manager.py b/src/npc_manager.py
index f5e8847..4aa208d 100644
--- a/src/npc_manager.py
+++ b/src/npc_manager.py
@@ -25,7 +25,10 @@ class NpcManager:
                 "name_tag_white": color_filter(self._template_finder.get_template("QUAL_NAME_TAG_WHITE"), self._config.colors["white"])[1],
                 "name_tag_gold": color_filter(self._template_finder.get_template("QUAL_NAME_TAG_GOLD"), self._config.colors["gold"])[1],
                 "action_btns": {
-                    "resurrect": color_filter(self._template_finder.get_template("QUAL_RESURRECT_BTN"), self._config.colors["white"])[1]
+                    "resurrect": {
+                        "white": color_filter(self._template_finder.get_template("RESURRECT"), self._config.colors["white"])[1],
+                        "blue": color_filter(self._template_finder.get_template("RESURRECT_BLUE"), self._config.colors["blue"])[1],
+                    }
                 },
                 "template_group": ["QUAL_FRONT", "QUAL_SIDE", "QUAL_BACK", "QUAL_45", "QUAL_45_2", "QUAL_45_3"]
             },
@@ -33,7 +36,10 @@ class NpcManager:
                 "name_tag_white": color_filter(self._template_finder.get_template("MALAH_NAME_TAG_WHITE"), self._config.colors["white"])[1],
                 "name_tag_gold": color_filter(self._template_finder.get_template("MALAH_NAME_TAG_GOLD"), self._config.colors["gold"])[1],
                 "action_btns": {
-                    "trade": color_filter(self._template_finder.get_template("MALAH_TRADE_BTN"), self._config.colors["white"])[1]
+                    "trade": {
+                        "white": color_filter(self._template_finder.get_template("TRADE"), self._config.colors["white"])[1],
+                        "blue": color_filter(self._template_finder.get_template("TRADE_BLUE"), self._config.colors["blue"])[1],
+                    }
                 },
                 "template_group": ["MALAH_FRONT", "MALAH_BACK", "MALAH_45", "MALAH_SIDE", "MALAH_SIDE_2"]
             },
@@ -41,7 +47,10 @@ class NpcManager:
                 "name_tag_white": color_filter(self._template_finder.get_template("LARZUK_NAME_TAG_WHITE"), self._config.colors["white"])[1],
                 "name_tag_gold": color_filter(self._template_finder.get_template("LARZUK_NAME_TAG_GOLD"), self._config.colors["gold"])[1],
                 "action_btns": {
-                    "trade_repair": color_filter(self._template_finder.get_template("LARZUK_TRADE_REPAIR_BTN"), self._config.colors["white"])[1]
+                    "trade_repair": {
+                        "white": color_filter(self._template_finder.get_template("TRADE_REPAIR"), self._config.colors["white"])[1],
+                        "blue": color_filter(self._template_finder.get_template("TRADE_REPAIR_BLUE"), self._config.colors["blue"])[1],
+                    }
                 },
                 "template_group": ["LARZUK_FRONT", "LARZUK_BACK", "LARZUK_SIDE", "LARZUK_SIDE_2", "LARZUK_SIDE_3"]
             },
@@ -49,7 +58,10 @@ class NpcManager:
                 "name_tag_white": color_filter(self._template_finder.get_template("ANYA_NAME_TAG_WHITE"), self._config.colors["white"])[1],
                 "name_tag_gold": color_filter(self._template_finder.get_template("ANYA_NAME_TAG_GOLD"), self._config.colors["gold"])[1],
                 "action_btns": {
-                    "trade": color_filter(self._template_finder.get_template("ANYA_TRADE_BTN"), self._config.colors["white"])[1]
+                    "trade": {
+                        "white": color_filter(self._template_finder.get_template("TRADE"), self._config.colors["white"])[1],
+                        "blue": color_filter(self._template_finder.get_template("TRADE_BLUE"), self._config.colors["blue"])[1],
+                    }
                 },
                 "template_group": ["ANYA_FRONT", "ANYA_BACK", "ANYA_SIDE"]
             }
@@ -70,7 +82,7 @@ class NpcManager:
                 res_g = self._template_finder.search(self._npcs[npc_key]["name_tag_gold"], filtered_inp_g, 0.9, roi=roi).valid
                 if res_w:
                     mouse.click(button="left")
-                    wait(1.4, 1.7)
+                    wait(0.7, 1.0)
                     _, filtered_inp = color_filter(self._screen.grab(), self._config.colors["gold"])
                     res = self._template_finder.search(self._npcs[npc_key]["name_tag_gold"], filtered_inp, 0.9, roi=roi).valid
                     if res:
@@ -80,12 +92,21 @@ class NpcManager:
         return False
 
     def press_npc_btn(self, npc_key: Npc, action_btn_key: str):
-        _, filtered_inp = color_filter(self._screen.grab(), self._config.colors["white"])
+        img = self._screen.grab()
+        _, filtered_inp_w = color_filter(img, self._config.colors["white"])
         res = self._template_finder.search(
-            self._npcs[npc_key]["action_btns"][action_btn_key],
-            filtered_inp, 0.85, roi=self._config.ui_roi["cut_skill_bar"],
+            self._npcs[npc_key]["action_btns"][action_btn_key]["white"],
+            filtered_inp_w, 0.85, roi=self._config.ui_roi["cut_skill_bar"],
             normalize_monitor=True
         )
+        if not res.valid and "blue" in self._npcs[npc_key]["action_btns"][action_btn_key]:
+            # search for highlighted / blue action btn
+            _, filtered_inp_b = color_filter(img, self._config.colors["blue"])
+            res = self._template_finder.search(
+                self._npcs[npc_key]["action_btns"][action_btn_key]["blue"],
+                filtered_inp_b, 0.85, roi=self._config.ui_roi["cut_skill_bar"],
+                normalize_monitor=True
+            )
         if res.valid:
             mouse.move(*res.position, randomize=3, delay_factor=[1.0, 1.5])
             wait(0.2, 0.4)
diff --git a/src/template_finder.py b/src/template_finder.py
index bf515a3..7bf0940 100644
--- a/src/template_finder.py
+++ b/src/template_finder.py
@@ -105,6 +105,13 @@ class TemplateFinder:
             "FULL_REJUV_POTION": [load_template(f"assets/templates/full_rejuv_potion.png", 1.0), 1.0],
             "REJUV_POTION": [load_template(f"assets/templates/rejuv_potion.png", 1.0), 1.0],
             "WINDOW_INGAME_OFFSET_REFERENCE":[load_template(f"assets/templates/window_ingame_offset_reference.png", 1.0), 1.0],
+            # NPC: Action buttons
+            "TRADE": [load_template(f"assets/npc/action_btn/trade.png", 1.0), 1.0],
+            "TRADE_BLUE": [load_template(f"assets/npc/action_btn/trade_blue.png", 1.0), 1.0],
+            "RESURRECT": [load_template(f"assets/npc/action_btn/resurrect.png", 1.0), 1.0],
+            "RESURRECT_BLUE": [load_template(f"assets/npc/action_btn/resurrect_blue.png", 1.0), 1.0],
+            "TRADE_REPAIR": [load_template(f"assets/npc/action_btn/trade_repair.png", 1.0), 1.0],
+            "TRADE_REPAIR_BLUE": [load_template(f"assets/npc/action_btn/trade_repair_blue.png", 1.0), 1.0],
             # NPC: Qual-Kehk
             "QUAL_FRONT": [load_template(f"assets/npc/qual_kehk/qual_front.png", 1.0), 1.0],
             "QUAL_SIDE": [load_template(f"assets/npc/qual_kehk/qual_side.png", 1.0), 1.0],
@@ -114,7 +121,6 @@ class TemplateFinder:
             "QUAL_45_3": [load_template(f"assets/npc/qual_kehk/qual_45_3.png", 1.0), 1.0],
             "QUAL_NAME_TAG_WHITE": [load_template(f"assets/npc/qual_kehk/qual_kehk_white.png", 1.0), 1.0],
             "QUAL_NAME_TAG_GOLD": [load_template(f"assets/npc/qual_kehk/qual_kehk_gold.png", 1.0), 1.0],
-            "QUAL_RESURRECT_BTN": [load_template(f"assets/npc/qual_kehk/resurrect_btn.png", 1.0), 1.0],
             # NPC: Malah
             "MALAH_FRONT": [load_template(f"assets/npc/malah/malah_front.png", 1.0), 1.0],
             "MALAH_BACK": [load_template(f"assets/npc/malah/malah_BACK.png", 1.0), 1.0],
@@ -123,7 +129,6 @@ class TemplateFinder:
             "MALAH_SIDE_2": [load_template(f"assets/npc/malah/malah_side_2.png", 1.0), 1.0],
             "MALAH_NAME_TAG_WHITE": [load_template(f"assets/npc/malah/malah_white.png", 1.0), 1.0],
             "MALAH_NAME_TAG_GOLD": [load_template(f"assets/npc/malah/malah_gold.png", 1.0), 1.0],
-            "MALAH_TRADE_BTN": [load_template(f"assets/npc/malah/trade_btn.png", 1.0), 1.0],
             # NPC: Larzuk
             "LARZUK_FRONT": [load_template(f"assets/npc/larzuk/larzuk_front.png", 1.0), 1.0],
             "LARZUK_BACK": [load_template(f"assets/npc/larzuk/larzuk_back.png", 1.0), 1.0],
@@ -132,14 +137,12 @@ class TemplateFinder:
             "LARZUK_SIDE_3": [load_template(f"assets/npc/larzuk/larzuk_side_3.png", 1.0), 1.0],
             "LARZUK_NAME_TAG_WHITE": [load_template(f"assets/npc/larzuk/larzuk_white.png", 1.0), 1.0],
             "LARZUK_NAME_TAG_GOLD": [load_template(f"assets/npc/larzuk/larzuk_gold.png", 1.0), 1.0],
-            "LARZUK_TRADE_REPAIR_BTN": [load_template(f"assets/npc/larzuk/trade_repair_btn.png", 1.0), 1.0],
             # NPC: Anya
             "ANYA_FRONT": [load_template(f"assets/npc/anya/anya_front.png", 1.0), 1.0],
             "ANYA_BACK": [load_template(f"assets/npc/anya/anya_back.png", 1.0), 1.0],
             "ANYA_SIDE": [load_template(f"assets/npc/anya/anya_side.png", 1.0), 1.0],
             "ANYA_NAME_TAG_GOLD": [load_template(f"assets/npc/anya/anya_gold.png", 1.0), 1.0],
             "ANYA_NAME_TAG_WHITE": [load_template(f"assets/npc/anya/anya_white.png", 1.0), 1.0],
-            "ANYA_TRADE_BTN": [load_template(f"assets/npc/anya/trade_btn.png", 1.0), 1.0],
         }
 
     def get_template(self, key):