spawn_id -> player_id with alias

Author: VirxEC

rlbot/managers/bot.py

@@ -13,6 +13,8 @@
 from rlbot.utils import fill_desired_game_state
 from rlbot.utils.logging import DEFAULT_LOGGER, get_logger
 
+WARNED_SPAWN_ID_DEPRECATED = False
+
 
 class Bot:
     """
@@ -28,7 +30,18 @@ class Bot:
     team: int = -1
     index: int = -1
     name: str = ""
-    spawn_id: int = 0
+    player_id: int = 0
+
+    @property
+    def spawn_id(self) -> int:
+        global WARNED_SPAWN_ID_DEPRECATED
+        if not WARNED_SPAWN_ID_DEPRECATED:
+            WARNED_SPAWN_ID_DEPRECATED = True
+            self.logger.warning(
+                "'spawn_id' getter accessed, which is deprecated in favor of 'player_id'."
+            )
+
+        return self.player_id
 
     match_config = flat.MatchConfiguration()
     """
@@ -92,7 +105,7 @@ def _try_initialize(self):
 
         # Search match settings for our name
         for player in self.match_config.player_configurations:
-            if player.spawn_id == self.spawn_id:
+            if player.player_id == self.player_id:
                 self.name = player.name
                 self.logger = get_logger(self.name)
                 break
@@ -124,7 +137,7 @@ def _handle_controllable_team_info(
     ):
         self.team = player_mappings.team
         controllable = player_mappings.controllables[0]
-        self.spawn_id = controllable.spawn_id
+        self.player_id = controllable.identifier
         self.index = controllable.index
         self._has_player_mapping = True
 

rlbot/managers/hivemind.py

@@ -14,6 +14,8 @@
 from rlbot.utils import fill_desired_game_state
 from rlbot.utils.logging import DEFAULT_LOGGER, get_logger
 
+WARNED_SPAWN_ID_DEPRECATED = False
+
 
 class Hivemind:
     """
@@ -30,7 +32,18 @@ class Hivemind:
     team: int = -1
     indices: list[int] = []
     names: list[str] = []
-    spawn_ids: list[int] = []
+    player_ids: list[int] = []
+
+    @property
+    def spawn_ids(self) -> list[int]:
+        global WARNED_SPAWN_ID_DEPRECATED
+        if not WARNED_SPAWN_ID_DEPRECATED:
+            WARNED_SPAWN_ID_DEPRECATED = True
+            self._logger.warning(
+                "'spawn_id' getter accessed, which is deprecated in favor of 'player_id'."
+            )
+
+        return self.player_ids
 
     match_config = flat.MatchConfiguration()
     """
@@ -92,9 +105,9 @@ def _try_initialize(self):
             return
 
         # Search match settings for our spawn ids
-        for spawn_id in self.spawn_ids:
+        for player_id in self.player_ids:
             for player in self.match_config.player_configurations:
-                if player.spawn_id == spawn_id:
+                if player.player_id == player_id:
                     self.names.append(player.name)
                     self.loggers.append(get_logger(player.name))
                     break
@@ -128,7 +141,7 @@ def _handle_controllable_team_info(
     ):
         self.team = player_mappings.team
         for controllable in player_mappings.controllables:
-            self.spawn_ids.append(controllable.spawn_id)
+            self.player_ids.append(controllable.identifier)
             self.indices.append(controllable.index)
 
         self._has_player_mapping = True

rlbot/managers/rendering.py

@@ -83,12 +83,18 @@ def create_color_hsv(hue: float, saturation: float, value: float) -> flat.Color:
         t = value * (1 - (1 - f) * saturation)
 
         match i % 6:
-            case 0: r, g, b = value, t, p
-            case 1: r, g, b = q, value, p
-            case 2: r, g, b = p, value, t
-            case 3: r, g, b = p, q, value
-            case 4: r, g, b = t, p, value
-            case 5: r, g, b = value, p, q
+            case 0:
+                r, g, b = value, t, p
+            case 1:
+                r, g, b = q, value, p
+            case 2:
+                r, g, b = p, value, t
+            case 3:
+                r, g, b = p, q, value
+            case 4:
+                r, g, b = t, p, value
+            case 5:
+                r, g, b = value, p, q
 
         return flat.Color(math.floor(r * 255), math.floor(g * 255), math.floor(b * 255))
 

rlbot/version.py

@@ -1 +1 @@
-__version__ = "2.0.0-beta.43"
+__version__ = "2.0.0-beta.44"

tests/render_test/render.py

@@ -30,10 +30,12 @@ def handle_packet(self, packet: flat.GamePacket):
 
             self.do_render(radius)
 
-        self.renderer.begin_rendering('tick')
-        hsv = self.renderer.create_color_hsv(packet.match_info.seconds_elapsed * 0.1, 1.0, 1.0)
+        self.renderer.begin_rendering("tick")
+        hsv = self.renderer.create_color_hsv(
+            packet.match_info.seconds_elapsed * 0.1, 1.0, 1.0
+        )
         self.renderer.set_resolution(1920, 1080)
-        self.renderer.draw_string_2d('HSV 300px 50px', 300, 50, 1.0, hsv)
+        self.renderer.draw_string_2d("HSV 300px 50px", 300, 50, 1.0, hsv)
         self.renderer.set_resolution(1, 1)
         self.renderer.end_rendering()
 
@@ -74,9 +76,7 @@ def do_render(self, radius: float):
             CarAnchor(0, Vector3(200, 0, 0)), 0.02, 0.02, self.renderer.blue
         )
 
-        self.renderer.draw_rect_2d(
-            0.75, 0.75, 0.1, 0.1, Color(150, 30, 100), centered=False
-        )
+        self.renderer.draw_rect_2d(0.75, 0.75, 0.1, 0.1, Color(150, 30, 100))
         self.renderer.draw_rect_2d(0.75, 0.75, 0.1, 0.1, self.renderer.black)
         for hkey, h in {
             "left": flat.TextHAlign.Left,