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

new ui elements for timing

Browse Source
This commit is contained in:
Thaloria
2022-10-19 08:44:50 +02:00
parent 84c1df4e9a
commit 22592e3a49
8 changed files with 386 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
combined_user_interface.py
View File

@@ -126,20 +126,20 @@ class PrimaryOverlay(threading.Thread):
self.global_timeout_use = tk.StringVar(self.root, value='0')
self.hourly_breaks_use = tk.StringVar(self.root, value='0')
self.break_duration_use = tk.StringVar(self.root, value='3')
self.break_duration_use = tk.StringVar(self.root, value='1-3')
self.global_timeout_label = tk.Label(self.timing_frame, text="Stop after (h):", font=("Helvetica", 10, "bold"),
background="grey", width='13')
background="grey", width='12')
self.hourly_breaks_label = tk.Label(self.timing_frame, text="Breaks:", font=("Helvetica", 10, "bold"),
background="grey", width='13')
background="grey", width='12')
self.break_duration_label = tk.Label(self.timing_frame, text="Break time (m):", font=("Helvetica", 10, "bold"),
background="grey", width='13')
background="grey", width='12')
self.global_timeout_entry = tk.Entry(self.timing_frame, textvariable=self.global_timeout_use, font=("Helvetica", 10, "bold"),
width='2')
width='3')
self.hourly_breaks_entry = tk.Entry(self.timing_frame, textvariable=self.hourly_breaks_use, font=("Helvetica", 10, "bold"),
width='2')
width='3')
self.break_duration_entry = tk.Entry(self.timing_frame, textvariable=self.break_duration_use, font=("Helvetica", 10, "bold"),
width='2', state=tk.DISABLED)
width='3', state=tk.DISABLED)

88
craft.py
View File

@@ -26,19 +26,11 @@ class Craft(GameBase):
self.run_counter = 0
self.dimension = 172
def execute_main_loop(self):
while True:
if self.overlay.run_mode == 'paused':
cv.waitKey(1)
continue
elif self.overlay.run_mode == 'stopped':
break
def assess_playfield_and_make_move(self):
if self.run_counter >= self.run_target:
self.run_counter = 0
self.overlay.run_mode = 'finished'
break
return
ab1 = [420, 1180, 142, 142]
ab2 = [562, 1180, 142, 142]
@@ -58,7 +50,9 @@ class Craft(GameBase):
self.click_square_center(
[770 + (i * self.dimension), 160 + (e * self.dimension), self.dimension, self.dimension])
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_craft_button()
@@ -69,7 +63,9 @@ class Craft(GameBase):
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_square_center(ab10)
elif self.mode == MODE10X2:
for r in range(0, 2, 1):
@@ -90,7 +86,11 @@ class Craft(GameBase):
[770 + (i * self.dimension), 160 + (e * self.dimension), self.dimension,
self.dimension])
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_craft_button()
@@ -101,24 +101,30 @@ class Craft(GameBase):
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_square_center(ab10)
elif self.mode == MODE5X3:
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
for r in range(0, 3, 1):
# grid 770 1630 160 1020 172oo
self.dimension = 172
if r == 0:
self.click_square_center(ab1)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
start = 0
target = 1
elif r == 1:
self.click_square_center(ab2)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
start = 1
target = 2
else:
self.click_square_center(ab3)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
start = 2
target = 3
@@ -128,20 +134,26 @@ class Craft(GameBase):
[770 + (i * self.dimension), 160 + (e * self.dimension), self.dimension,
self.dimension])
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_craft_button()
for i in range(0, 1, 1):
if self.overlay.run_mode == 'stopped':
break
return
for e in range(0, 5, 1):
self.collect_grid_reverse_click(
[770 + (i * self.dimension), 160 + (e * self.dimension), self.dimension, self.dimension])
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.click_square_center(ab10)
elif self.mode == MODE1X5_T:
tps = [ab1,
@@ -157,21 +169,21 @@ class Craft(GameBase):
for tp in tps:
self.click_square_center(tp)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_craft_button()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(result_tp)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab10)
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
elif self.mode == MODE1X5_X:
tps = [ab1,
[770 + (0 * self.dimension), 160 + (3 * self.dimension), self.dimension, self.dimension],
@@ -185,21 +197,21 @@ class Craft(GameBase):
for tp in tps:
self.click_square_center(tp)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_craft_button()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(result_tp)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab10)
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
elif self.mode == MODE_HOUSE:
cements = [[770 + (0 * self.dimension), 160 + (4 * self.dimension), self.dimension, self.dimension],
[770 + (1 * self.dimension), 160 + (4 * self.dimension), self.dimension, self.dimension],
@@ -235,53 +247,53 @@ class Craft(GameBase):
for cement in cements:
self.click_square_center(cement)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab2)
for brick in bricks:
self.click_square_center(brick)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab3)
for board in boards:
self.click_square_center(board)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab4)
for glass in glasses:
self.click_square_center(glass)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab5)
self.click_square_center(tp_hammer)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(ab6)
self.click_square_center(tp_nails)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_craft_button()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.click_square_center(tp_result)
self.click_square_center(ab10)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
elif self.mode == MODE_SIMPLE_STACK:
# initialize the StunWindowCapture class
capture_config = UserConfigs()
@@ -293,7 +305,11 @@ class Craft(GameBase):
vision_stun = Vision()
# dig_overlay = DiggingOverlay(config)
check_for_craft_button(capture_window2, vision_stun)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
check_for_craft_ok_button(capture_window2, vision_stun)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return
self.run_counter = self.run_counter + 1
self.overlay.update_status_label(self.mode + ": " + str(self.run_target - self.run_counter))
# check_for_ok_button(capture_window, vision_stun, capture_config)

