From 8ef3362cff50cddbd3242444b72c1ebd440cd07f Mon Sep 17 00:00:00 2001 From: aeon0 Date: Wed, 10 Nov 2021 17:43:29 +0100 Subject: [PATCH] fix some pickit issues, lower item thresholds --- assets/items/eth_armor_sacred_armor.png | Bin 5567 -> 3271 bytes development.md | 2 +- src/item_finder.py | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/items/eth_armor_sacred_armor.png b/assets/items/eth_armor_sacred_armor.png index 2bd1333835a9a9c61f77f20b4eda3d102750d6bd..74ab500aa36d9f777d12577199c9f91702335c22 100644 GIT binary patch literal 3271 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 N002ovPDHLkV1l&}rl$Y^ diff --git a/development.md b/development.md index db81fcf..59baca2 100644 --- a/development.md +++ b/development.md @@ -28,7 +28,7 @@ For changelog run: `git log ..HEAD --oneline --decorate` ## Folder Structure **/**
-In the root is docu, param files and development specific stuff such as .gitignore
+The root contains docu, param files and development specific stuff such as .gitignore
**assets**
Contains all data for the project that is not source code
diff --git a/src/item_finder.py b/src/item_finder.py index c2f0eaa..bbd0a43 100644 --- a/src/item_finder.py +++ b/src/item_finder.py @@ -100,11 +100,11 @@ class ItemFinder: _, mask = cv2.threshold(grayscale, 0, 255, cv2.THRESH_BINARY) hist = cv2.calcHist([cropped_input], [0, 1, 2], mask, [8, 8, 8], [0, 256, 0, 256, 0, 256]) hist_result = cv2.compareHist(template.hist, hist, cv2.HISTCMP_CORREL) - same_type = hist_result > 0.9 and hist_result is not np.inf + same_type = hist_result > 0.65 and hist_result is not np.inf if same_type: result = cv2.matchTemplate(cropped_input, template.data, cv2.TM_CCOEFF_NORMED) _, max_val, _, max_loc = cv2.minMaxLoc(result) - if max_val > 0.93: + if max_val > 0.8: if template.blacklist: item = None break @@ -132,7 +132,7 @@ if __name__ == "__main__": screen = Screen(config.general["monitor"]) item_finder = ItemFinder() while 1: - # img = cv2.imread("assets/items/flawless_ruby.png") + # img = cv2.imread("C:\\test4.png") img = screen.grab() item_list = item_finder.search(img) for item in item_list: