Update to newest spec

Author: VirxEC

rlbot/interface.py

@@ -66,7 +66,7 @@ class SocketRelay:
     _should_continue = True
 
     on_connect_handlers: list[Callable[[], None]] = []
-    packet_handlers: list[Callable[[flat.GameTickPacket], None]] = []
+    packet_handlers: list[Callable[[flat.GamePacket], None]] = []
     field_info_handlers: list[Callable[[flat.FieldInfo], None]] = []
     match_settings_handlers: list[Callable[[flat.MatchSettings], None]] = []
     match_communication_handlers: list[Callable[[flat.MatchComm], None]] = []
@@ -269,7 +269,7 @@ def handle_incoming_message(self, incoming_message: SocketMessage):
                 self._should_continue = False
             case SocketDataType.GAME_TICK_PACKET:
                 if len(self.packet_handlers) > 0:
-                    packet = flat.GameTickPacket.unpack(incoming_message.data)
+                    packet = flat.GamePacket.unpack(incoming_message.data)
                     for handler in self.packet_handlers:
                         handler(packet)
             case SocketDataType.FIELD_INFO:

rlbot/managers/bot.py

@@ -29,7 +29,7 @@ class Bot:
     _has_field_info = False
     _has_player_mapping = False
 
-    _latest_packet: Optional[flat.GameTickPacket] = None
+    _latest_packet: Optional[flat.GamePacket] = None
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
@@ -116,10 +116,10 @@ def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
     def _handle_ball_prediction(self, ball_prediction: flat.BallPrediction):
         self._latest_prediction = ball_prediction
 
-    def _handle_packet(self, packet: flat.GameTickPacket):
+    def _handle_packet(self, packet: flat.GamePacket):
         self._latest_packet = packet
 
-    def _packet_processor(self, packet: flat.GameTickPacket):
+    def _packet_processor(self, packet: flat.GamePacket):
         if len(packet.players) <= self.index:
             return
 
