diff --git a/equip/chest_1_32-removebg-preview.png b/equip/chest_1_32-removebg-preview.png new file mode 100644 index 0000000..f20c4d3 Binary files /dev/null and b/equip/chest_1_32-removebg-preview.png differ diff --git a/equip/coin_3_32.jpg b/equip/coin_3_32.jpg new file mode 100644 index 0000000..ee0a512 Binary files /dev/null and b/equip/coin_3_32.jpg differ diff --git a/equip/coin_4_32.jpg b/equip/coin_4_32.jpg new file mode 100644 index 0000000..12acfc5 Binary files /dev/null and b/equip/coin_4_32.jpg differ diff --git a/equip/coin_5_32.jpg b/equip/coin_5_32.jpg new file mode 100644 index 0000000..a0347e6 Binary files /dev/null and b/equip/coin_5_32.jpg differ diff --git a/equip/main_panel.jpg b/equip/main_panel.jpg new file mode 100644 index 0000000..17f1775 Binary files /dev/null and b/equip/main_panel.jpg differ diff --git a/equip/main_panel.png b/equip/main_panel.png new file mode 100644 index 0000000..ce1f8e0 Binary files /dev/null and b/equip/main_panel.png differ diff --git a/equipment_main.py b/equipment_main.py index c6ad78c..5fcab23 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -54,7 +54,7 @@ def run(): include_pots(needles, hsv) include_bags(needles, hsv) include_coins(needles, hsv) - include_runes(needles, hsv) + #include_runes(needles, hsv) elif EMITTER_TO_USE == EMITTER_SWORD: include_books(needles, hsv) include_swords(needles, hsv) @@ -88,7 +88,7 @@ def run(): # cv.waitKey(150) # continue - spawn_1 = (EMITTER_TO_USE, vision_stun, screenshot, 1) + spawn_1 = find_emitter(EMITTER_TO_USE, vision_stun, screenshot, 1) if len(spawn_1) == 1: spawn_button_active = True points = vision_stun.get_click_points(spawn_1) @@ -98,7 +98,7 @@ def run(): pause = True break else: - spawn_0 = (EMITTER_TO_USE, vision_stun, screenshot, 0) + spawn_0 = find_emitter(EMITTER_TO_USE, vision_stun, screenshot, 0) points = vision_stun.get_click_points(spawn_0) for point in points: click_point(config, points[0][0], points[0][1]) @@ -157,6 +157,8 @@ def run(): def include_chests(needles, hsv): needles.append(cv.imread("equip/chest_1_32.jpg", cv.IMREAD_UNCHANGED)) hsv.append(HsvFilter(13, 40, 85, 135, 255, 255, 0, 0, 55, 53)) + #needles.append(cv.imread("equip/chest_1_32-removebg-preview.png", cv.IMREAD_UNCHANGED)) + #hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED)) hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0)) needles.append(cv.imread("equip/chest_3_32.jpg", cv.IMREAD_UNCHANGED)) @@ -220,7 +222,12 @@ def include_coins(needles, hsv): hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) needles.append(cv.imread("equip/coin_2_32.jpg", cv.IMREAD_UNCHANGED)) hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - + needles.append(cv.imread("equip/coin_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/coin_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/coin_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) def include_runes(needles, hsv): needles.append(cv.imread("equip/rune_1_32.jpg", cv.IMREAD_UNCHANGED))