From dddfa60c77ca65ca67d8c1f996a859c456e093e7 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Mon, 2 May 2022 21:20:15 +0200 Subject: [PATCH] refactor dig --- digging_main2.py | 18 +++++------------- utils.py | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/digging_main2.py b/digging_main2.py index 9806890..08f156d 100644 --- a/digging_main2.py +++ b/digging_main2.py @@ -36,20 +36,12 @@ def run(): continue if level == 3: - plot_size = 45 width = 30 - elif level == 5: - plot_size = 43 - width = 28 - elif level == 7: - plot_size = 41 - width = 26 - elif level == 9: - plot_size = 39 - elif level == 11: - plot_size = 37 - else: - pass + if level == 17: + DIG_TIME = 1850 + + plot_size = plot_size - level + p1 = int((config.returnDiggingWindowPos2()[0] / 2) + config.returnDiggingWindowPos2()[2]) diff --git a/utils.py b/utils.py index ef86cdf..d933472 100644 --- a/utils.py +++ b/utils.py @@ -167,8 +167,8 @@ def dig_point(point1, point2, dig_time): def check_for_ok_button(cap_win, vis, conf): screenshot = cap_win.get_screenshot() rectangles = vis.find(screenshot, cv.imread("dig/ok_button.jpg", cv.IMREAD_UNCHANGED), 0.5, 1) - offset_left = conf.returnDiggingWindowPos2()[2] - offset_down = conf.returnDiggingWindowPos2()[3] + offset_left = conf.returnOKWindowPos()[2] + offset_down = conf.returnOKWindowPos()[3] if len(rectangles) == 1: pointis = vis.get_click_points(rectangles) for pointi in pointis: