bobber improvements

bots/fishing/FishingAgent.py

@@ -9,18 +9,25 @@ from core.Player import PLAYER_STATE
 
 class FishingAgent:
   def __init__(self, monitor, player) -> None:
-    self.fishingBobberImg = cv.imread("assets/fishing/Bobber.jpg", cv.IMREAD_GRAYSCALE)
+    self.fishingBobberImg = cv.imread("assets/fishing/bobbers/Bobber2.jpg", cv.IMREAD_GRAYSCALE)
     self.fishingIconImg = cv.imread("assets/fishing/FishIcon.jpg", cv.IMREAD_GRAYSCALE)
     self.fishingThread = None
     self.logger = Logger("Fishing Agent")
     self.monitor = monitor
     self.lureLoc = None
     self.player = player
+    self.fail = 0
     self.retry = 0
 
   def startFishing(self):
+    self.player.checkConnection()
     self.player.changeState(PLAYER_STATE.FISHING)
     while self.player.state is PLAYER_STATE.FISHING:
+      if (self.fail > 5):
+        self.fail = 0
+        self.logger.log("Fishing failed too many times. Stopping fishing thread...")
+        self.player.changeState(PLAYER_STATE.IDLE)
+        return
       self.castLure()
 
   def castLure(self):
@@ -43,7 +50,8 @@ class FishingAgent:
 
     if (res == -1):
       if (self.retry > 4):
-        self.logger.log("Took too to find lure long, retrying fishing from the beginning")
+        self.fail += 1
+        self.logger.log("Took too long to find lure, retrying fishing from the beginning")
         return
       else:  
         self.logger.log("Trying again in 1 second...")
@@ -64,13 +72,14 @@ class FishingAgent:
       res = self.monitor.findMatch(self.fishingBobberImg)
       print(self.lureLoc)
       print(res)
-      if (res != -1 and abs(res[1] - self.lureLoc[1]) > 20):
+      if (res != -1 and abs(res[1] - self.lureLoc[1]) > 10):
         time.sleep(0.2)
         pyautogui.click()
         time.sleep(0.5)
         return
       elif (self.retry > 200):
         self.retry = 0
+        self.fail += 1
         return
 
   def run(self):

bots/idling/IdlingAgent.py

@@ -1,15 +1,16 @@
 import time
-import pyautogui
 from threading import Thread
+import pyautogui
 from core.Logger import Logger
 from core.Player import PLAYER_STATE
 
 class IdlingAgent:
-  def __init__(self, playerAgent) -> None:
+  def __init__(self, monitor, playerAgent) -> None:
     self.logger = Logger("Idling Agent")
     self.idleTime = time.time()
     self.idleThread = None
     self.player = playerAgent
+    self.monitor = monitor
 
   def checkIdleTime(self):
     while self.player.state is PLAYER_STATE.IDLE: