Thaloria/Litcraft_Python_B
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added pauses to loop management

Browse Source
This commit is contained in:
Thaloria
2022-10-14 20:35:41 +02:00
parent d7316d7d9c
commit b6315f7b0e
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
combine_main_ui.py
View File

@@ -23,8 +23,10 @@ def run():
overlay.run_mode = 'init'
continue
elif overlay.run_mode == 'started':
cv.waitKey(1000)
pass
elif overlay.run_mode == 'init':
cv.waitKey(1)
continue
elif overlay.run_mode == 'paused':
continue

6
craft_table/main_craft.py
View File

@@ -2,7 +2,7 @@ from time import time
import sys
import cv2 as cv
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
from craft_overlay import CraftOverlay
from config_file import UserConfigs
@@ -26,8 +26,9 @@ def run():
overlay.run_mode = 'init'
continue
elif overlay.run_mode == 'started':
cv.waitKey(500)
cv.waitKey(1000)
elif overlay.run_mode == 'init':
cv.waitKey(1)
continue
elif overlay.run_mode == 'finished':
overlay.update_status_label("finished", "0")
@@ -308,6 +309,7 @@ def run():
vision_stun = Vision()
# odig_overlay = DiggingOverlay(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
overlay.update_status_label(mode, run_target - run_counter)
#check_for_ok_button(capture_window, vision_stun, capture_config)

3
crop/main_crop_ui.py
View File

@@ -15,8 +15,9 @@ def run():
overlay.run_mode = 'init'
continue
elif overlay.run_mode == 'started':
cv.waitKey(500)
cv.waitKey(1000)
elif overlay.run_mode == 'init':
cv.waitKey(1)
continue
else:
# boelk

4
equipment_main_ui.py
View File

@@ -35,8 +35,10 @@ def run():
overlay.run_mode = 'init'
continue
elif overlay.run_mode == 'started':
cv.waitKey(1000)
pass
elif overlay.run_mode == 'init':
cv.waitKey(1)
continue
elif overlay.run_mode == 'paused':
continue
@@ -129,7 +131,7 @@ def run():
while True:
if overlay.run_mode == 'paused':
# cv.waitKey(500)
cv.waitKey(1)
if (time() - loop_time_p) >= 5:
loop_time_p = time()
print("pausing")

3
farm/main_farm_ui.py
View File

@@ -15,8 +15,9 @@ def run():
overlay.run_mode = 'init'
continue
elif overlay.run_mode == 'started':
cv.waitKey(500)
cv.waitKey(1000)
elif overlay.run_mode == 'init':
cv.waitKey(1)
continue
else:
# boelk

9
utils.py
View File

@@ -183,6 +183,15 @@ def check_for_craft_button(cap_win, vis, conf):
for pointi in pointis:
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):
# Loop over all the rectangles