refactor equip

2022-05-01 17:31:18 +02:00
parent 6d6cabfa42
commit 1b774b0a75
1 changed files with 91 additions and 53 deletions
--- a/equipment_main.py
+++ b/equipment_main.py
@@ -16,6 +16,12 @@ def run():
    # initialize the user-class
    config = UserConfigs()

+    EMITTER_MAIN = "main"
+    EMITTER_MUSH = "mushroom"
+    EMITTER_AMU = "amulett"
+
+    EMITTER_TO_USE = EMITTER_MUSH
+
    # initialize the StunWindowCapture class
    try:
        capture_window = WindowCapture(
@@ -64,7 +70,13 @@ def run():
        # cv.waitKey(150)
        # continue

-        spawn_1 = vision_stun.find(screenshot, cv.imread("equip/mush_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1)
+        if EMITTER_TO_USE == EMITTER_MUSH:
+            spawn_1 = vision_stun.find(screenshot, cv.imread("equip/mush_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1)
+        elif EMITTER_TO_USE == EMITTER_AMU:
+            spawn_1 = vision_stun.find(screenshot, cv.imread("equip/amu_e2_32.jpg_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1)
+        else:
+            break
+            #spawn_1 = vision_stun.find(screenshot, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1)
        if len(spawn_1) == 1:
            spawn_button_active = True
            points = vision_stun.get_click_points(spawn_1)
@@ -79,7 +91,12 @@ def run():
                    print('q pressed')
                    break
        else:
-            spawn_0 = vision_stun.find(screenshot, cv.imread("equip/mush_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1)
+            if EMITTER_TO_USE == EMITTER_AMU:
+                spawn_0 = vision_stun.find(screenshot, cv.imread("equip/mush_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1)
+            elif EMITTER_TO_USE == EMITTER_AMU:
+                spawn_0 = vision_stun.find(screenshot, cv.imread("equip/amu_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1)
+            else:
+                break
            points = vision_stun.get_click_points(spawn_0)
            for point in points:
                pydirectinput.moveTo(point[0], point[1])
@@ -93,58 +110,79 @@ def run():
            continue

        needles = []
-
-        needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/book_4_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/book_5_32.jpg", cv.IMREAD_UNCHANGED))
-
-        #needles.append(cv.imread("equip/key_1_32.jpg", cv.IMREAD_UNCHANGED))
-        #needles.append(cv.imread("equip/key_2_32.jpg", cv.IMREAD_UNCHANGED))
-        #needles.append(cv.imread("equip/key_3_32.jpg", cv.IMREAD_UNCHANGED))
-        # needles.append(cv.imread("equip/key_4_32.jpg", cv.IMREAD_UNCHANGED))
-
-        #needles.append(cv.imread("equip/chest_1_32.jpg", cv.IMREAD_UNCHANGED))
-        #needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED))
-        #needles.append(cv.imread("equip/chest_3_32.jpg", cv.IMREAD_UNCHANGED))
-        # needles.append(cv.imread("equip/chest_4_32.jpg", cv.IMREAD_UNCHANGED))
-
-        needles.append(cv.imread("equip/mush_1_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_2_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_3_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_4_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_5_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_6_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_7_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/mush_8_32.jpg", cv.IMREAD_UNCHANGED))
-
-        needles.append(cv.imread("equip/pot_1_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/pot_2_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/pot_3_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/pot_4_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/pot_5_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/pot_6_32.jpg", cv.IMREAD_UNCHANGED))
-
-        needles.append(cv.imread("equip/bag_1_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/bag_2_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/bag_3_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/bag_4_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/bag_5_32.jpg", cv.IMREAD_UNCHANGED))
-        needles.append(cv.imread("equip/bag_6_32.jpg", cv.IMREAD_UNCHANGED))
-        # needles.append(cv.imread("equip/bag_7_32.jpg", cv.IMREAD_UNCHANGED))
-
-        #needles.append(cv.imread("equip/book_6_32.jpg", cv.IMREAD_UNCHANGED))
-        #needles.append(cv.imread("equip/book_7_32.jpg", cv.IMREAD_UNCHANGED))
-
        hsv = []
-        hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0))
-        hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0))
-        hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0))
-        hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0))
-        hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0))
-        hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0))
+        if EMITTER_TO_USE == EMITTER_MUSH:
+            needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_5_32.jpg", cv.IMREAD_UNCHANGED))
+
+            needles.append(cv.imread("equip/mush_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_5_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_6_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_7_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/mush_8_32.jpg", cv.IMREAD_UNCHANGED))
+
+            needles.append(cv.imread("equip/pot_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/pot_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/pot_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/pot_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/pot_5_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/pot_6_32.jpg", cv.IMREAD_UNCHANGED))
+
+            needles.append(cv.imread("equip/bag_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_5_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_6_32.jpg", cv.IMREAD_UNCHANGED))
+            #needles.append(cv.imread("equip/bag_7_32.jpg", cv.IMREAD_UNCHANGED))
+
+            #needles.append(cv.imread("equip/book_6_32.jpg", cv.IMREAD_UNCHANGED))
+            #needles.append(cv.imread("equip/book_7_32.jpg", cv.IMREAD_UNCHANGED))
+
+            hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0))
+        elif EMITTER_TO_USE == EMITTER_AMU:
+            needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/book_5_32.jpg", cv.IMREAD_UNCHANGED))
+
+            needles.append(cv.imread("equip/amu_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_5_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_6_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/amu_7_32.jpg", cv.IMREAD_UNCHANGED))
+
+            needles.append(cv.imread("equip/bag_1_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_2_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_3_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_4_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_5_32.jpg", cv.IMREAD_UNCHANGED))
+            needles.append(cv.imread("equip/bag_6_32.jpg", cv.IMREAD_UNCHANGED))
+            # needles.append(cv.imread("equip/bag_7_32.jpg", cv.IMREAD_UNCHANGED))
+
+            #needles.append(cv.imread("equip/book_6_32.jpg", cv.IMREAD_UNCHANGED))
+            #needles.append(cv.imread("equip/book_7_32.jpg", cv.IMREAD_UNCHANGED))
+
+            hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0))
+            hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0))

        for op in range(1, 50, 1):
            hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0))