From 19926a797301a255835ecd51bee7809eaa0afd99 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Sun, 16 Oct 2022 00:53:05 +0200 Subject: [PATCH] added spawn option to combine overlay fixed perceiving red bug --- combine_main_ui.py | 6 ++++-- combine_overlay.py | 17 ++++++++++++++--- magic/perceiving_0.jpg | Bin 3782 -> 3217 bytes 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/combine_main_ui.py b/combine_main_ui.py index 07b6209..ebea974 100644 --- a/combine_main_ui.py +++ b/combine_main_ui.py @@ -37,6 +37,8 @@ def run(): else: break + SPAWN_COUNT = int(overlay.spawn_use.get()) + capture_window = WindowCapture(None, "magic", config) # initialize the StunVision class @@ -86,11 +88,11 @@ def run(): #cv.waitKey(150) #continue - spawn_1 = vision_stun.find(screenshot, cv.imread("magic/spawn_1.jpg", cv.IMREAD_UNCHANGED), 0.25, 1) + spawn_1 = vision_stun.find(screenshot, cv.imread("magic/spawn_1.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) if len(spawn_1) == 1: spawn_button_active = True points = vision_stun.get_click_points(spawn_1) - for i in range(0, 100, 1): + for i in range(0, SPAWN_COUNT, 1): pydirectinput.moveTo(points[0][0], points[0][1]) pydirectinput.mouseDown() w = random.randint(1, 50) diff --git a/combine_overlay.py b/combine_overlay.py index 16a17b6..477e004 100644 --- a/combine_overlay.py +++ b/combine_overlay.py @@ -13,11 +13,15 @@ class CombineOverlay(threading.Thread): self.root = tk.Tk + self.spawn_use = tk.StringVar + self.SpawnLabel = tk.Label + self.SpawnEntry = tk.Entry + self.ButtonFrame = tk.Frame self.StartButton = tk.Button self.StopButton = tk.Button - self.TkPosition = '133x52+60+600' + self.TkPosition = '133x75+60+600' self.StatusLabel = tk.Label @@ -25,12 +29,19 @@ class CombineOverlay(threading.Thread): def run(self): self.root = tk.Tk() + self.spawn_use = tk.StringVar(self.root, value='100') + self.SpawnLabel = tk.Label(self.root, text="Spawn:", font=("Helvetica", 10, "bold"), + background="grey") + self.SpawnLabel.grid(row=0, column=0) + self.SpawnEntry = tk.Entry(self.root, textvariable=self.spawn_use, font=("Helvetica", 10, "bold"), width='12') + + self.SpawnEntry.grid(row=0, column=1, columnspan=2) self.ButtonFrame = tk.Frame(self.root) self.StartButton = tk.Button(self.ButtonFrame, text="Start", command=self.start_button_callback, width='8') - self.StartButton.grid(row=0, column=0) + self.StartButton.grid(row=1, column=0) self.StopButton = tk.Button(self.ButtonFrame, text="Stop", command=self.stop_button_callback, width='8', state=tk.DISABLED) - self.StopButton.grid(row=0, column=1) + self.StopButton.grid(row=1, column=1) self.ButtonFrame.grid(row=3, column=0, columnspan=2) diff --git a/magic/perceiving_0.jpg b/magic/perceiving_0.jpg index a8ce41357f3fce5d928bd85e117977e10eef5916..fe5a27224b94896f2ae0bb16318e2df395f03be3 100644 GIT binary patch delta 2590 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 AEdT%j delta 3159 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