feat: add GoalieDecisionMaker and integrate into DecisionMaker

Author: naderzare

src/decision_makers/decision_maker.py

@@ -3,6 +3,7 @@
 from .play_on_decision_maker import PlayOnDecisionMaker
 from .set_play_decision_maker import SetPlayDecisionMaker
 from .penalty_decision_maker import PenaltyDecisionMaker
+from .goalie_decision_maker import GoalieDecisionMaker
 from service_pb2 import *
 
 if TYPE_CHECKING:
@@ -14,12 +15,14 @@ class DecisionMaker(IDecisionMaker):
     Attributes:
         play_on_decision_maker (PlayOnDecisionMaker): Handles decisions during the 'PlayOn' game mode.
         set_play_decision_maker (SetPlayDecisionMaker): Handles decisions during set plays.
+        penalty_decision_maker (PenaltyDecisionMaker): Handles decisions during penalty kicks.
+        goalie_decision_maker (GoalieDecisionMaker): Handles decisions for goalies.
     Methods:
         __init__():
             Initializes the DecisionMaker with specific decision makers for different game modes.
         make_decision(agent: IAgent):
             Makes a decision for the given agent based on its role and the current game mode.
-            If the agent is a goalie, it adds a goalie action.
+            If the agent is a goalie, it adds a goalie action using goalie_decision_maker.
             If the game mode is 'PlayOn', it delegates the decision to play_on_decision_maker.
             If the game mode is a penalty kick, it adds a penalty action using penalty_decision_maker.
             Otherwise, it adds a set play action using set_play_decision_maker.
@@ -28,10 +31,11 @@ def __init__(self, agent: "SamplePlayerAgent"):
         self.play_on_decision_maker = PlayOnDecisionMaker(agent)
         self.set_play_decision_maker = SetPlayDecisionMaker(agent)
         self.penalty_decision_maker = PenaltyDecisionMaker(agent)
+        self.goalie_decision_maker = GoalieDecisionMaker(agent)
 
     def make_decision(self, agent: "SamplePlayerAgent"):
         if agent.wm.self.is_goalie:
-            agent.add_action(PlayerAction(helios_goalie=HeliosGoalie()))
+            self.goalie_decision_maker.make_decision(agent)
         elif agent.wm.game_mode_type == GameModeType.PlayOn:
             self.play_on_decision_maker.make_decision(agent)
         elif agent.wm.is_penalty_kick_mode:

src/decision_makers/goalie_decision_maker.py

@@ -0,0 +1,18 @@
+from typing import TYPE_CHECKING
+from src.interfaces.IDecisionMaker import IDecisionMaker
+from src.interfaces.IAgent import IAgent
+from pyrusgeom.soccer_math import *
+from pyrusgeom.geom_2d import *
+from service_pb2 import *
+
+
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
+
+class GoalieDecisionMaker(IDecisionMaker):
+    def __init__(self, agent: "SamplePlayerAgent"):
+        pass
+
+    def make_decision(self, agent: "SamplePlayerAgent"):
+        agent.logger.debug("--- GoalieDecisionMaker ---")
+        agent.add_action(PlayerAction(helios_goalie=HeliosGoalie()))

src/sample_player_agent.py

@@ -11,7 +11,7 @@ def __init__(self, logger) -> None:
         super().__init__(logger)
         self.logger.info('SamplePlayerAgent created')
 
-        self.use_starter_code = True
+        self.use_starter_code = False
 
         self.decision_maker = DecisionMaker(self)
         self.strategy = FormationStrategy(self.logger) if not self.use_starter_code else StarterStrategy(self.logger)

src/strategy/formation_strategy.py

@@ -1,3 +1,4 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IPositionStrategy import IPositionStrategy
 from src.strategy.formation_file import *
 from src.interfaces.IAgent import IAgent
@@ -8,6 +9,8 @@
 import logging
 
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class Situation(Enum):
     """
@@ -86,7 +89,7 @@ def _get_current_formation(self) -> Formation:
     def _set_formation(self, wm: WorldModel):
         self.selected_formation_name = '4-3-3-cyrus-base' # '4-3-3' '4-3-3-cyrus-base' '4-3-3-helios-base'
 
-    def update(self, agent: IAgent):
+    def update(self, agent: 'SamplePlayerAgent'):
         logger = agent.logger
         logger.debug(f'---- update strategy ----')