feat(gameevents): Expand with new fields

Author: skuzzis

generator/gameevent_generator/generate.py

@@ -473,8 +473,7 @@ def render_class(event: GameEventDef) -> str:
   for fname, fdef in event.fields.items():
     ftype = fdef.type_name
 
-    # userid override: expand to controller, pawn (readonly) and raw int (readwrite)
-    if fname.lower() == 'userid':
+    if ftype == 'player_controller' or ftype == 'player_controller_and_pawn' or fname.lower() == 'userid':
       base_prop = to_property_name(fname)  # UserId
       # Controller
       prop_name_ctrl = f"{base_prop}Controller"

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventAchievementEarnedImpl.cs

@@ -17,9 +17,21 @@ public EventAchievementEarnedImpl(nint address) : base(address)
   {
   }
 
+  // entindex of the player
+  public CCSPlayerController PlayerController
+  { get => Accessor.GetPlayerController("player"); }
+
+  // entindex of the player
+  public CCSPlayerPawn PlayerPawn
+  { get => Accessor.GetPlayerPawn("player"); }
+
+  // entindex of the player
+  public IPlayer PlayerPlayer
+  { get => Accessor.GetPlayer("player"); }
+
   // entindex of the player
   public int Player
-  { get => Accessor.GetPlayerSlot("player"); set => Accessor.SetPlayerSlot("player", value); }
+  { get => Accessor.GetInt32("player"); set => Accessor.SetInt32("player", value); }
 
   // achievement ID
   public short Achievement

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventBotTakeoverImpl.cs

@@ -29,8 +29,17 @@ public IPlayer UserIdPlayer
   public int UserId
   { get => Accessor.GetInt32("userid"); set => Accessor.SetInt32("userid", value); }
 
+  public CCSPlayerController BotIDController
+  { get => Accessor.GetPlayerController("botid"); }
+
+  public CCSPlayerPawn BotIDPawn
+  { get => Accessor.GetPlayerPawn("botid"); }
+
+  public IPlayer BotIDPlayer
+  { get => Accessor.GetPlayer("botid"); }
+
   public int BotID
-  { get => Accessor.GetPlayerSlot("botid"); set => Accessor.SetPlayerSlot("botid", value); }
+  { get => Accessor.GetInt32("botid"); set => Accessor.SetInt32("botid", value); }
 
   public float P
   { get => Accessor.GetFloat("p"); set => Accessor.SetFloat("p", value); }

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventBulletDamageImpl.cs

@@ -17,13 +17,37 @@ public EventBulletDamageImpl(nint address) : base(address)
   {
   }
 
+  // player index who was hurt
+  public CCSPlayerController VictimController
+  { get => Accessor.GetPlayerController("victim"); }
+
+  // player index who was hurt
+  public CCSPlayerPawn VictimPawn
+  { get => Accessor.GetPlayerPawn("victim"); }
+
+  // player index who was hurt
+  public IPlayer VictimPlayer
+  { get => Accessor.GetPlayer("victim"); }
+
   // player index who was hurt
   public int Victim
-  { get => Accessor.GetPlayerSlot("victim"); set => Accessor.SetPlayerSlot("victim", value); }
+  { get => Accessor.GetInt32("victim"); set => Accessor.SetInt32("victim", value); }
+
+  // player index who attacked
+  public CCSPlayerController AttackerController
+  { get => Accessor.GetPlayerController("attacker"); }
+
+  // player index who attacked
+  public CCSPlayerPawn AttackerPawn
+  { get => Accessor.GetPlayerPawn("attacker"); }
+
+  // player index who attacked
+  public IPlayer AttackerPlayer
+  { get => Accessor.GetPlayer("attacker"); }
 
   // player index who attacked
   public int Attacker
-  { get => Accessor.GetPlayerSlot("attacker"); set => Accessor.SetPlayerSlot("attacker", value); }
+  { get => Accessor.GetInt32("attacker"); set => Accessor.SetInt32("attacker", value); }
 
   // how far the bullet travelled before it hit the player
   public float Distance

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventCsWinPanelRoundImpl.cs

@@ -33,8 +33,17 @@ public byte FinalEvent
   public string FunfactToken
   { get => Accessor.GetString("funfact_token"); set => Accessor.SetString("funfact_token", value); }
 
+  public CCSPlayerController FunfactPlayerController
+  { get => Accessor.GetPlayerController("funfact_player"); }
+
+  public CCSPlayerPawn FunfactPlayerPawn
+  { get => Accessor.GetPlayerPawn("funfact_player"); }
+
+  public IPlayer FunfactPlayerPlayer
+  { get => Accessor.GetPlayer("funfact_player"); }
+
   public int FunfactPlayer
-  { get => Accessor.GetPlayerSlot("funfact_player"); set => Accessor.SetPlayerSlot("funfact_player", value); }
+  { get => Accessor.GetInt32("funfact_player"); set => Accessor.SetInt32("funfact_player", value); }
 
   public int FunfactData1
   { get => Accessor.GetInt32("funfact_data1"); set => Accessor.SetInt32("funfact_data1", value); }

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventGgKilledEnemyImpl.cs

@@ -17,13 +17,37 @@ public EventGgKilledEnemyImpl(nint address) : base(address)
   {
   }
 
