diff --git a/fishy/FishybotESO.lnk b/fishy/FishybotESO.lnk index 4b51d48..6416db2 100644 Binary files a/fishy/FishybotESO.lnk and b/fishy/FishybotESO.lnk differ diff --git a/fishy/__init__.py b/fishy/__init__.py index bb9d58d..168b65f 100644 --- a/fishy/__init__.py +++ b/fishy/__init__.py @@ -1,2 +1,2 @@ from fishy.__main__ import main -__version__ = "0.2.6" +__version__ = "0.2.8" diff --git a/fishy/__main__.py b/fishy/__main__.py index 8c26167..bf1ad98 100644 --- a/fishy/__main__.py +++ b/fishy/__main__.py @@ -45,12 +45,11 @@ class Fishy: FishingMode("look", 2, LookEvent()) FishingMode("idle", 3, IdleEvent(ip != "")) - logging.info("Starting the bot engine, look at the fishing hole to start fishing") - self.fishPixWindow = Window(color=cv2.COLOR_RGB2HSV) # check for game window and stuff self.gui.call(GUIFunction.STARTED, (True,)) + logging.info("Starting the bot engine, look at the fishing hole to start fishing") Thread(target=wait_and_check).start() while self.start: # Services to be ran in the start of the main loop @@ -116,8 +115,6 @@ def initialize(c: Config, gui): sys.excepthook = helper.unhandled_exception_logging - - def wait_and_check(): time.sleep(10) if not G.FishingStarted: diff --git a/fishy/systems/gui.py b/fishy/systems/gui.py index 2adcafb..d8c9a63 100644 --- a/fishy/systems/gui.py +++ b/fishy/systems/gui.py @@ -116,7 +116,7 @@ class GUI: # region controls left_frame = Frame(controls_frame) - # Label(left_frame, text="Android IP").grid(row=0, column=0) + Label(left_frame, text="Android IP").grid(row=0, column=0) ip = Entry(left_frame) ip.insert(0, self.config.get("ip", "")) ip.grid(row=0, column=1) @@ -182,7 +182,7 @@ class GUI: if func[0] == GUIFunction.LOG: self._write_to_console(func[1][0]) elif func[0] == GUIFunction.STARTED: - # self._bot_running = func[1][0] + self._bot_running = func[1][0] self.start_button["text"] = "STOP" if self._bot_running else "START" elif func[0] == GUIFunction.ASK_DIRECTORY: messagebox.showinfo("Directory?", func[1][1])