Merge pull request #130 from Pbatch/pb_onnx

Upgrade number detector to v8

Author: Pbatch

.gitignore

@@ -1,6 +1,8 @@
 **/__pycache__
 .idea/
-clashroyalebuildabot/data/screenshots
+clashroyalebuildabot/screenshots
+clashroyalebuildabot/labels
+clashroyalebuildabot/logs
 .venv
 .vscode
 *.egg-info

clashroyalebuildabot/data/constants.py

@@ -111,8 +111,8 @@
 KING_HP_X = 188
 LEFT_PRINCESS_HP_X = 74
 RIGHT_PRINCESS_HP_X = 266
-ALLY_PRINCESS_HP_Y = 401
-ENEMY_PRINCESS_HP_Y = 93
+ALLY_PRINCESS_HP_Y = 403
+ENEMY_PRINCESS_HP_Y = 95
 ALLY_KING_LEVEL_Y = 487
 ENEMY_KING_LEVEL_Y = 19
 KING_LEVEL_X = 134

clashroyalebuildabot/data/number.onnx

@@ -114,7 +114,7 @@ def run(self, image):
             crops[i] = self._preprocess(crop)
 
         # Inference
-        pred = self.sess.run([self.output_name], {self.input_name: crops})[0]
+        pred = self._infer(crops.astype(np.float16)).astype(np.float32)
 
         # Forced post-processing
         pred = self.nms(pred)

clashroyalebuildabot/state/number_detector.py

@@ -45,29 +45,16 @@ def _nms(boxes, scores, thresh):
 
         return keep
 
-    def nms(self, prediction, conf_thres=0.35, iou_thres=0.45, yolov8=False):
+    def nms(self, prediction, conf_thres=0.35, iou_thres=0.45):
         """
         Runs Non-Maximum Suppression (NMS) on inference results
         """
         output = [np.zeros((0, 6))] * len(prediction)
         for i in range(len(prediction)):
-            if yolov8:
-                x = prediction[i]
-            else:
-                # Mask out predictions below the confidence threshold
-                mask = prediction[i, :, 4] > conf_thres
-                x = prediction[i][mask]
-
-                if not x.shape[0]:
-                    continue
+            x = prediction[i]
 
             # Calculate the best scores
-            if yolov8:
-                # score = class confidence
-                scores = x[:, 4:]
-            else:
-                # score = object confidence * class confidence
-                scores = x[:, 4:5] * x[:, 5:]
+            scores = x[:, 4:]
             best_scores_idx = np.argmax(scores, axis=1).reshape(-1, 1)
             best_scores = np.take_along_axis(scores, best_scores_idx, axis=1)
 

clashroyalebuildabot/state/onnx_detector.py

@@ -116,7 +116,7 @@ def run(self, image):
         pred = self._infer(np_image.astype(np.float16)).astype(np.float32)
 
         # Forced post-processing
-        pred = np.array(self.nms(pred, yolov8=True)[0])
+        pred = np.array(self.nms(pred)[0])
         pred[:, [0, 2]] *= width / UNIT_SIZE
         pred[:, [1, 3]] *= height / UNIT_SIZE
 

clashroyalebuildabot/state/unit_detector.py

@@ -2,6 +2,8 @@
 import ctypes
 import msvcrt
 import time
+
+from clashroyalebuildabot.data.cards import Cards
 from custom_bot import CustomBot
 from rich.console import Console
 from rich.panel import Panel
@@ -128,14 +130,14 @@ def print_title(console):
 def start_bot():
     try:
         card_names = [
-            "minions",
-            "archers",
-            "arrows",
-            "giant",
-            "minipekka",
-            "fireball",
-            "knight",
-            "musketeer",
+            Cards.MINIONS,
+            Cards.ARCHERS,
+            Cards.ARROWS,
+            Cards.GIANT,
+            Cards.MINIPEKKA,
+            Cards.FIREBALL,
+            Cards.KNIGHT,
+            Cards.MUSKETEER,
         ]
         bot = CustomBot(card_names, debug=False)
         bot.run()