fix class names and kick_decision_maker

Author: SoroushMazloum

src/behaviors/bhv_starter_clearball.py

@@ -6,7 +6,7 @@
 from pyrusgeom import vector_2d
 from service_pb2 import *
 
-class ClearBall(IBehavior):
+class BhvStarterClearBall(IBehavior):
 
     def __init__(self):
         pass

src/behaviors/bhv_starter_dribble.py

@@ -6,7 +6,7 @@
 from service_pb2 import *
 
 
-class Dribble(IBehavior):
+class BhvStarterDribble(IBehavior):
 
     def __init__(self):
         pass

src/behaviors/bhv_starter_kick_planner.py

@@ -3,37 +3,37 @@
 from pyrusgeom.soccer_math import *
 from pyrusgeom.geom_2d import *
 from service_pb2 import *
-from src.behaviors.bhv_starter_clearball import ClearBall
-from src.behaviors.bhv_starter_pass import Pass
-from src.behaviors.bhv_starter_dribble import Dribble
-from src.behaviors.bhv_starter_shoot import Shoot
+from src.behaviors.bhv_starter_clearball import BhvStarterClearBall
+from src.behaviors.bhv_starter_pass import BhvStarterPass
+from src.behaviors.bhv_starter_dribble import BhvStarterDribble
+from src.behaviors.bhv_starter_shoot import BhvStarterShoot
 from src.utils.tools import Tools
 
 class BhvStarterKickPlanner(IBehavior):
     def __init__(self):
-        self.shoot = Shoot()
-        self.clear_ball = ClearBall()
-        self.dribble = Dribble()
-        self.pass_ball = Pass()
+        self.starter_shoot = BhvStarterShoot()
+        self.starter_clear_ball = BhvStarterClearBall()
+        self.starter_dribble = BhvStarterDribble()
+        self.starter_pass = BhvStarterPass()
 
     def execute(self, agent: IAgent):
         agent.logger.debug("BhvStarterKickPlanner.execute")
         from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
         actions = []
-        actions += [shoot] if (shoot := self.shoot.execute(agent)) is not None else []
+        actions += [shoot] if (shoot := self.starter_shoot.execute(agent)) is not None else []
         opps = Tools.OpponentsFromSelf(agent)
         nearest_opp = opps[0] if opps else None
         nearest_opp_dist = nearest_opp.dist_from_self if nearest_opp else 1000.0
 
         if nearest_opp_dist < 10:
-            actions += [passing] if (passing := self.pass_ball.execute(agent)) is not None else []
+            actions += [passing] if (passing := self.starter_pass.execute(agent)) is not None else []
 
-        actions += [dribble] if (dribble := self.dribble.execute(agent)) is not None else []
+        actions += [dribble] if (dribble := self.starter_dribble.execute(agent)) is not None else []
 
         if nearest_opp_dist > 2.5:
             actions.append(PlayerAction(body_hold_ball=Body_HoldBall()))
 
-        actions.append(self.clear_ball.execute(agent))
+        actions.append(self.starter_clear_ball.execute(agent))
 
         #Sending actions' queue
         for i in actions:

src/behaviors/bhv_starter_pass.py

@@ -6,7 +6,7 @@
 from service_pb2 import *
 
 
-class Pass(IBehavior):
+class BhvStarterPass(IBehavior):
 
     def __init__(self):
         pass

src/behaviors/bhv_starter_shoot.py

@@ -5,7 +5,7 @@
 
 
 
-class Shoot(IBehavior):
+class BhvStarterShoot(IBehavior):
     def __init__(self):
         pass
 

src/decision_makers/kick_decision_maker.py

@@ -10,11 +10,10 @@
 class KickDecisionMaker(IDecisionMaker):
     def __init__(self):
         self.bhv_kick_planner = BhvKickPlanner()
-        self.bhv_kick_planner = BhvStarterKickPlanner()
+        #self.bhv_kick_planner = BhvStarterKickPlanner()
 
     def make_decision(self, agent: IAgent):
         agent.logger.debug("--- WithBallDecisionMaker ---")
         from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
         assert isinstance(agent, SamplePlayerAgent)
-        #self.bhv_kick_planner.execute(agent)
-        self.bhv_kick_planner.execute(agent)
+        self.bhv_kick_planner.execute(agent)