diff --git a/equip/chests/chest_4_32.jpg b/equip/chests/chest_4_32.jpg index 9f482a7..1e2ce76 100644 Binary files a/equip/chests/chest_4_32.jpg and b/equip/chests/chest_4_32.jpg differ diff --git a/equip/keys/key_4_32-mask.png b/equip/keys/key_4_32-mask.png index 77253f3..296207e 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/keys/key_4_32.jpg b/equip/keys/key_4_32.jpg index 3611eb4..ef76e27 100644 Binary files a/equip/keys/key_4_32.jpg and b/equip/keys/key_4_32.jpg differ diff --git a/equip/keys/key_4_32.png b/equip/keys/key_4_32.png index 8b35e95..9ef6f2d 100644 Binary files a/equip/keys/key_4_32.png and b/equip/keys/key_4_32.png differ diff --git a/equipment_main.py b/equipment_main.py index d6b9f63..ce1d882 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -96,6 +96,11 @@ def run(): include_wands(needles, hsvs, tresholds, masks) include_bags(needles, hsvs, tresholds, masks) + c_needle = cv.imread("equip/chests/chest_4_32.jpg", cv.IMREAD_UNCHANGED) + 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) + while True: if keyboard.is_pressed('p') == True: @@ -146,6 +151,19 @@ def run(): continue cv.waitKey(500) + + if emitter == EMITTER_MAIN: + while True: + screenshot = capture_window.get_screenshot() + c_rectangles = vision_stun.find_by_mask_and_validate(screenshot, c_needle, c_mask, 1) + k_rectangles = vision_stun.find_by_mask_and_validate(screenshot, k_needle, k_mask, 1) + if (len(c_rectangles) == 1) and (len(k_rectangles) == 1): + c_point = vision_stun.get_click_points(c_rectangles)[0] + k_point = vision_stun.get_click_points(k_rectangles)[0] + move_tile(config, k_point, c_point) + else: + break + for rer in range(0, len(needles), 1): loop_time = time() while True: