Update rlgym_compat

Author: VirxEC

tests/necto/rlgym_compat/game_state.py

@@ -1,5 +1,3 @@
-from typing import List
-
 import numpy as np
 
 from rlbot import flat
@@ -11,12 +9,13 @@
 class GameState:
     blue_score: int = 0
     orange_score: int = 0
-    players: List[PlayerData] = []
+    players: list[PlayerData] = []
     ball = PhysicsObject()
     inverted_ball = PhysicsObject()
 
     _on_ground_ticks = np.zeros(64, dtype=np.float32)
-    _air_time = np.zeros(64, dtype=np.float32)
+    _air_time_since_jump = np.zeros(64, dtype=np.float32)
+    _has_jumped: list[bool] = [False] * 64
 
     def __init__(self, game_info: flat.FieldInfo):
         # List of "booleans" (1 or 0)
@@ -57,19 +56,21 @@ def _decode_player(
 
         if player_info.air_state == flat.AirState.OnGround:
             self._on_ground_ticks[index] = 0
-            self._air_time[index] = 0
+            self._air_time_since_jump[index] = 0
+            self._has_jumped[index] = False
         else:
             self._on_ground_ticks[index] += ticks_elapsed
 
             if player_info.air_state == flat.AirState.Jumping:
-                self._air_time[index] = 0
+                self._air_time_since_jump[index] = 0
+                self._has_jumped[index] = True
             elif player_info.air_state in {
                 flat.AirState.DoubleJumping,
                 flat.AirState.Dodging,
             }:
-                self._air_time[index] = 150
+                self._air_time_since_jump[index] = 150
             else:
-                self._air_time[index] += ticks_elapsed
+                self._air_time_since_jump[index] += ticks_elapsed
 
         player_data.car_id = index
         player_data.team_num = player_info.team
@@ -79,9 +80,9 @@ def _decode_player(
             or self._on_ground_ticks[index] <= 6
         )
         player_data.ball_touched = False
-        player_data.has_jump = player_info.air_state == flat.AirState.OnGround
+        player_data.has_jump = not self._has_jumped[index]
         # RLGym does consider the timer/unlimited flip, but i'm to lazy to track that in rlbot
-        player_data.has_flip = self._air_time[index] < 150
+        player_data.has_flip = self._air_time_since_jump[index] < 150
         player_data.boost_amount = player_info.boost / 100
 
         return player_data

tests/necto/rlgym_compat/physics_object.py

@@ -6,6 +6,11 @@
 
 
 class PhysicsObject:
+    _has_computed_rot_mtx = False
+    _rotation_mtx: np.ndarray = np.zeros((3, 3))
+    _invert_vec: np.ndarray = np.asarray([-1, -1, 1])
+    _invert_pyr: np.ndarray = np.asarray([0, math.pi, 0])
+
     def __init__(
         self,
         position=None,
@@ -15,21 +20,13 @@ def __init__(
     ):
         self.position: np.ndarray = position if position else np.zeros(3)
 
-        # ones by default to prevent mathematical errors when converting quat to rot matrix on empty physics state
-        self.quaternion: np.ndarray = np.ones(4)
-
         self.linear_velocity: np.ndarray = (
             linear_velocity if linear_velocity else np.zeros(3)
         )
         self.angular_velocity: np.ndarray = (
             angular_velocity if angular_velocity else np.zeros(3)
         )
         self._euler_angles: np.ndarray = euler_angles if euler_angles else np.zeros(3)
-        self._rotation_mtx: np.ndarray = np.zeros((3, 3))
-        self._has_computed_rot_mtx = False
-
-        self._invert_vec = np.asarray([-1, -1, 1])
-        self._invert_pyr = np.asarray([0, math.pi, 0])
 
     def decode_car_data(self, car_data: flat.Physics):
         self.position = self._vector_to_numpy(car_data.location)

tests/necto/rlgym_compat/player_data.py

@@ -2,14 +2,13 @@
 
 
 class PlayerData(object):
-    def __init__(self):
-        self.car_id: int = -1
-        self.team_num: int = -1
-        self.is_demoed: bool = False
-        self.on_ground: bool = False
-        self.ball_touched: bool = False
-        self.has_jump: bool = False
-        self.has_flip: bool = False
-        self.boost_amount: float = -1
-        self.car_data: PhysicsObject = PhysicsObject()
-        self.inverted_car_data: PhysicsObject = PhysicsObject()
+    car_id: int = -1
+    team_num: int = -1
+    is_demoed: bool = False
+    on_ground: bool = False
+    ball_touched: bool = False
+    has_jump: bool = False
+    has_flip: bool = False
+    boost_amount: float = -1
+    car_data: PhysicsObject = PhysicsObject()
+    inverted_car_data: PhysicsObject = PhysicsObject()