Rename group id to agent id

Author: VirxEC

rlbot/interface.py

@@ -34,7 +34,7 @@ class SocketDataType(IntEnum):
     STOP_COMMAND = 12
     SET_LOADOUT = 13
     INIT_COMPLETE = 14
-    TEAM_CONTROLLABLES = 15
+    CONTROLLABLE_TEAM_INFO = 15
 
 
 MAX_SIZE_2_BYTES = 2**16 - 1
@@ -71,16 +71,18 @@ class SocketRelay:
     match_settings_handlers: list[Callable[[flat.MatchSettings], None]] = []
     match_communication_handlers: list[Callable[[flat.MatchComm], None]] = []
     ball_prediction_handlers: list[Callable[[flat.BallPrediction], None]] = []
-    team_controllables_handlers: list[Callable[[flat.TeamControllables], None]] = []
+    controllable_team_info_handlers: list[
+        Callable[[flat.ControllableTeamInfo], None]
+    ] = []
     raw_handlers: list[Callable[[SocketMessage], None]] = []
 
     def __init__(
         self,
-        group_id: str,
+        agent_id: str,
         connection_timeout: float = 120,
         logger: Optional[logging.Logger] = None,
     ):
-        self.group_id = group_id
+        self.agent_id = agent_id
         self.connection_timeout = connection_timeout
         self.logger = get_logger("interface") if logger is None else logger
 
