From 3da81815bd36d622d1d63768ab56e2f17f3c09c1 Mon Sep 17 00:00:00 2001
From: navy91 <95447881+navy91@users.noreply.github.com>
Date: Fri, 3 Dec 2021 22:44:39 +0100
Subject: [PATCH] skip gold stashing when there's no gold in inventory (#182)

* skip gold stashing when there's no gold in inventory

* skip stashing - performance upgrade
---
 assets/templates/inventory_no_gold.png | Bin 0 -> 3350 bytes
 game.ini                               |   1 +
 src/ui_manager.py                      |  21 +++++++++++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 assets/templates/inventory_no_gold.png

diff --git a/assets/templates/inventory_no_gold.png b/assets/templates/inventory_no_gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a9f0b085ad166540312febf79b071b638bdd155
GIT binary patch
literal 3350
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

literal 0
HcmV?d00001

diff --git a/game.ini b/game.ini
index 2aec7d3..66e9112 100644
--- a/game.ini
+++ b/game.ini
@@ -95,6 +95,7 @@ save_and_exit=500,233,273,173
 go_btn=533,627,213,67
 difficulty_select=556,278,168,142
 gold_btn=927,491,267,100
+inventory_gold=980,510,150,40
 health_globe=160,580,240,140
 mana_globe=887,580,240,140
 cut_skill_bar=0,0,1280,653
diff --git a/src/ui_manager.py b/src/ui_manager.py
index 1be8a49..20ef74e 100644
--- a/src/ui_manager.py
+++ b/src/ui_manager.py
@@ -287,14 +287,19 @@ class UiManager():
         wait(0.3, 0.4)
         # stash gold
         if self._config.char["stash_gold"]:
-            x, y = self._screen.convert_screen_to_monitor(gold_btn.position)
-            mouse.move(x, y, randomize=4)
-            wait(0.1, 0.15)
-            mouse.press(button="left")
-            wait(0.25, 0.35)
-            mouse.release(button="left")
-            wait(0.4, 0.6)
-            keyboard.send("enter") #if stash already full of gold just nothing happens -> gold stays on char -> no popup window
+            inventory_no_gold = self._template_finder.search("INVENTORY_NO_GOLD", self._screen.grab(), roi=self._config.ui_roi["inventory_gold"], threshold=0.95)
+            if inventory_no_gold.valid:
+                Logger.debug("Skipping gold stashing")
+            else:
+                Logger.debug("Stashing gold")
+                x, y = self._screen.convert_screen_to_monitor(gold_btn.position)
+                mouse.move(x, y, randomize=4)
+                wait(0.1, 0.15)
+                mouse.press(button="left")
+                wait(0.25, 0.35)
+                mouse.release(button="left")
+                wait(0.4, 0.6)
+                keyboard.send("enter") #if stash already full of gold just nothing happens -> gold stays on char -> no popup window
         # stash stuff
         center_m = self._screen.convert_abs_to_monitor((0, 0))
         for column, row in itertools.product(range(num_loot_columns), range(4)):