Merge pull request #7 from SzymonKaminski/vehicle-abilities

Update vehicle's (De)activateAbility classes
themeldingwars · May 30, 2024 · 0117abc · 0117abc
2 parents 6d91f4c + 2d7e848
commit 0117abc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/AeroMessages/GSS/V66/Vehicle/Command/ActivateAbility.cs b/AeroMessages/GSS/V66/Vehicle/Command/ActivateAbility.cs
@@ -8,8 +8,8 @@ namespace AeroMessages.GSS.V66.Vehicle.Command
     public partial class ActivateAbility
     {
         public uint Time;
-        public byte AbilityIdx; // 0x05 == Honk, 0x08 == SIN, lookup in vehicle components
+        public AbilitySlotIndex AbilitySlotIndex;
         [AeroArray(typeof(byte))] public EntityId[] Targets;
-        public byte Unk2; // TraceAbilities?
+        public byte TraceAbilities; // traceAbilities command in console toggles this
     }
 }
diff --git a/AeroMessages/GSS/V66/Vehicle/Command/DeactivateAbility.cs b/AeroMessages/GSS/V66/Vehicle/Command/DeactivateAbility.cs
@@ -7,6 +7,6 @@ namespace AeroMessages.GSS.V66.Vehicle.Command
     public partial class DeactivateAbility
     {
         public uint Time;
-        public byte AbilityIdx; // 0x05 == Honk, 0x08 == SIN, lookup in vehicle components
+        public AbilitySlotIndex AbilitySlotIndex;
     }
 }
diff --git a/AeroMessages/GSS/V66/Vehicle/VehicleShared.cs b/AeroMessages/GSS/V66/Vehicle/VehicleShared.cs
@@ -1,11 +1,17 @@
 using Aero.Gen.Attributes;
-using static Aero.Gen.Attributes.AeroIfAttribute;
-using static Aero.Gen.Attributes.AeroMessageIdAttribute;
 using AeroMessages.Common;
 using System.Numerics;
-using System;
+
 namespace AeroMessages.GSS.V66.Vehicle
 {
+    public enum AbilitySlotIndex : byte
+    {
+        Honk = 5,
+        Boost = 6,
+        Utility = 7,
+        SIN = 8,
+    }
+
     [AeroBlock]
     public struct CurrentPoseData
     {