diff --git a/config_file.py b/config_file.py index 219da36..0350035 100644 --- a/config_file.py +++ b/config_file.py @@ -79,6 +79,16 @@ class UserConfigs: else: pass + def returnEnemyPlayerOverlayPos(self): + if self.user == self.THALOUSER: + return '1440x1150+570+22' + elif self.user == self.ADWAUSER: + return '160x160+-900+600' + elif self.user == self.EDDIEUSER: + return '330x45+-900+920' + else: + pass + def return_database_ip(self): if self.user == self.THALOUSER: return "192.168.178.201" diff --git a/dig_overlay.py b/dig_overlay.py new file mode 100644 index 0000000..b80a909 --- /dev/null +++ b/dig_overlay.py @@ -0,0 +1,34 @@ +# Run tkinter code in another thread +import threading +import tkinter as tk + + +class DiggingOverlay(threading.Thread): + EMPTYENEMYLABELNAME = "no enemy selected" + + def __init__(self, config): + threading.Thread.__init__(self) + self.root = tk.Tk + self.EnemyLabel = tk.Label + self.TkPosition = config.returnEnemyPlayerOverlayPos() + self.start() + + def run(self): + self.root = tk.Tk() + #self.EnemyLabel = tk.Label(self.root, text = "this", borderwidth=6, relief="solid") + #self.EnemyLabel.pack() + + self.root.geometry(self.TkPosition) + self.root.overrideredirect(1) # fenster ohne aussen rum :-) + self.root.attributes('-alpha', 0.5) # fenster transparent + self.root.attributes('-topmost', 1) # fenster immer im vordergrund + self.root.resizable(False, False) + #self.root.attributes('-borderwith', 6) # fenster immer im vordergrund + self.root.wm_attributes("-disabled", True) + #self.root.configure(background='black') + self.root.mainloop() + + def hide_window(self): + self.root.attributes('-alpha', 0.0) + def show_window(self): + self.root.attributes('-alpha', 0.2) \ No newline at end of file diff --git a/digging_main2.py b/digging_main2.py index 08f156d..406f631 100644 --- a/digging_main2.py +++ b/digging_main2.py @@ -3,6 +3,7 @@ import keyboard from utils import dig_point, check_for_ok_button from window_capture import WindowCapture from vision import Vision +from dig_overlay import DiggingOverlay def run(): # initialize the user-class @@ -12,7 +13,7 @@ def run(): capture_window = WindowCapture(None, "screen_conf", capture_config) # initialize the StunVision class vision_stun = Vision() - + dig_overlay = DiggingOverlay(config) pause = True @@ -32,15 +33,18 @@ def run(): print('o pressed') if pause: # cv.waitKey(500) + dig_overlay.show_window() print("pausing") continue + dig_overlay.hide_window() if level == 3: width = 30 if level == 17: - DIG_TIME = 1850 + DIG_TIME = 150 - plot_size = plot_size - level + if level % 3 == 0: + plot_size = plot_size - level @@ -100,9 +104,9 @@ def run(): for r in range(0, e, 1): # down click tp2 = tp2 + plot_size - if tp2 >= config.returnDiggingWindowPos2()[1] + plot_size: + if tp2 >= config.returnDiggingWindowPos2()[1] + (plot_size / 2): continue - if tp2 <= config.returnDiggingWindowPos2()[3] + plot_size: + if tp2 <= config.returnDiggingWindowPos2()[3] + (plot_size / 2): continue dig_point(tp1, tp2, DIG_TIME) #cv.circle(screenshot, (tp1, tp2), 7, (255, 0, 127), -1) diff --git a/equip/chest_1_32.jpg b/equip/chest_1_32.jpg deleted file mode 100644 index 3a4391a..0000000 Binary files a/equip/chest_1_32.jpg and /dev/null differ diff --git a/equip/chest_2_32.jpg b/equip/chest_2_32.jpg deleted file mode 100644 index 17c547b..0000000 Binary files a/equip/chest_2_32.jpg and /dev/null differ diff --git a/equip/chest_3_32.jpg b/equip/chest_3_32.jpg deleted file mode 100644 index 6ce5e08..0000000 Binary files a/equip/chest_3_32.jpg and /dev/null differ diff --git a/equip/key_1_32.jpg b/equip/key_1_32.jpg deleted file mode 100644 index d222d1e..0000000 Binary files a/equip/key_1_32.jpg and /dev/null differ diff --git a/equip/key_2_32.jpg b/equip/key_2_32.jpg deleted file mode 100644 index 434ba0e..0000000 Binary files a/equip/key_2_32.jpg and /dev/null differ diff --git a/equip/key_3_32.jpg b/equip/key_3_32.jpg index bda5ccb..4299f11 100644 Binary files a/equip/key_3_32.jpg and b/equip/key_3_32.jpg differ diff --git a/equipment_main.py b/equipment_main.py index 63726fa..d14751b 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -20,7 +20,7 @@ def run(): EMITTER_MUSH = "mushroom" EMITTER_AMU = "amulett" - EMITTER_TO_USE = EMITTER_MUSH + EMITTER_TO_USE = EMITTER_MAIN # initialize the StunWindowCapture class try: @@ -73,7 +73,9 @@ def run(): 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) + spawn_1 = vision_stun.find(screenshot, cv.imread("equip/amu_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) + elif EMITTER_TO_USE == EMITTER_MAIN: + spawn_1 = vision_stun.find(screenshot, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) else: break #spawn_1 = vision_stun.find(screenshot, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) @@ -91,10 +93,12 @@ def run(): print('q pressed') break else: - if EMITTER_TO_USE == EMITTER_AMU: + if EMITTER_TO_USE == EMITTER_MUSH: 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) + elif EMITTER_TO_USE == EMITTER_MAIN: + spawn_0 = vision_stun.find(screenshot, cv.imread("equip/main_e1_32.jpg", cv.IMREAD_UNCHANGED), 0.8, 1) else: break points = vision_stun.get_click_points(spawn_0) @@ -112,7 +116,7 @@ def run(): needles = [] hsv = [] 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)) @@ -146,7 +150,6 @@ def run(): #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)) @@ -177,6 +180,40 @@ def run(): #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)) + + elif EMITTER_TO_USE == EMITTER_MAIN: + 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/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/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/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)) 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)) @@ -184,6 +221,10 @@ def run(): 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)) + hsv.append(HsvFilter(13, 40, 85, 135, 255, 255, 0, 0, 55, 53)) + hsv.append(HsvFilter(14, 0, 0, 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))