+  // user ID who died
+  public CCSPlayerController VictimIDController
+  { get => Accessor.GetPlayerController("victimid"); }
+
+  // user ID who died
+  public CCSPlayerPawn VictimIDPawn
+  { get => Accessor.GetPlayerPawn("victimid"); }
+
+  // user ID who died
+  public IPlayer VictimIDPlayer
+  { get => Accessor.GetPlayer("victimid"); }
+
   // user ID who died
   public int VictimID
-  { get => Accessor.GetPlayerSlot("victimid"); set => Accessor.SetPlayerSlot("victimid", value); }
+  { get => Accessor.GetInt32("victimid"); set => Accessor.SetInt32("victimid", value); }
+
+  // user ID who killed
+  public CCSPlayerController AttackerIDController
+  { get => Accessor.GetPlayerController("attackerid"); }
+
+  // user ID who killed
+  public CCSPlayerPawn AttackerIDPawn
+  { get => Accessor.GetPlayerPawn("attackerid"); }
+
+  // user ID who killed
+  public IPlayer AttackerIDPlayer
+  { get => Accessor.GetPlayer("attackerid"); }
 
   // user ID who killed
   public int AttackerID
-  { get => Accessor.GetPlayerSlot("attackerid"); set => Accessor.SetPlayerSlot("attackerid", value); }
+  { get => Accessor.GetInt32("attackerid"); set => Accessor.SetInt32("attackerid", value); }
 
   // did killer dominate victim with this kill
   public short Dominated

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventHltvChaseImpl.cs

@@ -18,13 +18,37 @@ public EventHltvChaseImpl(nint address) : base(address)
   {
   }
 
+  // primary traget index
+  public CCSPlayerController Target1Controller
+  { get => Accessor.GetPlayerController("target1"); }
+
+  // primary traget index
+  public CCSPlayerPawn Target1Pawn
+  { get => Accessor.GetPlayerPawn("target1"); }
+
+  // primary traget index
+  public IPlayer Target1Player
+  { get => Accessor.GetPlayer("target1"); }
+
   // primary traget index
   public int Target1
-  { get => Accessor.GetPlayerSlot("target1"); set => Accessor.SetPlayerSlot("target1", value); }
+  { get => Accessor.GetInt32("target1"); set => Accessor.SetInt32("target1", value); }
+
+  // secondary traget index or 0
+  public CCSPlayerController Target2Controller
+  { get => Accessor.GetPlayerController("target2"); }
+
+  // secondary traget index or 0
+  public CCSPlayerPawn Target2Pawn
+  { get => Accessor.GetPlayerPawn("target2"); }
+
+  // secondary traget index or 0
+  public IPlayer Target2Player
+  { get => Accessor.GetPlayer("target2"); }
 
   // secondary traget index or 0
   public int Target2
-  { get => Accessor.GetPlayerSlot("target2"); set => Accessor.SetPlayerSlot("target2", value); }
+  { get => Accessor.GetInt32("target2"); set => Accessor.SetInt32("target2", value); }
 
   // camera distance
   public short Distance

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventHltvFixedImpl.cs

@@ -41,7 +41,19 @@ public short Offset
   public float FOv
   { get => Accessor.GetFloat("fov"); set => Accessor.SetFloat("fov", value); }
 
+  // follow this player
+  public CCSPlayerController TargetController
+  { get => Accessor.GetPlayerController("target"); }
+
+  // follow this player
+  public CCSPlayerPawn TargetPawn
+  { get => Accessor.GetPlayerPawn("target"); }
+
+  // follow this player
+  public IPlayer TargetPlayer
+  { get => Accessor.GetPlayer("target"); }
+
   // follow this player
   public int Target
-  { get => Accessor.GetPlayerSlot("target"); set => Accessor.SetPlayerSlot("target", value); }
+  { get => Accessor.GetInt32("target"); set => Accessor.SetInt32("target", value); }
 }

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventHltvRankCameraImpl.cs

@@ -26,7 +26,19 @@ public byte Index
   public float Rank
   { get => Accessor.GetFloat("rank"); set => Accessor.SetFloat("rank", value); }
 
+  // best/closest target entity
+  public CCSPlayerController TargetController
+  { get => Accessor.GetPlayerController("target"); }
+
+  // best/closest target entity
+  public CCSPlayerPawn TargetPawn
+  { get => Accessor.GetPlayerPawn("target"); }
+
+  // best/closest target entity
+  public IPlayer TargetPlayer
+  { get => Accessor.GetPlayer("target"); }
+
   // best/closest target entity
   public int Target
-  { get => Accessor.GetPlayerSlot("target"); set => Accessor.SetPlayerSlot("target", value); }
+  { get => Accessor.GetInt32("target"); set => Accessor.SetInt32("target", value); }
 }

managed/src/SwiftlyS2.Generated/GameEvents/Classes/EventHltvRankEntityImpl.cs

@@ -38,7 +38,19 @@ public int UserId
   public float Rank
   { get => Accessor.GetFloat("rank"); set => Accessor.SetFloat("rank", value); }
 
+  // best/closest target entity
+  public CCSPlayerController TargetController
+  { get => Accessor.GetPlayerController("target"); }
+
+  // best/closest target entity
+  public CCSPlayerPawn TargetPawn
+  { get => Accessor.GetPlayerPawn("target"); }
+
+  // best/closest target entity
+  public IPlayer TargetPlayer
+  { get => Accessor.GetPlayer("target"); }
+
   // best/closest target entity
   public int Target
-  { get => Accessor.GetPlayerSlot("target"); set => Accessor.SetPlayerSlot("target", value); }
+  { get => Accessor.GetInt32("target"); set => Accessor.SetInt32("target", value); }
 }