Upgrade object detector + clean up namespaces (#151)

* Separate out namespaces * Separate out namespaces * Use namespace instaed of CSV * Delete cards CSV * Move classes to separate folder * Update detector units * Add possible units * Fixing... * Upgrade YOLOv10 model * Upgrade to medium detector with more classes * Add target anywhere flag to all cards * Fix detector units * Fix bug * Fix bug * Fix bugs * Fix pylint errors * Fix isort errors * Use cards instead of card_names * Use cards instead of card_names * Remove standard bot
Pbatch · Jun 19, 2024 · 9a39050 · 9a39050
1 parent e1796a7
commit 9a39050
Show file tree

Hide file tree

Showing 27 changed files with 316 additions and 669 deletions.
diff --git a/clashroyalebuildabot/__init__.py b/clashroyalebuildabot/__init__.py
@@ -3,10 +3,10 @@
 from .bot import Bot
 from .bot import PeteBot
 from .bot import RandomBot
-from .bot import StandardBot
 from .bot import TwoSixHogCycle
-from .data import cards
 from .data import constants
+from .namespaces import Cards
+from .namespaces import Units
 from .screen import Screen
 from .state import CardDetector
 from .state import Detector
@@ -16,12 +16,12 @@
 from .state import UnitDetector
 
 __all__ = [
-    "StandardBot",
     "RandomBot",
     "PeteBot",
     "TwoSixHogCycle",
     "constants",
-    "cards",
+    "Cards",
+    "Units",
     "Detector",
     "OnnxDetector",
     "ScreenDetector",

diff --git a/clashroyalebuildabot/bot/__init__.py b/clashroyalebuildabot/bot/__init__.py
@@ -3,14 +3,12 @@
 from .bot import Bot
 from .pete import PeteBot
 from .random import RandomBot
-from .standard import StandardBot
 from .two_six_hog_cycle import TwoSixHogCycle
 
 __all__ = [
     "TwoSixHogCycle",
     "PeteBot",
     "RandomBot",
-    "StandardBot",
     "Action",
     "Bot",
 ]
diff --git a/clashroyalebuildabot/bot/bot.py b/clashroyalebuildabot/bot/bot.py
@@ -23,14 +23,14 @@
 
 class Bot:
     def __init__(
-        self, card_names, action_class=Action, auto_start=True, debug=False
+        self, cards, action_class=Action, auto_start=True, debug=False
     ):
-        self.card_names = card_names
+        self.cards = cards
         self.action_class = action_class
         self.auto_start = auto_start
         self.debug = debug
         self.screen = Screen()
-        self.detector = Detector(card_names, debug=self.debug)
+        self.detector = Detector(cards, debug=self.debug)
         self.state = None
 
     @staticmethod
@@ -71,15 +71,14 @@ def get_actions(self):
         all_tiles = ALLY_TILES + LEFT_PRINCESS_TILES + RIGHT_PRINCESS_TILES
         valid_tiles = self._get_valid_tiles()
         actions = []
-
         for i in range(4):
             card = self.state["cards"][i + 1]
             if (
                 int(self.state["numbers"]["elixir"]["number"]) >= card["cost"]
                 and card["ready"]
                 and card["name"] != "blank"
             ):
-                tiles = all_tiles if card["type"] == "spell" else valid_tiles
+                tiles = all_tiles if card["target_anywhere"] else valid_tiles
                 actions.extend(
                     [
                         self.action_class(i, x, y, *card.values())

diff --git a/clashroyalebuildabot/bot/example/custom_action.py b/clashroyalebuildabot/bot/example/custom_action.py
@@ -1,5 +1,5 @@
 from clashroyalebuildabot.bot import Action
-from clashroyalebuildabot.data.cards import Cards
+from clashroyalebuildabot.namespaces.cards import Cards
 
 
 class CustomAction(Action):
@@ -134,14 +134,14 @@ def _calculate_musketeer_score(self, state):
 
     def calculate_score(self, state):
         name_to_score = {
-            Cards.KNIGHT: self._calculate_knight_score,
-            Cards.MINIONS: self._calculate_minions_score,
-            Cards.FIREBALL: self._calculate_fireball_score,
-            Cards.GIANT: self._calculate_giant_score,
-            Cards.MINIPEKKA: self._calculate_minipekka_score,
-            Cards.MUSKETEER: self._calculate_musketeer_score,
-            Cards.ARROWS: self._calculate_arrows_score,
-            Cards.ARCHERS: self._calculate_archers_score,
+            Cards.KNIGHT.name: self._calculate_knight_score,
+            Cards.MINIONS.name: self._calculate_minions_score,
+            Cards.FIREBALL.name: self._calculate_fireball_score,
+            Cards.GIANT.name: self._calculate_giant_score,
+            Cards.MINIPEKKA.name: self._calculate_minipekka_score,
+            Cards.MUSKETEER.name: self._calculate_musketeer_score,
+            Cards.ARROWS.name: self._calculate_arrows_score,
+            Cards.ARCHERS.name: self._calculate_archers_score,
         }
         score_function = name_to_score.get(self.name)
         self.score = score_function(state) if score_function else [0]

diff --git a/clashroyalebuildabot/bot/example/custom_bot.py b/clashroyalebuildabot/bot/example/custom_bot.py
@@ -6,15 +6,15 @@
 
 from clashroyalebuildabot.bot import Bot
 from clashroyalebuildabot.bot.example.custom_action import CustomAction
-from clashroyalebuildabot.data.cards import Cards
 from clashroyalebuildabot.data.constants import DISPLAY_HEIGHT
 from clashroyalebuildabot.data.constants import DISPLAY_WIDTH
 from clashroyalebuildabot.data.constants import SCREENSHOT_HEIGHT
 from clashroyalebuildabot.data.constants import SCREENSHOT_WIDTH
+from clashroyalebuildabot.namespaces.cards import Cards
 
 
 class CustomBot(Bot):
-    def __init__(self, card_names, debug=False):
+    def __init__(self, cards, debug=False):
         preset_deck = {
             Cards.MINIONS,
             Cards.ARCHERS,
@@ -25,9 +25,9 @@ def __init__(self, card_names, debug=False):
             Cards.KNIGHT,
             Cards.MUSKETEER,
         }
-        if set(card_names) != preset_deck:
+        if set(cards) != preset_deck:
             raise ValueError(f"CustomBot must use cards: {preset_deck}")
-        super().__init__(card_names, CustomAction, debug=debug)
+        super().__init__(cards, CustomAction, debug=debug)
         self.end_of_game_clicked = False
         self.pause_until = 0
         self.scale_x = DISPLAY_WIDTH / SCREENSHOT_WIDTH

diff --git a/clashroyalebuildabot/bot/pete/pete_action.py b/clashroyalebuildabot/bot/pete/pete_action.py
@@ -1,5 +1,5 @@
 from clashroyalebuildabot.bot.action import Action
-from clashroyalebuildabot.data.cards import Cards
+from clashroyalebuildabot.namespaces.cards import Cards
 
 
 class PeteAction(Action):

diff --git a/clashroyalebuildabot/bot/pete/pete_bot.py b/clashroyalebuildabot/bot/pete/pete_bot.py
@@ -10,8 +10,8 @@
 
 
 class PeteBot(Bot):
-    def __init__(self, card_names, debug=False):
-        super().__init__(card_names, PeteAction, debug=debug)
+    def __init__(self, cards, debug=False):
+        super().__init__(cards, PeteAction, debug=debug)
 
     def _preprocess(self):
         """

diff --git a/clashroyalebuildabot/bot/standard/__init__.py b/clashroyalebuildabot/bot/standard/__init__.py
diff --git a/clashroyalebuildabot/bot/standard/standard_action.py b/clashroyalebuildabot/bot/standard/standard_action.py