refactor dig

This commit is contained in:
2022-05-01 18:45:12 +02:00
parent 1b774b0a75
commit c0d02bf7bf
3 changed files with 21 additions and 229 deletions

View File

@@ -78,29 +78,29 @@ def run():
needles.append(cv.imread("dig/3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/4.jpg", cv.IMREAD_UNCHANGED))
else:
needles.append(cv.imread("H1.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("H2.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("H3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("H4.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D1.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D2.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D4.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D5.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D6.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("D7.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/H1.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/H2.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/H3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/H4.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D1.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D2.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D3.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D4.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D5.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D6.jpg", cv.IMREAD_UNCHANGED))
needles.append(cv.imread("dig/D7.jpg", cv.IMREAD_UNCHANGED))
for needle in needles:
# do object detection
screenshot = capture_window.get_screenshot()
rectangles = vision_stun.find(screenshot, needle, 0.7, 1)
rectangles = vision_stun.find(screenshot, needle, 0.8, 1)
# draw the detection results onto the original image
if len(rectangles) == 0:
continue
# output_image = vision_stun.draw_rectangles(screenshot, rectangles)
# cv.imshow("output_image", output_image)
# cv.waitKey(150)
#output_image = vision_stun.draw_rectangles(screenshot, rectangles)
#cv.imshow("output_image", output_image)
#cv.waitKey(150)
# only trigger ocr reading if a stun is detected
points = vision_stun.get_click_points(rectangles)
@@ -116,8 +116,8 @@ def run():
left = int(round(rectangles[0][0] / size, 0)) # 4
down = int(round(rectangles[0][1] / size, 0)) # 23
offset_left = config.returnMagicWindowPos()[2]
offset_down = config.returnMagicWindowPos()[3]
offset_left = config.returnDiggingWindowPos()[2]
offset_down = config.returnDiggingWindowPos()[3]
# 167 1055 start
# 3x47 left 26x right to 30
# 1x down 22x up to 24
@@ -130,7 +130,7 @@ def run():
pydirectinput.moveTo(i + offset_left, f + offset_down)
pydirectinput.mouseDown()
w = random.randint(1, 50)
cv.waitKey(850 + w)
cv.waitKey(150 + w)
pydirectinput.mouseUp()
if keyboard.is_pressed('p') == True or pause == True:
pause = True
@@ -138,7 +138,7 @@ def run():
if PLOT_TO_USE == "main_plot":
screenshot = capture_window.get_screenshot()
rectangles = vision_stun.find(screenshot, cv.imread("dig/ok_button.jpg", cv.IMREAD_UNCHANGED), 0.8,
rectangles = vision_stun.find(screenshot, cv.imread("dig/ok_button.jpg", cv.IMREAD_UNCHANGED), 0.5,
1)
# draw the detection results onto the original image
output_image = vision_stun.draw_rectangles(screenshot, rectangles)