diff --git a/equip/amus/amu_1_32-mask.png b/equip/amus/amu_1_32-mask.png index 3b104ed..9d74a8a 100644 Binary files a/equip/amus/amu_1_32-mask.png and b/equip/amus/amu_1_32-mask.png differ diff --git a/equip/amus/amu_2_32-mask.png b/equip/amus/amu_2_32-mask.png index 643c187..1d26e5c 100644 Binary files a/equip/amus/amu_2_32-mask.png and b/equip/amus/amu_2_32-mask.png differ diff --git a/equip/amus/amu_3_32-mask.png b/equip/amus/amu_3_32-mask.png index faf6062..92c3832 100644 Binary files a/equip/amus/amu_3_32-mask.png and b/equip/amus/amu_3_32-mask.png differ diff --git a/equip/amus/amu_4_32-mask.png b/equip/amus/amu_4_32-mask.png index e41c431..795d765 100644 Binary files a/equip/amus/amu_4_32-mask.png and b/equip/amus/amu_4_32-mask.png differ diff --git a/equip/amus/amu_5_32-mask.png b/equip/amus/amu_5_32-mask.png index 21e9073..2492115 100644 Binary files a/equip/amus/amu_5_32-mask.png and b/equip/amus/amu_5_32-mask.png differ diff --git a/equip/amus/amu_6_32-mask.png b/equip/amus/amu_6_32-mask.png index 458cb51..3618e35 100644 Binary files a/equip/amus/amu_6_32-mask.png and b/equip/amus/amu_6_32-mask.png differ diff --git a/equip/amus/amu_7_32-mask.png b/equip/amus/amu_7_32-mask.png index f6762c9..8b44dd6 100644 Binary files a/equip/amus/amu_7_32-mask.png and b/equip/amus/amu_7_32-mask.png differ diff --git a/equip/bags/bag_1_32-mask.png b/equip/bags/bag_1_32-mask.png index 6b99b2c..a9d3a5b 100644 Binary files a/equip/bags/bag_1_32-mask.png and b/equip/bags/bag_1_32-mask.png differ diff --git a/equip/bags/bag_3_32-mask.png b/equip/bags/bag_3_32-mask.png index 70bfa61..b445fe2 100644 Binary files a/equip/bags/bag_3_32-mask.png and b/equip/bags/bag_3_32-mask.png differ diff --git a/equip/bags/bag_4_32-mask.png b/equip/bags/bag_4_32-mask.png index b34a589..df4f230 100644 Binary files a/equip/bags/bag_4_32-mask.png and b/equip/bags/bag_4_32-mask.png differ diff --git a/equip/bags/bag_5_32-mask.png b/equip/bags/bag_5_32-mask.png index f19dd03..0d20924 100644 Binary files a/equip/bags/bag_5_32-mask.png and b/equip/bags/bag_5_32-mask.png differ diff --git a/equip/bags/bag_6_32-mask.png b/equip/bags/bag_6_32-mask.png index 3296ffe..5d73975 100644 Binary files a/equip/bags/bag_6_32-mask.png and b/equip/bags/bag_6_32-mask.png differ diff --git a/equip/bags/bag_7_32-mask.png b/equip/bags/bag_7_32-mask.png index 43c7274..4f49451 100644 Binary files a/equip/bags/bag_7_32-mask.png and b/equip/bags/bag_7_32-mask.png differ diff --git a/equip/books/book_2_32-mask.png b/equip/books/book_2_32-mask.png index 88ae54d..f3bc2b2 100644 Binary files a/equip/books/book_2_32-mask.png and b/equip/books/book_2_32-mask.png differ diff --git a/equip/books/book_3_32-mask.png b/equip/books/book_3_32-mask.png index 4fc133a..7c8429a 100644 Binary files a/equip/books/book_3_32-mask.png and b/equip/books/book_3_32-mask.png differ diff --git a/equip/books/book_4_32-mask.png b/equip/books/book_4_32-mask.png index cc7f26f..c412dec 100644 Binary files a/equip/books/book_4_32-mask.png and b/equip/books/book_4_32-mask.png differ diff --git a/equip/books/book_5_32-mask.png b/equip/books/book_5_32-mask.png index 8bd4ae5..5738c26 100644 Binary files a/equip/books/book_5_32-mask.png and b/equip/books/book_5_32-mask.png differ diff --git a/equip/books/book_5_32.png b/equip/books/book_5_32.png index 1ed5e57..15b5751 100644 Binary files a/equip/books/book_5_32.png and b/equip/books/book_5_32.png differ diff --git a/equip/books/book_6_32-mask.png b/equip/books/book_6_32-mask.png index 298958b..d5e9c4e 100644 Binary files a/equip/books/book_6_32-mask.png and b/equip/books/book_6_32-mask.png differ diff --git a/equip/books/book_7_32-mask.png b/equip/books/book_7_32-mask.png index 190b0e2..c2e1157 100644 Binary files a/equip/books/book_7_32-mask.png and b/equip/books/book_7_32-mask.png differ diff --git a/equip/books/book_8_32-mask.png b/equip/books/book_8_32-mask.png index 067cb6a..62aa371 100644 Binary files a/equip/books/book_8_32-mask.png and b/equip/books/book_8_32-mask.png differ diff --git a/equip/chests/chest_1_32-mask.png b/equip/chests/chest_1_32-mask.png index d700ccc..9b04f96 100644 Binary files a/equip/chests/chest_1_32-mask.png and b/equip/chests/chest_1_32-mask.png differ diff --git a/equip/chests/chest_3_32-mask.png b/equip/chests/chest_3_32-mask.png index a248047..fc9db07 100644 Binary files a/equip/chests/chest_3_32-mask.png and b/equip/chests/chest_3_32-mask.png differ diff --git a/equip/chests/chest_4_32-mask.png b/equip/chests/chest_4_32-mask.png index 216196e..8fdf2c3 100644 Binary files a/equip/chests/chest_4_32-mask.png and b/equip/chests/chest_4_32-mask.png differ diff --git a/equip/coins/coin_1_32-mask.png b/equip/coins/coin_1_32-mask.png index 7b2d747..de7d92d 100644 Binary files a/equip/coins/coin_1_32-mask.png and b/equip/coins/coin_1_32-mask.png differ diff --git a/equip/coins/coin_3_32-mask.png b/equip/coins/coin_3_32-mask.png index 536eae0..e14b61d 100644 Binary files a/equip/coins/coin_3_32-mask.png and b/equip/coins/coin_3_32-mask.png differ diff --git a/equip/coins/coin_4_32-mask.png b/equip/coins/coin_4_32-mask.png index dfc766b..76484b4 100644 Binary files a/equip/coins/coin_4_32-mask.png and b/equip/coins/coin_4_32-mask.png differ diff --git a/equip/coins/coin_5_32-mask.png b/equip/coins/coin_5_32-mask.png index a849b73..1ba4598 100644 Binary files a/equip/coins/coin_5_32-mask.png and b/equip/coins/coin_5_32-mask.png differ diff --git a/equip/emitters/amu_e2_32-mask.png b/equip/emitters/amu_e2_32-mask.png index f6f48c0..4d66148 100644 Binary files a/equip/emitters/amu_e2_32-mask.png and b/equip/emitters/amu_e2_32-mask.png differ diff --git a/equip/emitters/amu_e_32-mask.png b/equip/emitters/amu_e_32-mask.png index b4a796d..5a1a0b5 100644 Binary files a/equip/emitters/amu_e_32-mask.png and b/equip/emitters/amu_e_32-mask.png differ diff --git a/equip/emitters/main_e1_32-mask.png b/equip/emitters/main_e1_32-mask.png index 568b943..92ba707 100644 Binary files a/equip/emitters/main_e1_32-mask.png and b/equip/emitters/main_e1_32-mask.png differ diff --git a/equip/emitters/main_e2_32-mask.png b/equip/emitters/main_e2_32-mask.png index f6f8be3..ea1f472 100644 Binary files a/equip/emitters/main_e2_32-mask.png and b/equip/emitters/main_e2_32-mask.png differ diff --git a/equip/emitters/mush_e2_32-mask.png b/equip/emitters/mush_e2_32-mask.png index 325a244..1083c8e 100644 Binary files a/equip/emitters/mush_e2_32-mask.png and b/equip/emitters/mush_e2_32-mask.png differ diff --git a/equip/emitters/mush_e_32-mask.png b/equip/emitters/mush_e_32-mask.png index bee0e55..2c31875 100644 Binary files a/equip/emitters/mush_e_32-mask.png and b/equip/emitters/mush_e_32-mask.png differ diff --git a/equip/emitters/ring_e1_32-mask.png b/equip/emitters/ring_e1_32-mask.png index 17616f7..d244d41 100644 Binary files a/equip/emitters/ring_e1_32-mask.png and b/equip/emitters/ring_e1_32-mask.png differ diff --git a/equip/emitters/ring_e2_32-mask.png b/equip/emitters/ring_e2_32-mask.png index f27e843..646a21c 100644 Binary files a/equip/emitters/ring_e2_32-mask.png and b/equip/emitters/ring_e2_32-mask.png differ diff --git a/equip/emitters/staff_e1_32-mask.png b/equip/emitters/staff_e1_32-mask.png index b151946..9555519 100644 Binary files a/equip/emitters/staff_e1_32-mask.png and b/equip/emitters/staff_e1_32-mask.png differ diff --git a/equip/emitters/sword_e1_32-mask.png b/equip/emitters/sword_e1_32-mask.png index 905f3ea..f3df7aa 100644 Binary files a/equip/emitters/sword_e1_32-mask.png and b/equip/emitters/sword_e1_32-mask.png differ diff --git a/equip/emitters/wand_e1_32-mask.png b/equip/emitters/wand_e1_32-mask.png index ad1613e..ccee69d 100644 Binary files a/equip/emitters/wand_e1_32-mask.png and b/equip/emitters/wand_e1_32-mask.png differ diff --git a/equip/emitters/wand_e2_32-mask.png b/equip/emitters/wand_e2_32-mask.png index 6e44e74..3d8f04a 100644 Binary files a/equip/emitters/wand_e2_32-mask.png and b/equip/emitters/wand_e2_32-mask.png differ diff --git a/equip/keys/key_1_32-mask.png b/equip/keys/key_1_32-mask.png index abe1ce9..d9e9e9a 100644 Binary files a/equip/keys/key_1_32-mask.png and b/equip/keys/key_1_32-mask.png differ diff --git a/equip/keys/key_2_32-mask.png b/equip/keys/key_2_32-mask.png index fe94270..07e6c1f 100644 Binary files a/equip/keys/key_2_32-mask.png and b/equip/keys/key_2_32-mask.png differ diff --git a/equip/keys/key_3_32-mask.png b/equip/keys/key_3_32-mask.png index e4f8346..adba62a 100644 Binary files a/equip/keys/key_3_32-mask.png and b/equip/keys/key_3_32-mask.png differ diff --git a/equip/keys/key_4_32-mask.png b/equip/keys/key_4_32-mask.png index 296207e..11c9d8f 100644 Binary files a/equip/keys/key_4_32-mask.png and b/equip/keys/key_4_32-mask.png differ diff --git a/equip/mushrooms/mush_2_32-mask.png b/equip/mushrooms/mush_2_32-mask.png index 232844d..fbe8f84 100644 Binary files a/equip/mushrooms/mush_2_32-mask.png and b/equip/mushrooms/mush_2_32-mask.png differ diff --git a/equip/mushrooms/mush_3_32-mask.png b/equip/mushrooms/mush_3_32-mask.png index 7585966..a396b58 100644 Binary files a/equip/mushrooms/mush_3_32-mask.png and b/equip/mushrooms/mush_3_32-mask.png differ diff --git a/equip/mushrooms/mush_6_32-mask.png b/equip/mushrooms/mush_6_32-mask.png index fc6d31a..9955061 100644 Binary files a/equip/mushrooms/mush_6_32-mask.png and b/equip/mushrooms/mush_6_32-mask.png differ diff --git a/equip/mushrooms/mush_8_32-mask.png b/equip/mushrooms/mush_8_32-mask.png index af55a98..ae44923 100644 Binary files a/equip/mushrooms/mush_8_32-mask.png and b/equip/mushrooms/mush_8_32-mask.png differ diff --git a/equip/pots/pot_1_32-mask.png b/equip/pots/pot_1_32-mask.png index 1aabdd4..a8f5111 100644 Binary files a/equip/pots/pot_1_32-mask.png and b/equip/pots/pot_1_32-mask.png differ diff --git a/equip/pots/pot_2_32-mask.png b/equip/pots/pot_2_32-mask.png index 0e03308..3b63166 100644 Binary files a/equip/pots/pot_2_32-mask.png and b/equip/pots/pot_2_32-mask.png differ diff --git a/equip/pots/pot_3_32-mask.png b/equip/pots/pot_3_32-mask.png index 272e686..bdd5bf0 100644 Binary files a/equip/pots/pot_3_32-mask.png and b/equip/pots/pot_3_32-mask.png differ diff --git a/equip/pots/pot_5_32-mask.png b/equip/pots/pot_5_32-mask.png index eedf229..1ea16a7 100644 Binary files a/equip/pots/pot_5_32-mask.png and b/equip/pots/pot_5_32-mask.png differ diff --git a/equip/pots/pot_6_32-mask.png b/equip/pots/pot_6_32-mask.png index f3c1ee8..44d4834 100644 Binary files a/equip/pots/pot_6_32-mask.png and b/equip/pots/pot_6_32-mask.png differ diff --git a/equip/rings/ring_1_32-mask.png b/equip/rings/ring_1_32-mask.png index d461b78..a47af8a 100644 Binary files a/equip/rings/ring_1_32-mask.png and b/equip/rings/ring_1_32-mask.png differ diff --git a/equip/rings/ring_2_32-mask.png b/equip/rings/ring_2_32-mask.png index 5dde91a..0fd7dcd 100644 Binary files a/equip/rings/ring_2_32-mask.png and b/equip/rings/ring_2_32-mask.png differ diff --git a/equip/rings/ring_3_32-mask.png b/equip/rings/ring_3_32-mask.png index b36f479..6b044f4 100644 Binary files a/equip/rings/ring_3_32-mask.png and b/equip/rings/ring_3_32-mask.png differ diff --git a/equip/rings/ring_4_32-mask.png b/equip/rings/ring_4_32-mask.png index b9027a8..5f7ad6c 100644 Binary files a/equip/rings/ring_4_32-mask.png and b/equip/rings/ring_4_32-mask.png differ diff --git a/equip/rings/ring_5_32-mask.png b/equip/rings/ring_5_32-mask.png index dcfccf6..90b555b 100644 Binary files a/equip/rings/ring_5_32-mask.png and b/equip/rings/ring_5_32-mask.png differ diff --git a/equip/rings/ring_6_32-mask.png b/equip/rings/ring_6_32-mask.png index 7366681..3632c3d 100644 Binary files a/equip/rings/ring_6_32-mask.png and b/equip/rings/ring_6_32-mask.png differ diff --git a/equip/rings/ring_7_32-mask.png b/equip/rings/ring_7_32-mask.png index 6feb697..9e8d8c8 100644 Binary files a/equip/rings/ring_7_32-mask.png and b/equip/rings/ring_7_32-mask.png differ diff --git a/equip/runes/rune_1_32-mask.png b/equip/runes/rune_1_32-mask.png index 29a144b..284b981 100644 Binary files a/equip/runes/rune_1_32-mask.png and b/equip/runes/rune_1_32-mask.png differ diff --git a/equip/runes/rune_2_32-mask.png b/equip/runes/rune_2_32-mask.png index 9a94255..04290d7 100644 Binary files a/equip/runes/rune_2_32-mask.png and b/equip/runes/rune_2_32-mask.png differ diff --git a/equip/runes/rune_3_32-mask.png b/equip/runes/rune_3_32-mask.png index 8be1654..5f8aa54 100644 Binary files a/equip/runes/rune_3_32-mask.png and b/equip/runes/rune_3_32-mask.png differ diff --git a/equip/runes/rune_4_32-mask.png b/equip/runes/rune_4_32-mask.png index c7f0746..2c87485 100644 Binary files a/equip/runes/rune_4_32-mask.png and b/equip/runes/rune_4_32-mask.png differ diff --git a/equip/staffs/staff_1_32-mask.png b/equip/staffs/staff_1_32-mask.png index 7eb745f..1759e39 100644 Binary files a/equip/staffs/staff_1_32-mask.png and b/equip/staffs/staff_1_32-mask.png differ diff --git a/equip/staffs/staff_1_32.png b/equip/staffs/staff_1_32.png index fee0da9..e9927b8 100644 Binary files a/equip/staffs/staff_1_32.png and b/equip/staffs/staff_1_32.png differ diff --git a/equip/staffs/staff_2_32-mask.png b/equip/staffs/staff_2_32-mask.png index 5837eff..deebbd4 100644 Binary files a/equip/staffs/staff_2_32-mask.png and b/equip/staffs/staff_2_32-mask.png differ diff --git a/equip/staffs/staff_3_32-mask.png b/equip/staffs/staff_3_32-mask.png index 1b8b2b4..868c485 100644 Binary files a/equip/staffs/staff_3_32-mask.png and b/equip/staffs/staff_3_32-mask.png differ diff --git a/equip/staffs/staff_4_32-mask.png b/equip/staffs/staff_4_32-mask.png index bf468fd..1c1483a 100644 Binary files a/equip/staffs/staff_4_32-mask.png and b/equip/staffs/staff_4_32-mask.png differ diff --git a/equip/staffs/staff_5_32-mask.png b/equip/staffs/staff_5_32-mask.png index 7f0744c..1c34394 100644 Binary files a/equip/staffs/staff_5_32-mask.png and b/equip/staffs/staff_5_32-mask.png differ diff --git a/equip/staffs/staff_6_32-mask.png b/equip/staffs/staff_6_32-mask.png index 30057c4..5609c15 100644 Binary files a/equip/staffs/staff_6_32-mask.png and b/equip/staffs/staff_6_32-mask.png differ diff --git a/equip/swords/sword_1_32-mask.png b/equip/swords/sword_1_32-mask.png index f9fa3b5..b56040f 100644 Binary files a/equip/swords/sword_1_32-mask.png and b/equip/swords/sword_1_32-mask.png differ diff --git a/equip/swords/sword_2_32-mask.png b/equip/swords/sword_2_32-mask.png index 0417646..b685754 100644 Binary files a/equip/swords/sword_2_32-mask.png and b/equip/swords/sword_2_32-mask.png differ diff --git a/equip/swords/sword_3_32-mask.png b/equip/swords/sword_3_32-mask.png index a8b2157..96531e6 100644 Binary files a/equip/swords/sword_3_32-mask.png and b/equip/swords/sword_3_32-mask.png differ diff --git a/equip/swords/sword_4_32-mask.png b/equip/swords/sword_4_32-mask.png index c6853f5..c3aebb6 100644 Binary files a/equip/swords/sword_4_32-mask.png and b/equip/swords/sword_4_32-mask.png differ diff --git a/equip/swords/sword_5_32-mask.png b/equip/swords/sword_5_32-mask.png index dffd305..e460129 100644 Binary files a/equip/swords/sword_5_32-mask.png and b/equip/swords/sword_5_32-mask.png differ diff --git a/equip/swords/sword_6_32-mask.png b/equip/swords/sword_6_32-mask.png index 083ea28..fd9d5b9 100644 Binary files a/equip/swords/sword_6_32-mask.png and b/equip/swords/sword_6_32-mask.png differ diff --git a/equip/swords/sword_7_32-mask.png b/equip/swords/sword_7_32-mask.png index 091696d..c62af15 100644 Binary files a/equip/swords/sword_7_32-mask.png and b/equip/swords/sword_7_32-mask.png differ diff --git a/equip/wands/wand_1_32-mask.png b/equip/wands/wand_1_32-mask.png index 38cb99e..afe8c73 100644 Binary files a/equip/wands/wand_1_32-mask.png and b/equip/wands/wand_1_32-mask.png differ diff --git a/equip/wands/wand_2_32-mask.png b/equip/wands/wand_2_32-mask.png index 97e2877..a2991c4 100644 Binary files a/equip/wands/wand_2_32-mask.png and b/equip/wands/wand_2_32-mask.png differ diff --git a/equip/wands/wand_3_32-mask.png b/equip/wands/wand_3_32-mask.png index 4ce838d..5848ed1 100644 Binary files a/equip/wands/wand_3_32-mask.png and b/equip/wands/wand_3_32-mask.png differ diff --git a/equip/wands/wand_4_32-mask.png b/equip/wands/wand_4_32-mask.png index caf86e6..3b6a9bc 100644 Binary files a/equip/wands/wand_4_32-mask.png and b/equip/wands/wand_4_32-mask.png differ diff --git a/equip/wands/wand_5_32-mask.png b/equip/wands/wand_5_32-mask.png index b203abd..81d01f1 100644 Binary files a/equip/wands/wand_5_32-mask.png and b/equip/wands/wand_5_32-mask.png differ diff --git a/equip/wands/wand_7_32-mask.png b/equip/wands/wand_7_32-mask.png index 731f248..4bc8568 100644 Binary files a/equip/wands/wand_7_32-mask.png and b/equip/wands/wand_7_32-mask.png differ diff --git a/equipment_main.py b/equipment_main.py index ae26d81..e89c9a5 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -100,7 +100,7 @@ def run(): c_mask = cv.imread("equip/chests/chest_4_32-mask.png", cv.IMREAD_COLOR) k_needle = cv.imread("equip/keys/key_4_32.jpg", cv.IMREAD_UNCHANGED) k_mask = cv.imread("equip/keys/key_4_32-mask.png", cv.IMREAD_COLOR) - + dig_button = cv.imread("dig/ok_button.jpg", cv.IMREAD_UNCHANGED) while True: if keyboard.is_pressed('p') == True: @@ -170,8 +170,7 @@ def run(): if (time() - loop_time) >= 60: break screenshot = capture_window.get_screenshot_by_area(config.returnOKWindowPos()) - rectangles = vision_stun.find(screenshot, cv.imread("dig/ok_button.jpg", cv.IMREAD_UNCHANGED), 0.5, - 1) + rectangles = vision_stun.find(screenshot, dig_button, 0.5, 1) if len(rectangles) == 1: pointis = vision_stun.get_click_points(rectangles) for pointi in pointis: