Merge branch '1bananachicken:main' into main

Author: EeeMaoY

agent/custom/action/auto_buy_fish_bait.py

@@ -33,7 +33,6 @@ class AutoBuyFishBait(CustomAction):
     buy_success_template = cv2.imread(str(buy_success_img), cv2.IMREAD_COLOR)
 
     def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunResult:
-        bait_region = [208, 209, 59, 27]
         fish_shop_region = [35, 88, 410, 475]
         find_bait_success_region = [1044, 131, 68, 23]
         select_max_region = [1202, 620, 33, 32]
@@ -47,16 +46,18 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
         controller = context.tasker.controller  
         print("=== AutoBuyFishBait Action Started ===")
 
+        match_threshold = 0.7
         while True:
             img = get_image(controller)
-            found_bait, _, x, y = match_template_in_region(img, fish_shop_region, self.bait_template, 0.8)
+            found_bait, prob, x, y = match_template_in_region(img, fish_shop_region, self.bait_template, match_threshold)
+            print(f"Clicked on bait at ({x+15}, {y+5}), probability: {prob:.2f}")
             if found_bait:
                 for _ in range(3):
-                    click_rect(controller, [x, y, bait_region[2], bait_region[3]])
+                    click_rect(controller, [x, y, 30, 10])
                     time.sleep(0.1)
 
                 img = get_image(controller)
-                found_bait_success, _, _, _ = match_template_in_region(img, find_bait_success_region, self.find_bait_success_template, 0.8)
+                found_bait_success, _, _, _ = match_template_in_region(img, find_bait_success_region, self.find_bait_success_template, match_threshold)
                 if found_bait_success:
                     img = get_image(controller)
                     time.sleep(0.5)
@@ -69,7 +70,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
 
         while True:
             img = get_image(controller)
-            found_select_max, _, _, _ = match_template_in_region(img, select_max_region, self.select_max_template, 0.8)
+            found_select_max, _, _, _ = match_template_in_region(img, select_max_region, self.select_max_template, match_threshold)
             if found_select_max:
                 for _ in range(3):
                     click_rect(controller, select_max_region)
@@ -82,7 +83,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
 
         while True:
             img = get_image(controller)
-            found_buy, _, _, _ = match_template_in_region(img, buy_region, self.buy_template, 0.8)
+            found_buy, _, _, _ = match_template_in_region(img, buy_region, self.buy_template, match_threshold)
             if found_buy:
                 for _ in range(3):
                     click_rect(controller, buy_region)
@@ -95,7 +96,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
 
         for _ in range(5):
             img = get_image(controller)
-            found_buy_confirm, _, _, _ = match_template_in_region(img, buy_confirm_region, self.buy_confirm_template, 0.8)
+            found_buy_confirm, _, _, _ = match_template_in_region(img, buy_confirm_region, self.buy_confirm_template, match_threshold)
             if found_buy_confirm:
                 for _ in range(3):
                     click_rect(controller, buy_confirm_region)
@@ -108,7 +109,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
 
         while True:
             img = get_image(controller)
-            found_buy_success, _, _, _ = match_template_in_region(img, buy_success_region, self.buy_success_template, 0.8)
+            found_buy_success, _, _, _ = match_template_in_region(img, buy_success_region, self.buy_success_template, match_threshold)
             if found_buy_success:
                 controller.post_click_key(KEY_ESC).wait()
                 time.sleep(0.5)

agent/custom/action/auto_fish.py

@@ -91,13 +91,16 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
             print(f"=== Fishing {i + 1}/{fishing_count} ===")
 
             while True:
-                
+                if context.tasker.stopping:
+                    return CustomAction.RunResult(success=False)
                 controller.post_key_down(KEY_F)
                 time.sleep(0.1)
                 controller.post_key_up(KEY_F)
                 print("  Casting...")
 
                 while True:
+                    if context.tasker.stopping:
+                        return CustomAction.RunResult(success=False)
                     time.sleep(check_freq)
                     img = get_image(controller)
                     m_catch, _, _, _ = match_template_in_region(img, success_region, self.success_catch_template, 0.8)
@@ -113,6 +116,8 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
                 deadzone = 15
 
                 while time.time() - start_time < 100:
+                    if context.tasker.stopping:
+                        return CustomAction.RunResult(success=False)
                     time.sleep(check_freq)
                     img = get_image(controller)
                     frame += 1

agent/custom/action/auto_sell_fish.py

@@ -23,12 +23,14 @@ class AutoSellFish(CustomAction):
     sell_button_img = image_dir / "sell_button.png"
     confirm_sell_img = image_dir / "confirm_sell.png"
     sell_success_img = image_dir / "sell_success.png"
+    sell_fail_img = image_dir / "sell_fail.png"
     sell_option_template = cv2.imread(str(sell_option_img), cv2.IMREAD_COLOR)
     sell_option_selected_template = cv2.imread(str(sell_option_selected_img), cv2.IMREAD_COLOR)
     no_fish_to_sell_template = cv2.imread(str(no_fish_to_sell_img), cv2.IMREAD_COLOR)
     sell_button_template = cv2.imread(str(sell_button_img), cv2.IMREAD_COLOR)
     confirm_sell_template = cv2.imread(str(confirm_sell_img), cv2.IMREAD_COLOR)
     sell_success_template = cv2.imread(str(sell_success_img), cv2.IMREAD_COLOR)
+    sell_fail_template = cv2.imread(str(sell_fail_img), cv2.IMREAD_COLOR)
 
     def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunResult:
         print("=== Autofish Action Started ===")
@@ -43,6 +45,8 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
         sell_button_region = [665, 635, 92, 23]
         confirm_sell_region = [756, 461, 48, 21]
         sell_success_region = [565, 628, 149, 21]
+        sell_fail_region = [739, 349, 202, 24]
+        no_valid_fish_region = [509, 350, 261, 22]
 
         while True:
             img = get_image(controller)
@@ -84,13 +88,18 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
 
                     img = get_image(controller)
                     found_confirm_sell, _, _, _ = match_template_in_region(img, confirm_sell_region, self.confirm_sell_template, 0.8)
+                    sell_fail, _, _, _ = match_template_in_region(img, sell_fail_region, self.sell_fail_template, 0.8)
                     if found_confirm_sell:
                         print("Confirm sell button detected. Clicking to confirm selling fish.")
                         for _ in range(3):
                             click_rect(controller, confirm_sell_region)
                             time.sleep(0.1)
                         time.sleep(1)  
                         break
+                    elif sell_fail:
+                        print("no fish to sell, closing fish shop.")
+                        controller.post_click_key(KEY_ESC).wait()
+                        return CustomAction.RunResult(success=True)
                     else:
                         time.sleep(0.1)
                 break

assets/resource/base/image/auto_buy_fish_bait/bait.png

@@ -15,14 +15,19 @@
             "freq": 0.001
         },
         "next": [
-            "AutoSellFish"
+            "AutoSellFish",
+            "AutoBuyFishBait",
+            "StartFishing",
+            "TaskComplete"
         ]
     },
     "AutoSellFish": {
         "action": "Custom",
         "custom_action": "auto_sell_fish",
         "next": [
-            "AutoBuyFishBait"
+            "AutoBuyFishBait",
+            "StartFishing",
+            "TaskComplete"
         ]
     },
     "AutoBuyFishBait": {