@@ -197,7 +199,7 @@ def connect(
             handler()
 
         flatbuffer = flat.ConnectionSettings(
-            self.group_id,
+            self.agent_id,
             wants_ball_predictions,
             wants_match_communications,
             close_after_match,
@@ -292,12 +294,12 @@ def handle_incoming_message(self, incoming_message: SocketMessage):
                     ball_prediction = flat.BallPrediction.unpack(incoming_message.data)
                     for handler in self.ball_prediction_handlers:
                         handler(ball_prediction)
-            case SocketDataType.TEAM_CONTROLLABLES:
-                if len(self.team_controllables_handlers) > 0:
-                    player_mappings = flat.TeamControllables.unpack(
+            case SocketDataType.CONTROLLABLE_TEAM_INFO:
+                if len(self.controllable_team_info_handlers) > 0:
+                    player_mappings = flat.ControllableTeamInfo.unpack(
                         incoming_message.data
                     )
-                    for handler in self.team_controllables_handlers:
+                    for handler in self.controllable_team_info_handlers:
                         handler(player_mappings)
 
     def disconnect(self):

rlbot/managers/bot.py

@@ -33,15 +33,13 @@ class Bot:
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
-        group_id = os.environ.get("RLBOT_GROUP_ID")
+        agent_id = os.environ.get("RLBOT_AGENT_ID")
 
-        if group_id is None:
-            self.logger.critical("RLBOT_GROUP_ID environment variable is not set")
+        if agent_id is None:
+            self.logger.critical("RLBOT_AGENT_ID environment variable is not set")
             exit(1)
 
-        self.logger.info(group_id)
-
-        self._game_interface = SocketRelay(group_id, logger=self.logger)
+        self._game_interface = SocketRelay(agent_id, logger=self.logger)
         self._game_interface.match_settings_handlers.append(self._handle_match_settings)
         self._game_interface.field_info_handlers.append(self._handle_field_info)
         self._game_interface.match_communication_handlers.append(
@@ -50,7 +48,7 @@ def __init__(self):
         self._game_interface.ball_prediction_handlers.append(
             self._handle_ball_prediction
         )
-        self._game_interface.team_controllables_handlers.append(
+        self._game_interface.controllable_team_info_handlers.append(
             self._handle_player_mappings
         )
         self._game_interface.packet_handlers.append(self._handle_packet)
@@ -99,7 +97,7 @@ def _handle_field_info(self, field_info: flat.FieldInfo):
         ):
             self._initialize()
 
-    def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
+    def _handle_player_mappings(self, player_mappings: flat.ControllableTeamInfo):
         self.team = player_mappings.team
         controllable = player_mappings.controllables[0]
         self.spawn_id = controllable.spawn_id

rlbot/managers/hivemind.py

@@ -35,13 +35,13 @@ class Hivemind:
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
-        group_id = os.environ.get("RLBOT_GROUP_ID")
+        agent_id = os.environ.get("RLBOT_AGENT_ID")
 
-        if group_id is None:
-            self._logger.critical("RLBOT_GROUP_ID environment variable is not set")
+        if agent_id is None:
+            self._logger.critical("RLBOT_AGENT_ID environment variable is not set")
             exit(1)
 
-        self._game_interface = SocketRelay(group_id, logger=self._logger)
+        self._game_interface = SocketRelay(agent_id, logger=self._logger)
         self._game_interface.match_settings_handlers.append(self._handle_match_settings)
         self._game_interface.field_info_handlers.append(self._handle_field_info)
         self._game_interface.match_communication_handlers.append(
@@ -97,7 +97,7 @@ def _handle_field_info(self, field_info: flat.FieldInfo):
         ):
             self._initialize()
 
-    def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
+    def _handle_player_mappings(self, player_mappings: flat.ControllableTeamInfo):
         self.team = player_mappings.team
         for controllable in player_mappings.controllables:
             self.spawn_ids.append(controllable.spawn_id)

rlbot/managers/match.py

@@ -64,9 +64,9 @@ def get_player_config(
 
     settings: dict[str, Any] = config["settings"]
 
-    location = parent
-    if "location" in settings:
-        location /= settings["location"]
+    root_dir = parent
+    if "root_dir" in settings:
+        root_dir /= settings["root_dir"]
 
     run_command = settings.get("run_command", "")
     if CURRENT_OS == OS.LINUX and "run_command_linux" in settings:
@@ -86,7 +86,7 @@ def get_player_config(
         type,
         settings["name"],
         team,
-        str(location),
+        str(root_dir),
         str(run_command),
         loadout,
         0,

rlbot/managers/script.py

@@ -32,13 +32,13 @@ class Script:
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
-        group_id = os.environ.get("RLBOT_GROUP_ID")
+        agent_id = os.environ.get("RLBOT_AGENT_ID")
 
-        if group_id is None:
-            self.logger.critical("RLBOT_GROUP_ID environment variable is not set")
+        if agent_id is None:
+            self.logger.critical("RLBOT_AGENT_ID environment variable is not set")
             exit(1)
 
-        self._game_interface = SocketRelay(group_id, logger=self.logger)
+        self._game_interface = SocketRelay(agent_id, logger=self.logger)
         self._game_interface.match_settings_handlers.append(self._handle_match_settings)
         self._game_interface.field_info_handlers.append(self._handle_field_info)
         self._game_interface.match_communication_handlers.append(
@@ -91,7 +91,7 @@ def _handle_field_info(self, field_info: flat.FieldInfo):
         ):
             self._initialize()
 
-    def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
+    def _handle_player_mappings(self, player_mappings: flat.ControllableTeamInfo):
         self.team = player_mappings.team
         controllable = player_mappings.controllables[0]
         self.spawn_id = controllable.spawn_id

tests/atba/atba.bot.toml

@@ -5,7 +5,7 @@ name = "ATBA_v5"
 loadout_file = "../necto/loadout.toml"
 # (OPTIONAL) - what you want the working directory set to
 # This is relative to the location of this file
-location = ""
+root_dir = ""
 # The command RLBot will call to start your bot on Windows
 # ex: "bot.exe" for compiled bots, or "python bot.py" if you don't want to freeze your python bot
 run_command = "..\\..\\venv\\Scripts\\python atba.py"

tests/hivemind/bot.toml

@@ -1,7 +1,6 @@
 [settings]
 name = "Hives"
 loadout_file = "../necto/loadout.toml"
-location = ""
 run_command = "..\\..\\venv\\Scripts\\python bot.py"
 run_command_linux = "../../venv/bin/python bot.py"
 group_id = "botmaker/hives"

tests/hvatba.toml

@@ -0,0 +1,18 @@
+[rlbot]
+launcher = "steam"
+auto_start_bots = true
+
+[match]
+game_mode = "Soccer"
+game_map_upk = "Stadium_P"
+
+[mutators]
+match_length = "Unlimited"
+
+[[cars]]
+type = "human"
+team = 0
+
+[[cars]]
+config = "atba/atba.bot.toml"
+team = 1

tests/hvn.toml

@@ -5,7 +5,6 @@ auto_start_bots = true
 [match]
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
-enable_state_setting = false
 
 [mutators]
 match_length = "Unlimited"
@@ -15,5 +14,5 @@ type = "human"
 team = 0
 
 [[cars]]
-config = "atba/atba.bot.toml"
+config = "necto/bot.toml"
 team = 1