Fix scripts

Bump version
Format

Author: VirxEC

rlbot/managers/rendering.py

@@ -114,7 +114,15 @@ def is_rendering(self):
         return self._group_id is not None
 
     def _draw(
-        self, render: flat.String2D | flat.String3D | flat.Line3D | flat.PolyLine3D | flat.Rect2D | flat.Rect3D
+        self,
+        render: (
+            flat.String2D
+            | flat.String3D
+            | flat.Line3D
+            | flat.PolyLine3D
+            | flat.Rect2D
+            | flat.Rect3D
+        ),
     ):
         self._current_renders.append(flat.RenderMessage(render))
 
@@ -180,13 +188,13 @@ def draw_string_2d(
         )
 
     def draw_rect_2d(
-            self,
-            x: float,
-            y: float,
-            width: float,
-            height: float,
-            color: flat.Color,
-            centered: bool = True
+        self,
+        x: float,
+        y: float,
+        width: float,
+        height: float,
+        color: flat.Color,
+        centered: bool = True,
     ):
         self._draw(
             flat.Rect2D(
@@ -200,11 +208,11 @@ def draw_rect_2d(
         )
 
     def draw_rect_3d(
-            self,
-            anchor: flat.RenderAnchor | flat.BallAnchor | flat.CarAnchor | flat.Vector3,
-            width: float,
-            height: float,
-            color: flat.Color,
+        self,
+        anchor: flat.RenderAnchor | flat.BallAnchor | flat.CarAnchor | flat.Vector3,
+        width: float,
+        height: float,
+        color: flat.Color,
     ):
         self._draw(
             flat.Rect3D(

rlbot/managers/script.py

@@ -18,7 +18,6 @@ class Script:
     index: int = 0
     name: str = "Unknown"
     spawn_id: int = 0
-    agent_id: str = None
 
     match_settings = flat.MatchSettings()
     field_info = flat.FieldInfo()
@@ -75,13 +74,16 @@ def _handle_match_settings(self, match_settings: flat.MatchSettings):
         self.match_settings = match_settings
 
         for i, script in enumerate(match_settings.script_configurations):
-            if script.agent_id == self.agent_id:
+            if script.agent_id == self._game_interface.agent_id:
                 self.index = i
                 self.name = script.name
                 self._has_match_settings = True
                 break
-        else:   # else block runs if break was not hit
-            self.logger.warning("Script with agent id '%s' did not find itself in the match settings", self.agent_id)
+        else:  # else block runs if break was not hit
+            self.logger.warning(
+                "Script with agent id '%s' did not find itself in the match settings",
+                self._game_interface.agent_id,
+            )
 
         self._try_initialize()
 
@@ -97,7 +99,6 @@ def _handle_packet(self, packet: flat.GamePacket):
         self._latest_packet = packet
 
     def _packet_processor(self, packet: flat.GamePacket):
-
         self.ball_prediction = self._latest_prediction
 
         try:

rlbot/version.py

@@ -1,4 +1,4 @@
-__version__ = "5.0.0-beta.10"
+__version__ = "5.0.0-beta.11"
 
 
 RESET_SEQ = "\033[0m"
@@ -15,6 +15,10 @@ def _get_color(color: int) -> str:
 )
 
 RELEASE_NOTES = {
+    "5.0.0-beta.11": """
+    - Fixed extraction of Script index from MatchSettings.
+    - Changed Color to RGBA instead of ARGB.
+    """,
     "5.0.0-beta.10": """
     Fix bug in hivemind & script start
     """,

tests/render_test/render.py

@@ -57,22 +57,39 @@ def do_render(self, radius: float):
         for i in range(1, len(points)):
             self.renderer.draw_line_3d(points[i - 1], points[i], self.renderer.red)
 
-        self.renderer.draw_rect_3d(RenderAnchor(Vector3(0, 0, 100), CarAnchor(0, Vector3(200, 0, 0))), 0.02, 0.02, self.renderer.blue)
-        self.renderer.draw_rect_3d(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(255, 150, 30, 100), centered=False)
+        self.renderer.draw_rect_3d(
+            RenderAnchor(Vector3(0, 0, 100), CarAnchor(0, Vector3(200, 0, 0))),
+            0.02,
+            0.02,
+            self.renderer.blue,
+        )
+        self.renderer.draw_rect_3d(
+            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(255, 150, 30, 100), centered=False
+        )
         self.renderer.draw_rect_2d(0.75, 0.75, 0.1, 0.1, self.renderer.black)
         for hkey, h in {
-            'left': flat.TextHAlign.Left,
-            'center': flat.TextHAlign.Center,
-            'right': flat.TextHAlign.Right,
+            "left": flat.TextHAlign.Left,
+            "center": flat.TextHAlign.Center,
+            "right": flat.TextHAlign.Right,
         }.items():
             for vkey, v in {
-                'top': flat.TextVAlign.Top,
-                'center': flat.TextVAlign.Center,
-                'bottom': flat.TextVAlign.Bottom,
+                "top": flat.TextVAlign.Top,
+                "center": flat.TextVAlign.Center,
+                "bottom": flat.TextVAlign.Bottom,
             }.items():
-                self.renderer.draw_string_2d(f'\n\n{vkey:^14}\n{hkey:^14}\n\n', 0.75, 0.75, 0.66, self.renderer.white, h_align=h, v_align=v)
+                self.renderer.draw_string_2d(
+                    f"\n\n{vkey:^14}\n{hkey:^14}\n\n",
+                    0.75,
+                    0.75,
+                    0.66,
+                    self.renderer.white,
+                    h_align=h,
+                    v_align=v,
+                )
 
         self.renderer.end_rendering()