diff --git a/dig/1.jpg b/dig/1.jpg new file mode 100644 index 0000000..4b9f2e0 Binary files /dev/null and b/dig/1.jpg differ diff --git a/dig/2.jpg b/dig/2.jpg new file mode 100644 index 0000000..606538a Binary files /dev/null and b/dig/2.jpg differ diff --git a/dig/3.jpg b/dig/3.jpg new file mode 100644 index 0000000..dcc8791 Binary files /dev/null and b/dig/3.jpg differ diff --git a/dig/4.jpg b/dig/4.jpg new file mode 100644 index 0000000..a765952 Binary files /dev/null and b/dig/4.jpg differ diff --git a/dig/Brown0.jpg b/dig/Brown0.jpg new file mode 100644 index 0000000..acdde21 Binary files /dev/null and b/dig/Brown0.jpg differ diff --git a/dig/D1.jpg b/dig/D1.jpg new file mode 100644 index 0000000..b7e7bdb Binary files /dev/null and b/dig/D1.jpg differ diff --git a/dig/D2.jpg b/dig/D2.jpg new file mode 100644 index 0000000..5faf0b8 Binary files /dev/null and b/dig/D2.jpg differ diff --git a/dig/D3.jpg b/dig/D3.jpg new file mode 100644 index 0000000..195b20e Binary files /dev/null and b/dig/D3.jpg differ diff --git a/dig/D4.jpg b/dig/D4.jpg new file mode 100644 index 0000000..c96b42f Binary files /dev/null and b/dig/D4.jpg differ diff --git a/dig/D5.jpg b/dig/D5.jpg new file mode 100644 index 0000000..ebe36fc Binary files /dev/null and b/dig/D5.jpg differ diff --git a/dig/D6.jpg b/dig/D6.jpg new file mode 100644 index 0000000..deb99ba Binary files /dev/null and b/dig/D6.jpg differ diff --git a/dig/D7.jpg b/dig/D7.jpg new file mode 100644 index 0000000..cdfb526 Binary files /dev/null and b/dig/D7.jpg differ diff --git a/dig/H1.jpg b/dig/H1.jpg new file mode 100644 index 0000000..2c4fe44 Binary files /dev/null and b/dig/H1.jpg differ diff --git a/dig/H2.jpg b/dig/H2.jpg new file mode 100644 index 0000000..89ac528 Binary files /dev/null and b/dig/H2.jpg differ diff --git a/dig/H3.jpg b/dig/H3.jpg new file mode 100644 index 0000000..9c090c5 Binary files /dev/null and b/dig/H3.jpg differ diff --git a/dig/H4.jpg b/dig/H4.jpg new file mode 100644 index 0000000..6cc4922 Binary files /dev/null and b/dig/H4.jpg differ diff --git a/dig/digging.jpg b/dig/digging.jpg new file mode 100644 index 0000000..250e0e9 Binary files /dev/null and b/dig/digging.jpg differ diff --git a/dig/digging2.jpg b/dig/digging2.jpg new file mode 100644 index 0000000..4cc3836 Binary files /dev/null and b/dig/digging2.jpg differ diff --git a/dig/digging3.jpg b/dig/digging3.jpg new file mode 100644 index 0000000..96f3dea Binary files /dev/null and b/dig/digging3.jpg differ diff --git a/dig/digging4.jpg b/dig/digging4.jpg new file mode 100644 index 0000000..b0ea64d Binary files /dev/null and b/dig/digging4.jpg differ diff --git a/dig/down.jpg b/dig/down.jpg new file mode 100644 index 0000000..af44e6d Binary files /dev/null and b/dig/down.jpg differ diff --git a/dig/left.jpg b/dig/left.jpg new file mode 100644 index 0000000..c09a497 Binary files /dev/null and b/dig/left.jpg differ diff --git a/dig/ok_button.jpg b/dig/ok_button.jpg new file mode 100644 index 0000000..d78f586 Binary files /dev/null and b/dig/ok_button.jpg differ diff --git a/dig/right.jpg b/dig/right.jpg new file mode 100644 index 0000000..0344387 Binary files /dev/null and b/dig/right.jpg differ diff --git a/dig/test1.jpg b/dig/test1.jpg new file mode 100644 index 0000000..de54a6c Binary files /dev/null and b/dig/test1.jpg differ diff --git a/dig/up.jpg b/dig/up.jpg new file mode 100644 index 0000000..13e470e Binary files /dev/null and b/dig/up.jpg differ diff --git a/dig/wtf.jpg b/dig/wtf.jpg new file mode 100644 index 0000000..2b3242f Binary files /dev/null and b/dig/wtf.jpg differ diff --git a/digging_main2.py b/digging_main2.py index 95b0f41..2a505bd 100644 --- a/digging_main2.py +++ b/digging_main2.py @@ -1,5 +1,6 @@ from config_file import UserConfigs import keyboard +import cv2 as cv from utils import dig_point, check_for_ok_button from window_capture import WindowCapture from vision import Vision @@ -12,6 +13,8 @@ def run(): # initialize the StunWindowCapture class capture_config = UserConfigs() capture_window = WindowCapture(None, "screen_conf", capture_config) + + # initialize the StunVision class vision_stun = Vision() dig_overlay = DiggingOverlay(config) @@ -22,7 +25,7 @@ def run(): width = 32 depth = 24 plot_size = 45 - DIG_TIME = 150 + DIG_TIME = 100 while True: if keyboard.is_pressed('p') == True: @@ -38,11 +41,15 @@ def run(): continue dig_overlay.hide_window() - if level == 21: + if level >= 40: + break + if level == 23: DIG_TIME = 850 - if level == 24: + if level == 27: DIG_TIME = 1850 - if level % 2 == 0: + if level <= 10: + plot_size = plot_size - 1 + elif level % 2 == 0: plot_size = plot_size - 1 p1 = int((config.returnDiggingWindowPos2()[0] / 2) + config.returnDiggingWindowPos2()[2]) @@ -64,11 +71,38 @@ def run(): for f in range(0, e, 1): # up 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 + ''' + x = int(tp1 - (plot_size / 2)) + y = int(tp2 - ((e * plot_size) - (plot_size / 2))) + w = plot_size + h = plot_size * e + capture_win_lanes = WindowCapture(None, "lanes", None, (w, h, x+w, y+h)) + screenshot = capture_win_lanes.get_screenshot() + needlew = cv.imread("test1.jpg", cv.IMREAD_UNCHANGED) + res = vision_stun.find(needlew, screenshot, 0.9, 1) + if len(res) >= 1: + break + #vision_stun.draw_rectangles(needlew, res) + #cv.imshow("screenshot", needlew) + #cv.waitKey(150) + + + # ul[0], ul[1], plot_size, plotsize*e + + # ll -> tp1 - plot/2 ooooooooooo + # -> tp2 + plot/2 + # ul -> tp1 - plot/2 + # -> tp2 - e*plot - plot/2 + # lr -> tp1 + plot/2 + # -> tp2 - plot/2 + # ur -> tp1 + plot/2 + # -> tp2 - e*plot - plot/2 + ''' dig_point(tp1, tp2, DIG_TIME) # cv.circle(screenshot, (tp1, tp2), 7, (255, 0, 255), -1) # cv.imshow("screenshot", screenshot) @@ -83,8 +117,18 @@ def run(): for g in range(0, e, 1): # right click tp1 = tp1 + plot_size - if tp2 <= config.returnDiggingWindowPos2()[3] + plot_size: + if tp2 <= config.returnDiggingWindowPos2()[3] + (plot_size / 2): continue + + # ll -> tp1 - plot/2 + # -> tp2 + plot/2 + # ul -> tp1 - plot/2 + # -> tp2 - plot/2 + # lr -> tp1 + e*plot + plot/2 + # -> tp2 + plot/2 + # ur -> tp1 + e*plot + plot/2 + # -> tp2 - plot/2 + dig_point(tp1, tp2, DIG_TIME) # cv.circle(screenshot, (tp1, tp2), 7, (127, 0, 255), -1) # cv.imshow("screenshot", screenshot) @@ -117,7 +161,7 @@ def run(): for u in range(0, e, 1): # left click tp1 = tp1 - plot_size - if tp2 >= config.returnDiggingWindowPos2()[1] + plot_size: + if tp2 >= config.returnDiggingWindowPos2()[1] + (plot_size / 2): continue dig_point(tp1, tp2, DIG_TIME) # cv.circle(screenshot, (tp1, tp2), 7, (0, 0, 255), -1) diff --git a/utils.py b/utils.py index 007ddb3..6b0203a 100644 --- a/utils.py +++ b/utils.py @@ -156,6 +156,7 @@ def update_screenshot_with_short_pic_list(short_pic_lst, lst_bl_items): def dig_point(point1, point2, dig_time): pydirectinput.moveTo(point1, point2) + cv.waitKey(50) pydirectinput.mouseDown() w = random.randint(1, 50) cv.waitKey(dig_time + w) diff --git a/window_capture.py b/window_capture.py index 4098637..ae21779 100644 --- a/window_capture.py +++ b/window_capture.py @@ -17,7 +17,7 @@ class WindowCapture: offset_y = 0 # constructor - def __init__(self, window_name, area, config): + def __init__(self, window_name, area, config, coords = 0): # find the handle for the window we want to capture. # if no window name is given, capture the entire screen if window_name is None: @@ -37,6 +37,8 @@ class WindowCapture: val = config.returnEquipmentWindowPos() elif area == "screen_conf": val = config.returnOKWindowPos() + elif area == "lanes": + val = coords else: val = config.returnFullScreenWindowPos()