12
crops.py
View File

@@ -203,9 +203,9 @@ class Crops(GameBase):
for y in range(0, 14, 1):
self.data_score_map[x, y] = self.score_for_attached_same_color_all_directions(state, x, y)
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
full_moves = []
reserve_moves = []
@@ -223,18 +223,18 @@ class Crops(GameBase):
if len(path_option) >= 5:
full_moves.append((state[x, y], path_option))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.data_score_map[x, y] >= 1:
path_option = [[x, y]]
self.find_next_same_color_all_directions_recursion2(state, x, y, path_option)
if len(path_option) >= 3:
reserve_moves.append((state[x, y], path_option))
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
# print(self.data_score_map)
# screenshot = cv.imread("screenshot_scored.jpg")

2
equipment.py
View File

@@ -91,8 +91,10 @@ class Equipment(GameBase):
self.energy_counter = 0
def execute_main_loop(self):
breaks = self.init_breaks()
for emitter in self.emitters:
while True:
self.check_breaks()
if self.overlay.run_mode == 'paused':
cv.waitKey(1)
continue

16
farm.py
View File

@@ -140,9 +140,9 @@ class Farm(GameBase):
if self.check_explosives(state, e, i):
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
for e in range(0, 8, 1):
for i in range(0, 14, 1):
@@ -150,11 +150,11 @@ class Farm(GameBase):
if self.check_5s(state, e, i, color):
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
for e in range(0, 8, 1):
for i in range(0, 14, 1):
@@ -166,11 +166,11 @@ class Farm(GameBase):
if self.check_3_with_gap(state, e, i, color):
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
def detonate_explosive_when_stuck(self, state):
for e in range(0, 8, 1):

31
game_base_class.py
View File

@@ -63,30 +63,39 @@ class GameBase:
def execute_main_loop(self):
start_time = time()
breaks = self.init_breaks()
while True:
self.check_breaks()
if self.overlay.run_mode == 'paused':
cv.waitKey(1)
continue
elif self.overlay.run_mode == 'stopped':
break
elif self.overlay.run_mode == 'finished':
break
self.assess_playfield_and_make_move()
cv.waitKey(500)
def init_breaks(self):
breaks = []
#breaks.append(7)
for i in range(1, int(self.breaks) + 1, 1):
avr_in_sec = int(self.stop_time) * 60 * 60 / int(self.breaks)
breaks.append(random.randint(i * avr_in_sec * 0.60, i * avr_in_sec))
while True:
return breaks
def check_breaks(self):
if (time() - start_time) > float(self.stop_time) * 60 * 60:
self.overlay.run_mode = 'stopped'
for break_ in breaks:
elapsed = int(time() - start_time)
if elapsed > break_:
pause = random.randint(1, 3)
self.overlay.update_status_label("Paused " + str(pause) + " minutes")
cv.waitKey(pause *60 *1000)
self.overlay.update_status_label("Break: " + str(pause) + "m")
cv.waitKey(pause * 60 * 1000)
breaks.remove(break_)
self.overlay.update_status_label("running")
if self.overlay.run_mode == 'paused':
cv.waitKey(1)
continue
elif self.overlay.run_mode == 'stopped':
break
self.assess_playfield_and_make_move()
cv.waitKey(500)
def assess_playfield_and_make_move(self):
pass

26
magic.py
View File

@@ -38,15 +38,7 @@ class Magic(GameBase):
cv.IMREAD_UNCHANGED))
self.hsv_list.append(self.hsv_filter_list[key1])
def execute_main_loop(self):
while True:
if self.overlay.run_mode == 'paused':
cv.waitKey(1)
continue
elif self.overlay.run_mode == 'stopped':
break
def assess_playfield_and_make_move(self):
screenshot = self.capture_window.get_screenshot()
# screenshot = cv.imread("buffbar.jpg")
@@ -64,7 +56,7 @@ class Magic(GameBase):
cv.waitKey(30 + w)
pydirectinput.mouseUp()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
else:
spawn_0 = self.vision_stun.find(screenshot, cv.imread("magic/spawn_0.jpg", cv.IMREAD_UNCHANGED), 0.7, 1)
points = self.vision_stun.get_click_points(spawn_0)
@@ -74,10 +66,10 @@ class Magic(GameBase):
cv.waitKey(500)
pydirectinput.mouseUp()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
continue
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
# for needles in needle_list:
for rer in range(0, len(self.needle_list), 1):
while True:
@@ -98,13 +90,13 @@ class Magic(GameBase):
pydirectinput.moveTo(points[1][0], points[1][1])
pydirectinput.mouseUp()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
else:
break
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
needles_white = [cv.imread("magic/body_w.jpg", cv.IMREAD_UNCHANGED),
cv.imread("magic/finding_w.jpg", cv.IMREAD_UNCHANGED),
@@ -145,6 +137,6 @@ class Magic(GameBase):
pydirectinput.mouseUp()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
break
return

2
mine.py
View File

@@ -38,7 +38,9 @@ class Mine(GameBase):
self.execute_loop()
def execute_loop(self):
breaks = self.init_breaks()
while True:
self.check_breaks()
if self.overlay.run_mode == 'paused':
cv.waitKey(10)
self.overlay.show_mining_overlay()