added pauses to loop management
This commit is contained in:
@@ -23,8 +23,10 @@ def run():
|
|||||||
overlay.run_mode = 'init'
|
overlay.run_mode = 'init'
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'started':
|
elif overlay.run_mode == 'started':
|
||||||
|
cv.waitKey(1000)
|
||||||
pass
|
pass
|
||||||
elif overlay.run_mode == 'init':
|
elif overlay.run_mode == 'init':
|
||||||
|
cv.waitKey(1)
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'paused':
|
elif overlay.run_mode == 'paused':
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from time import time
|
|||||||
import sys
|
import sys
|
||||||
import cv2 as cv
|
import cv2 as cv
|
||||||
import keyboard
|
import keyboard
|
||||||
from utils import get_click_point, dig_point, check_for_ok_button, check_for_craft_button
|
from utils import get_click_point, dig_point, check_for_craft_ok_button, check_for_craft_button
|
||||||
import pydirectinput
|
import pydirectinput
|
||||||
from craft_overlay import CraftOverlay
|
from craft_overlay import CraftOverlay
|
||||||
from config_file import UserConfigs
|
from config_file import UserConfigs
|
||||||
@@ -26,8 +26,9 @@ def run():
|
|||||||
overlay.run_mode = 'init'
|
overlay.run_mode = 'init'
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'started':
|
elif overlay.run_mode == 'started':
|
||||||
cv.waitKey(500)
|
cv.waitKey(1000)
|
||||||
elif overlay.run_mode == 'init':
|
elif overlay.run_mode == 'init':
|
||||||
|
cv.waitKey(1)
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'finished':
|
elif overlay.run_mode == 'finished':
|
||||||
overlay.update_status_label("finished", "0")
|
overlay.update_status_label("finished", "0")
|
||||||
@@ -308,6 +309,7 @@ def run():
|
|||||||
vision_stun = Vision()
|
vision_stun = Vision()
|
||||||
# odig_overlay = DiggingOverlay(config)
|
# odig_overlay = DiggingOverlay(config)
|
||||||
check_for_craft_button(capture_window2, vision_stun, capture_config)
|
check_for_craft_button(capture_window2, vision_stun, capture_config)
|
||||||
|
check_for_craft_ok_button(capture_window2, vision_stun)
|
||||||
run_counter = run_counter + 1
|
run_counter = run_counter + 1
|
||||||
overlay.update_status_label(mode, run_target - run_counter)
|
overlay.update_status_label(mode, run_target - run_counter)
|
||||||
#check_for_ok_button(capture_window, vision_stun, capture_config)
|
#check_for_ok_button(capture_window, vision_stun, capture_config)
|
||||||
|
|||||||
@@ -15,8 +15,9 @@ def run():
|
|||||||
overlay.run_mode = 'init'
|
overlay.run_mode = 'init'
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'started':
|
elif overlay.run_mode == 'started':
|
||||||
cv.waitKey(500)
|
cv.waitKey(1000)
|
||||||
elif overlay.run_mode == 'init':
|
elif overlay.run_mode == 'init':
|
||||||
|
cv.waitKey(1)
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
# boelk
|
# boelk
|
||||||
|
|||||||
@@ -35,8 +35,10 @@ def run():
|
|||||||
overlay.run_mode = 'init'
|
overlay.run_mode = 'init'
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'started':
|
elif overlay.run_mode == 'started':
|
||||||
|
cv.waitKey(1000)
|
||||||
pass
|
pass
|
||||||
elif overlay.run_mode == 'init':
|
elif overlay.run_mode == 'init':
|
||||||
|
cv.waitKey(1)
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'paused':
|
elif overlay.run_mode == 'paused':
|
||||||
continue
|
continue
|
||||||
@@ -129,7 +131,7 @@ def run():
|
|||||||
|
|
||||||
while True:
|
while True:
|
||||||
if overlay.run_mode == 'paused':
|
if overlay.run_mode == 'paused':
|
||||||
# cv.waitKey(500)
|
cv.waitKey(1)
|
||||||
if (time() - loop_time_p) >= 5:
|
if (time() - loop_time_p) >= 5:
|
||||||
loop_time_p = time()
|
loop_time_p = time()
|
||||||
print("pausing")
|
print("pausing")
|
||||||
|
|||||||
@@ -15,8 +15,9 @@ def run():
|
|||||||
overlay.run_mode = 'init'
|
overlay.run_mode = 'init'
|
||||||
continue
|
continue
|
||||||
elif overlay.run_mode == 'started':
|
elif overlay.run_mode == 'started':
|
||||||
cv.waitKey(500)
|
cv.waitKey(1000)
|
||||||
elif overlay.run_mode == 'init':
|
elif overlay.run_mode == 'init':
|
||||||
|
cv.waitKey(1)
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
# boelk
|
# boelk
|
||||||
|
|||||||
9
utils.py
9
utils.py
@@ -183,6 +183,15 @@ def check_for_craft_button(cap_win, vis, conf):
|
|||||||
for pointi in pointis:
|
for pointi in pointis:
|
||||||
dig_point(pointi[0], pointi[1], 150)
|
dig_point(pointi[0], pointi[1], 150)
|
||||||
|
|
||||||
|
def check_for_craft_ok_button(cap_win, vis):
|
||||||
|
screenshot = cap_win.get_screenshot()
|
||||||
|
rectangles = vis.find(screenshot, cv.imread("ok_button.jpg", cv.IMREAD_UNCHANGED), 0.5, 1)
|
||||||
|
offset_left = 0
|
||||||
|
offset_down = 0
|
||||||
|
if len(rectangles) == 1:
|
||||||
|
pointis = vis.get_click_points(rectangles)
|
||||||
|
for pointi in pointis:
|
||||||
|
dig_point(pointi[0] + offset_left, pointi[1] + offset_down, 150)
|
||||||
|
|
||||||
def get_click_point(rectangle):
|
def get_click_point(rectangle):
|
||||||
# Loop over all the rectangles
|
# Loop over all the rectangles
|
||||||
|
|||||||
Reference in New Issue
Block a user