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

added sodoku to ui

Browse Source
This commit is contained in:
Thaloria
2023-04-30 21:04:40 +02:00
parent 7af6f0c7ed
commit b64dad8e5b
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
combined_bot_main.py
View File

@@ -56,8 +56,11 @@ def run():
mine = Mine(overlay)
mine.execute_main_loop()
elif overlay.rb_int.get() == 7:
fruit = Sodoku(overlay)
fruit = Fruit(overlay)
fruit.execute_main_loop()
elif overlay.rb_int.get() == 8:
sodo = Sodoku(overlay)
sodo.execute_main_loop()
if __name__ == "__main__":

22
combined_user_interface.py
View File

@@ -32,7 +32,7 @@ class PrimaryOverlay(threading.Thread):
self.Emitter_Box = ttk.Combobox
self.RadioButtons = dict
self.RadioButtonNames = ["Equip", "Crops", "Farm", "Magic", "Craft", "Mine", "Fruit"]
self.RadioButtonNames = ["Equip", "Crops", "Farm", "Magic", "Craft", "Mine", "Fruit", "Sodo"]
self.RadioButton1 = tk.Radiobutton
self.RadioButton2 = tk.Radiobutton
self.RadioButton3 = tk.Radiobutton
@@ -40,12 +40,13 @@ class PrimaryOverlay(threading.Thread):
self.RadioButton5 = tk.Radiobutton
self.RadioButton6 = tk.Radiobutton
self.RadioButton7 = tk.Radiobutton
self.RadioButton8 = tk.Radiobutton
self.StartButton = tk.Button
self.StopButton = tk.Button
self.PauseButton = tk.Button
self.QuitButton = tk.Button
self.TkPosition = '133x329+60+600'
self.TkPosition = '133x354+60+600'
self.setDaemon(True)
self.StatusLabel = tk.Label
@@ -73,7 +74,7 @@ class PrimaryOverlay(threading.Thread):
self.rb_int = tk.IntVar(self.root, value=1)
self.RadioButtons = dict()
# var = tk.IntVar(value=1)
for i in range(1, 8):
for i in range(1, 9):
self.RadioButtons[i] = tk.Radiobutton(self.rb_frame, text=self.RadioButtonNames[i - 1],
variable=self.rb_int,
value=i, command=self.radio_button_callback)
@@ -181,7 +182,7 @@ class PrimaryOverlay(threading.Thread):
self.StopButton.configure(state=tk.NORMAL)
self.PauseButton.configure(state=tk.NORMAL)
self.QuitButton.configure(state=tk.DISABLED)
for i in range(1, 7):
for i in range(1, 9):
tt = self.rb_int.get()
if self.rb_int.get() != i:
(self.RadioButtons[i]).configure(state=tk.DISABLED)
@@ -193,7 +194,7 @@ class PrimaryOverlay(threading.Thread):
self.StopButton.configure(state=tk.DISABLED)
self.PauseButton.configure(state=tk.DISABLED)
self.QuitButton.configure(state=tk.NORMAL)
for i in range(1, 7):
for i in range(1, 9):
self.RadioButtons[i].configure(state=tk.NORMAL)
self.run_mode = 'stopped'
@@ -288,6 +289,17 @@ class PrimaryOverlay(threading.Thread):
self.SpawnLabel.configure(text="")
self.EnergyLabel.configure(text="")
self.hide_mining_overlay()
elif self.rb_int.get() == 8:
self.EnergyEntry.configure(state=tk.DISABLED)
self.energy_use.set('')
self.SpawnEntry.configure(state=tk.DISABLED)
self.spawn_use.set('')
self.Emitter_Box.configure(state=tk.DISABLED)
self.emitter_use.set('')
self.EmitterLabel.configure(text="")
self.SpawnLabel.configure(text="")
self.EnergyLabel.configure(text="")
self.hide_mining_overlay()
def get_run_mode(self):
return self.run_mode

4
equipment.py
View File

@@ -133,7 +133,7 @@ class Equipment(GameBase):
if emitter == EMITTER_MAIN:
loop_time = time()
while True:
if (time() - loop_time) >= 60:
if (time() - loop_time) >= 10:
break
screenshot = self.capture_window.get_screenshot()
c_rectangles = self.vision_stun.find(screenshot, self.c_needle, 0.95, 1, True, self.c_mask)
@@ -152,7 +152,7 @@ class Equipment(GameBase):
for rer in range(0, len(self.needles), 1):
loop_time = time()
while True:
if (time() - loop_time) >= 60:
if (time() - loop_time) >= 20:
break
screenshot = self.capture_window.get_screenshot_by_area(self.config.returnOKWindowPos())
rectangles = self.vision_stun.find(screenshot, self.dig_button, 0.5, 1)