@@ -151,9 +151,9 @@ def run(
 
             # custom message handling logic
             # this reads all data in the socket until there's no more immediately available
-            # checks if there was a GameTickPacket in the data, and if so, processes it
+            # checks if there was a GamePacket in the data, and if so, processes it
             # then sets the socket to non-blocking and waits for more data
-            # if there was no GameTickPacket, it sets to blocking and waits for more data
+            # if there was no GamePacket, it sets to blocking and waits for more data
             while True:
                 try:
                     self._game_interface.handle_incoming_messages(True)
@@ -274,7 +274,7 @@ def initialize(self):
     def retire(self):
         """Called after the game ends"""
 
-    def get_output(self, packet: flat.GameTickPacket) -> flat.ControllerState:
+    def get_output(self, packet: flat.GamePacket) -> flat.ControllerState:
         """
         Where all the logic of your bot gets its input and returns its output.
         """

rlbot/managers/hivemind.py

@@ -31,7 +31,7 @@ class Hivemind:
     _has_field_info = False
     _has_player_mapping = False
 
-    _latest_packet: Optional[flat.GameTickPacket] = None
+    _latest_packet: Optional[flat.GamePacket] = None
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
@@ -115,10 +115,10 @@ def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
     def _handle_ball_prediction(self, ball_prediction: flat.BallPrediction):
         self._latest_prediction = ball_prediction
 
-    def _handle_packet(self, packet: flat.GameTickPacket):
+    def _handle_packet(self, packet: flat.GamePacket):
         self._latest_packet = packet
 
-    def _packet_processor(self, packet: flat.GameTickPacket):
+    def _packet_processor(self, packet: flat.GamePacket):
         if len(packet.players) <= self.indices[-1]:
             return
 
@@ -284,9 +284,7 @@ def initialize(self):
     def retire(self):
         """Called after the game ends"""
 
-    def get_outputs(
-        self, packet: flat.GameTickPacket
-    ) -> dict[int, flat.ControllerState]:
+    def get_outputs(self, packet: flat.GamePacket) -> dict[int, flat.ControllerState]:
         """
         Where all the logic of your bot gets its input and returns its output.
         """

rlbot/managers/match.py

@@ -72,7 +72,7 @@ def get_player_config(
     if CURRENT_OS == OS.LINUX and "run_command_linux" in settings:
         run_command = settings["run_command_linux"]
 
-    loadout_path = settings.get("loadout_config", None)
+    loadout_path = settings.get("loadout_file", None)
     if loadout_path is not None:
         loadout_path = parent / loadout_path
 
@@ -97,7 +97,7 @@ def get_player_config(
 
 class MatchManager:
     logger = DEFAULT_LOGGER
-    packet: Optional[flat.GameTickPacket] = None
+    packet: Optional[flat.GamePacket] = None
     rlbot_server_process: Optional[psutil.Process] = None
     rlbot_server_port = RLBOT_SERVER_PORT
     initialized = False
@@ -142,13 +142,13 @@ def ensure_server_started(self, print_version_info: bool = True):
             self.rlbot_server_process.pid,
         )
 
-    def _packet_reporter(self, packet: flat.GameTickPacket):
+    def _packet_reporter(self, packet: flat.GamePacket):
         self.packet = packet
 
     def wait_for_valid_packet(self):
-        while self.packet is not None and self.packet.game_info.game_state_type in {
-            flat.GameStateType.Inactive,
-            flat.GameStateType.Ended,
+        while self.packet is not None and self.packet.game_info.game_status in {
+            flat.GameStatus.Inactive,
+            flat.GameStatus.Ended,
         }:
             sleep(0.1)
 

rlbot/managers/script.py

@@ -28,7 +28,7 @@ class Script:
     _has_field_info = False
     _has_player_mapping = False
 
-    _latest_packet: Optional[flat.GameTickPacket] = None
+    _latest_packet: Optional[flat.GamePacket] = None
     _latest_prediction = flat.BallPrediction()
 
     def __init__(self):
@@ -108,10 +108,10 @@ def _handle_player_mappings(self, player_mappings: flat.TeamControllables):
     def _handle_ball_prediction(self, ball_prediction: flat.BallPrediction):
         self._latest_prediction = ball_prediction
 
-    def _handle_packet(self, packet: flat.GameTickPacket):
+    def _handle_packet(self, packet: flat.GamePacket):
         self._latest_packet = packet
 
-    def _packet_processor(self, packet: flat.GameTickPacket):
+    def _packet_processor(self, packet: flat.GamePacket):
         if len(packet.players) <= self.index:
             return
 
@@ -245,5 +245,5 @@ def initialize(self):
     def retire(self):
         """Called after the game ends"""
 
-    def handle_packet(self, packet: flat.GameTickPacket):
+    def handle_packet(self, packet: flat.GamePacket):
         pass

tests/atba/atba.bot.toml

@@ -2,7 +2,7 @@
 # The name that will be displayed in game
 name = "ATBA_v5"
 # Path to loadout config from runner
-loadout_config = "../necto/loadout.toml"
+loadout_file = "../necto/loadout.toml"
 # (OPTIONAL) - what you want the working directory set to
 # This is relative to the location of this file
 location = ""

tests/atba/atba.py

@@ -88,15 +88,15 @@ def handle_match_communication(
     ):
         self.logger.info(f"Received match communication from index {index}! {display}")
 
-    def get_output(self, packet: flat.GameTickPacket) -> flat.ControllerState:
+    def get_output(self, packet: flat.GamePacket) -> flat.ControllerState:
         if self.rendering:
             self.test_rendering(packet)
 
         if (
-            packet.game_info.game_state_type
+            packet.game_info.game_status
             not in {
-                flat.GameStateType.Active,
-                flat.GameStateType.Kickoff,
+                flat.GameStatus.Active,
+                flat.GameStatus.Kickoff,
             }
             or len(packet.balls) == 0
         ):
@@ -125,7 +125,7 @@ def get_output(self, packet: flat.GameTickPacket) -> flat.ControllerState:
 
         return self.controller
 
-    def test_state_setting(self, packet: flat.GameTickPacket):
+    def test_state_setting(self, packet: flat.GamePacket):
         self.set_game_state(
             {
                 0: flat.DesiredBallState(
@@ -146,7 +146,7 @@ def test_state_setting(self, packet: flat.GameTickPacket):
             },
         )
 
-    def test_rendering(self, packet: flat.GameTickPacket):
+    def test_rendering(self, packet: flat.GamePacket):
         if not self.needs_render:
             self.needs_render = (
                 self.last_demoed and packet.players[self.index].demolished_timeout <= 0

tests/hivemind/bot.py

@@ -52,14 +52,12 @@ def get_car_facing_vector(car: flat.PlayerInfo) -> Vector2:
 class Hives(Hivemind):
     controllers: dict[int, flat.ControllerState] = {}
 
-    def get_outputs(
-        self, packet: flat.GameTickPacket
-    ) -> dict[int, flat.ControllerState]:
+    def get_outputs(self, packet: flat.GamePacket) -> dict[int, flat.ControllerState]:
         if (
-            packet.game_info.game_state_type
+            packet.game_info.game_status
             not in {
-                flat.GameStateType.Active,
-                flat.GameStateType.Kickoff,
+                flat.GameStatus.Active,
+                flat.GameStatus.Kickoff,
             }
             or len(packet.balls) == 0
         ):

tests/hivemind/bot.toml

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

tests/necto/bot.py

@@ -4,7 +4,7 @@
 from necto_obs import NectoObsBuilder
 from rlgym_compat import V1GameState
 
-from rlbot.flat import ControllerState, GameStateType, GameTickPacket, Vector3
+from rlbot.flat import ControllerState, GameStatus, GamePacket, Vector3
 from rlbot.managers import Bot
 
 KICKOFF_CONTROLS = (
@@ -116,7 +116,7 @@ def render_attention_weights(
 
         self.renderer.end_rendering()
 
-    def get_output(self, packet: GameTickPacket) -> ControllerState:
+    def get_output(self, packet: GamePacket) -> ControllerState:
         cur_frame = packet.game_info.frame_num
         ticks_elapsed = cur_frame - self.prev_frame
         self.prev_frame = cur_frame
@@ -144,7 +144,7 @@ def get_output(self, packet: GameTickPacket) -> ControllerState:
             obs = self.obs_builder.build_obs(player, self.game_state, self.action)
 
             beta = self.beta
-            if packet.game_info.game_state_type == GameStateType.Ended:
+            if packet.game_info.game_status == GameStatus.Ended:
                 beta = 0  # Celebrate with random actions
             self.action, weights = self.agent.act(obs, beta)
 
@@ -161,8 +161,8 @@ def get_output(self, packet: GameTickPacket) -> ControllerState:
 
         return self.controls
 
-    def maybe_do_kickoff(self, packet: GameTickPacket, ticks_elapsed: int):
-        if packet.game_info.game_state_type == GameStateType.Kickoff:
+    def maybe_do_kickoff(self, packet: GamePacket, ticks_elapsed: int):
+        if packet.game_info.game_status == GameStatus.Kickoff:
             if self.kickoff_index >= 0:
                 self.kickoff_index += round(ticks_elapsed)
             elif self.kickoff_index == -1: