Update to newest spec

VirxEC · VirxEC · commit ef8005a0d534 · 2025-06-14T14:10:57.000-04:00
diff --git a/rlbot/config.py b/rlbot/config.py
@@ -99,7 +99,9 @@ def load_match_config(config_path: Path | str) -> flat.MatchConfiguration:
                     load_player_config(abs_config_path, team, name, loadout_file)
                 )
             case "psyonix":
-                abs_config_path = (config_path.parent / car_config).resolve()
+                abs_config_path = (
+                    (config_path.parent / car_config).resolve() if car_config else None
+                )
                 players.append(
                     load_psyonix_config(
                         team,
@@ -153,6 +155,17 @@ def load_match_config(config_path: Path | str) -> flat.MatchConfiguration:
         audio=__enum(mutator_table, "audio", flat.AudioMutator),
     )
 
+    try:
+        enable_rendering = (
+            flat.DebugRendering.OnByDefault
+            if __bool(match_table, "enable_rendering")
+            else flat.DebugRendering.OffByDefault
+        )
+    except ConfigParsingException:
+        enable_rendering = __enum(
+            match_table, "enable_rendering", flat.DebugRendering.AlwaysOff
+        )
+
     return flat.MatchConfiguration(
         launcher=__enum(rlbot_table, "launcher", flat.Launcher),
         launcher_arg=__str(rlbot_table, "launcher_arg"),
@@ -168,9 +181,7 @@ def load_match_config(config_path: Path | str) -> flat.MatchConfiguration:
         existing_match_behavior=__enum(
             match_table, "existing_match_behavior", flat.ExistingMatchBehavior
         ),
-        enable_rendering=__enum(
-            match_table, "enable_rendering", flat.DebugRendering.OffByDefault
-        ),
+        enable_rendering=enable_rendering,
         enable_state_setting=__bool(match_table, "enable_state_setting"),
         freeplay=__bool(match_table, "freeplay"),
     )
diff --git a/rlbot/version.py b/rlbot/version.py
@@ -1 +1 @@
-__version__ = "2.0.0-beta.44"
+__version__ = "2.0.0-beta.46"
diff --git a/tests/default.toml b/tests/default.toml
@@ -11,8 +11,8 @@ wait_for_agents = true
 
 [match]
 # What game mode the game should load.
-# Accepted values are "Soccer", "Hoops", "Dropshot", "Hockey", "Rumble", "Heatseeker", "Gridiron", "Knockout"
-game_mode = "Soccer"
+# Accepted values are "Soccar", "Hoops", "Dropshot", "Snowday", "Rumble", "Heatseeker", "Gridiron", "Knockout"
+game_mode = "Soccar"
 # Which map the game should load into. Ensure the map doesn't end in '.upk'.
 game_map_upk = "Stadium_P"
 # Automatically skip replays after a goal. Also stops match replays from being saved.
diff --git a/tests/gamemodes/beach_ball.toml b/tests/gamemodes/beach_ball.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 # Map set currently unknown
 game_map_upk = "Stadium_P"
 
diff --git a/tests/gamemodes/boomer_ball.toml b/tests/gamemodes/boomer_ball.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 
 [mutators]
 boost_amount = "UnlimitedBoost"
diff --git a/tests/gamemodes/gforce_frenzy.toml b/tests/gamemodes/gforce_frenzy.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 
 [mutators]
 boost_amount = "UnlimitedBoost"
diff --git a/tests/gamemodes/ghost_hunt.toml b/tests/gamemodes/ghost_hunt.toml
@@ -2,7 +2,7 @@
 launcher = "Steam"
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Haunted_TrainStation_P"
 
 [mutators]
diff --git a/tests/gamemodes/gotham_city_rumble.toml b/tests/gamemodes/gotham_city_rumble.toml
@@ -2,7 +2,7 @@
 launcher = "Steam"
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Park_Bman_P"
 
 [mutators]
diff --git a/tests/gamemodes/nike_fc_showdown.toml b/tests/gamemodes/nike_fc_showdown.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "swoosh_p"
 
 [mutators]
diff --git a/tests/gamemodes/speed_demon.toml b/tests/gamemodes/speed_demon.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 
 [mutators]
 boost_amount = "UnlimitedBoost"
diff --git a/tests/gamemodes/spike_rush.toml b/tests/gamemodes/spike_rush.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "ThrowbackStadium_P"
 
 [mutators]
diff --git a/tests/gamemodes/spooky_cube.toml b/tests/gamemodes/spooky_cube.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Farm_HW_P"
 
 [mutators]
diff --git a/tests/gamemodes/super_cube.toml b/tests/gamemodes/super_cube.toml
@@ -1,5 +1,5 @@
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 
 [mutators]
 ball_max_speed = "SuperFast"
diff --git a/tests/gamemodes/winter_breakaway.toml b/tests/gamemodes/winter_breakaway.toml
@@ -1,3 +1,3 @@
 [match]
-game_mode = "Hockey"
+game_mode = "Snowday"
 game_map_upk = "ThrowbackHockey_p"
diff --git a/tests/hivemind.toml b/tests/hivemind.toml
@@ -3,7 +3,7 @@
 launcher = "Steam"
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 
 [mutators]
diff --git a/tests/human_vs_atba.toml b/tests/human_vs_atba.toml
@@ -4,7 +4,7 @@ launcher = "Steam"
 auto_start_agents = true
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 enable_rendering = true
 
diff --git a/tests/human_vs_necto.toml b/tests/human_vs_necto.toml
@@ -4,7 +4,7 @@ launcher = "Steam"
 auto_start_agents = true
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 
 [mutators]
diff --git a/tests/minimal.toml b/tests/minimal.toml
@@ -3,5 +3,5 @@
 launcher = "Steam"
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
diff --git a/tests/nexto/bot.py b/tests/nexto/bot.py
@@ -5,6 +5,7 @@
 import torch
 from agent import Agent
 from nexto_obs import BOOST_LOCATIONS, NextoObsBuilder
+from rlbot_flatbuffers import GameMode
 from rlgym_compat.v1_game_state import V1GameState as GameState
 
 from rlbot.flat import ControllerState, GamePacket, MatchPhase, Vector3
@@ -37,10 +38,10 @@
 )
 
 GAME_MODES = [
-    "soccer",
+    "soccar",
     "hoops",
     "dropshot",
-    "hockey",
+    "snowday",
     "rumble",
     "heatseeker",
 ]
@@ -63,7 +64,7 @@ class Nexto(Bot):
     ticks = tick_skip  # So we take an action the first tick
     prev_tick = 0
     kickoff_index = -1
-    gamemode = ""
+    gamemode = GameMode.Soccar
 
     # toxic handling
     orange_goals = 0
@@ -95,10 +96,7 @@ def initialize(self):
             "Also check out the RLGym Twitch stream to watch live bot training and occasional showmatches!"
         )
 
-        game_mode_idx = int(self.match_config.game_mode)
-        self.gamemode = (
-            GAME_MODES[game_mode_idx] if game_mode_idx < len(GAME_MODES) else 0
-        )
+        self.gamemode = self.match_config.game_mode
 
     def render_attention_weights(self, weights, positions, n=3):
         if weights is None:
@@ -171,8 +169,7 @@ def get_output(self, packet: GamePacket) -> ControllerState:
 
             self.game_state.players = [player] + teammates + opponents
 
-            # todo add heatseeker later
-            if self.gamemode == "heatseeker":
+            if self.gamemode == GameMode.Heatseeker:
                 self._modify_ball_info_for_heatseeker(packet, self.game_state)
 
             obs = self.obs_builder.build_obs(player, self.game_state, self.action)
@@ -263,7 +260,7 @@ def update_controls(self, action):
         self.controls.jump = action[5] > 0
         self.controls.boost = action[6] > 0
         self.controls.handbrake = action[7] > 0
-        if self.gamemode == "rumble":
+        if self.gamemode == GameMode.Rumble:
             self.controls.use_item = np.random.random() > (
                 self.tick_skip / 1200
             )  # On average once every 10 seconds
diff --git a/tests/psy.toml b/tests/psy.toml
@@ -4,7 +4,7 @@ launcher = "Steam"
 auto_start_agents = true
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 
 [[cars]]
diff --git a/tests/render_test.toml b/tests/render_test.toml
@@ -3,7 +3,7 @@
 launcher = "Steam"
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 enable_rendering = true
 
diff --git a/tests/rlbot.toml b/tests/rlbot.toml
@@ -4,7 +4,7 @@ launcher = "Steam"
 auto_start_agents = true
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 skip_replays = false
 start_without_countdown = false
diff --git a/tests/run_forever.py b/tests/run_forever.py
@@ -17,13 +17,13 @@
 
     current_map = -1
 
-    blue_bot = load_player_config(BOT_PATH, flat.CustomBot(), 0)
-    orange_bot = load_player_config(BOT_PATH, flat.CustomBot(), 1)
+    blue_bot = load_player_config(BOT_PATH, 0)
+    orange_bot = load_player_config(BOT_PATH, 1)
 
     match_settings = flat.MatchConfiguration(
         launcher=flat.Launcher.Steam,
         auto_start_agents=True,
-        game_mode=flat.GameMode.Soccer,
+        game_mode=flat.GameMode.Soccar,
         enable_state_setting=True,
         existing_match_behavior=flat.ExistingMatchBehavior.Restart,
         skip_replays=True,
diff --git a/tests/series.toml b/tests/series.toml
@@ -4,7 +4,7 @@ launcher = "Steam"
 auto_start_agents = true
 
 [match]
-game_mode = "Soccer"
+game_mode = "Soccar"
 game_map_upk = "Stadium_P"
 enable_state_setting = true
 existing_match_behavior = "ContinueAndSpawn"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "2.0.0-beta.44"`
	`1`	`+__version__ = "2.0.0-beta.46"`