Update some generic events

themeldingwars · Jun 15, 2024 · 21bf9cb · 21bf9cb
1 parent 32ffd9e
commit 21bf9cb
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 73 deletions.
diff --git a/AeroMessages/GSS/V66/Generic/Event/AchievementUnlocked.cs b/AeroMessages/GSS/V66/Generic/Event/AchievementUnlocked.cs
@@ -6,6 +6,6 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 81)]
     public partial class AchievementUnlocked
     {
-        public ulong Unk;
+        public ulong Unk; // MissionId
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyAbortAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyAbortAck.cs
@@ -6,8 +6,8 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 70)]
     public partial class BountyAbortAck
     {
-        public uint BountyId; // Unsure how this id works
-        public byte Unk1;
-        public byte Unk2;
+        public uint BountyDefId;
+        public byte Success;
+        public byte Reason; // [0-4]
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyActivationAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyActivationAck.cs
@@ -6,9 +6,9 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 71)]
     public partial class BountyActivationAck
     {
-        public uint BountyId; // Unsure how this id works
-        public byte Unk1;
-        public byte Unk2;
+        public uint BountyDefId;
+        public byte Success;
+        public byte Reason; // [0-17]
         public byte Unk3; // Row / type?
         public uint Unk4;
 

diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyClearAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyClearAck.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 75)]
     public partial class BountyClearAck
     {
-        public byte Unk1;
-        public byte Unk2;
+        public byte Success;
+        public byte Unk2; // Count or category?
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyClearPreviousAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyClearPreviousAck.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 76)]
     public partial class BountyClearPreviousAck
     {
-        public byte Unk1;
-        public byte Unk2;
+        public byte Success;
+        public byte Unk2; // Count or category?
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyListActiveAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyListActiveAck.cs
@@ -6,8 +6,8 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 72)]
     public partial class BountyListActiveAck
     {
-        public byte Unk1;
-        public byte Unk2;
+        public byte Success;
+        public byte Unk2; // Count or category?
         [AeroString(typeof(ushort))] public string JSON;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyListActiveDetailsAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyListActiveDetailsAck.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 73)]
     public partial class BountyListActiveDetailsAck
     {
-        public byte Unk1;
+        public byte Success;
         [AeroString(typeof(ushort))] public string JSON;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyListAvailableAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyListAvailableAck.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 74)]
     public partial class BountyListAvailableAck
     {
-        public byte Unk1;
+        public byte Success;
         [AeroString(typeof(ushort))] public string JSON;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyListPreviousAck.cs b/AeroMessages/GSS/V66/Generic/Event/BountyListPreviousAck.cs
@@ -6,8 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 77)]
     public partial class BountyListPreviousAck
     {
-
-        public byte Unk1;
+        public byte Success;
         [AeroString(typeof(ushort))] public string JSON;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyRerollResponse.cs b/AeroMessages/GSS/V66/Generic/Event/BountyRerollResponse.cs
@@ -6,8 +6,8 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 78)]
     public partial class BountyRerollResponse
     {
-        public uint Unk1;
-        public byte Unk2;
+        public uint BountyDefId;
+        public byte Success;
         [AeroString] public string Response;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/BountyStatusChanged.cs b/AeroMessages/GSS/V66/Generic/Event/BountyStatusChanged.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 69)]
     public partial class BountyStatusChanged
     {
-        public uint BountyId; // Unsure how this id works
+        public uint BountyDefId;
         public byte Status;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/ConductorGlobalAnnouncement.cs b/AeroMessages/GSS/V66/Generic/Event/ConductorGlobalAnnouncement.cs
@@ -9,15 +9,15 @@ namespace AeroMessages.GSS.V66.Generic
     public partial class ConductorGlobalAnnouncement
     {
         public GlobalAnnouncementData Data;
-        public byte Unk2;
+        public byte Activated; // [0,1]
     }
 
     [AeroBlock]
     public struct GlobalAnnouncementData
     {
         public uint Unk1;
         public uint Unk2;
-        public uint Unk3;
+        public uint Unk3; // ActionId?
         [AeroString] public string Unk4;
         [AeroString] public string Unk5;
         public byte HaveUnk6;

diff --git a/AeroMessages/GSS/V66/Generic/Event/ContentUnlocked.cs b/AeroMessages/GSS/V66/Generic/Event/ContentUnlocked.cs
@@ -8,8 +8,8 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 84)]
     public partial class ContentUnlocked
     {
-        [AeroString] public string Unk1;
-        public uint Unk2;
-        public ulong Unk3;
+        [AeroString] public string ContentType;
+        public uint ContentId;
+        public ulong Duration;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/CurrentLoadoutResponse.cs b/AeroMessages/GSS/V66/Generic/Event/CurrentLoadoutResponse.cs
@@ -9,7 +9,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 119)]
     public partial class CurrentLoadoutResponse
     {
-        public EntityId Unk1;
+        public EntityId PlayerId;
         public int Unk2;
         public int Unk3;
         [AeroString] public string Unk4;

diff --git a/AeroMessages/GSS/V66/Generic/Event/DisplayMoneyBombBanner.cs b/AeroMessages/GSS/V66/Generic/Event/DisplayMoneyBombBanner.cs
@@ -6,8 +6,9 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 104)]
     public partial class DisplayMoneyBombBanner
     {
-        public uint Unk1;
-        [AeroString] public string Unk2;
-        public uint Unk3;
+        [AeroSdb("dbcharacter::MoneyBombBanner", "id")]
+        public uint SdbId;
+        [AeroString] public string SponsoredByName;
+        public uint Duration;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/DisplayUiNotification.cs b/AeroMessages/GSS/V66/Generic/Event/DisplayUiNotification.cs
@@ -17,7 +17,7 @@ public enum BannerType : byte
 
         public uint Duration; // seconds
 
-        [AeroArray(typeof(byte))] public UiNotificationData[] Unk2;
+        [AeroArray(typeof(byte))] public UiNotificationData[] Unk2; // Formatted args for localized text?
 
         [AeroSdb("dbcharacter::BannerType", "id")]
         public BannerType Banner;
@@ -26,9 +26,9 @@ public enum BannerType : byte
     [AeroBlock]
     public struct UiNotificationData
     {
-        public byte Unk1;
-        [AeroString] public string Unk2;
-        public int Unk3;
-        public int Unk4;
+        public byte Unk1; // 0 (?), 1 (%u), 2 (%.2f)
+        [AeroString] public string Unk2; // txt?
+        public int Unk3; // uint?
+        public int Unk4; // float?
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/DisplayUiTrackBounty.cs b/AeroMessages/GSS/V66/Generic/Event/DisplayUiTrackBounty.cs
@@ -6,6 +6,6 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 79)]
     public partial class DisplayUiTrackBounty
     {
-        public uint Unk; // BountyId?
+        public uint BountyDefId;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/MissionActivationAck.cs b/AeroMessages/GSS/V66/Generic/Event/MissionActivationAck.cs
@@ -10,7 +10,7 @@ public partial class MissionActivationAck
         //[AeroSdb("clientmissions::MissionObjective","mission_id")]
         public uint MissionId;
 
-        public byte Unk1;
-        public byte Unk2;
+        public byte Success;
+        public byte Reason;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/MissionObjectiveUpdated.cs b/AeroMessages/GSS/V66/Generic/Event/MissionObjectiveUpdated.cs
@@ -12,15 +12,15 @@ public partial class MissionObjectiveUpdated
         //[AeroSdb("clientmissions::MissionObjective","mission_id")]
         public ulong MissionId;
 
-        public uint Unk1;
+        public uint ObjectiveIdx;
 
         [AeroString]
         public string TextObjectiveTitle;
 
         [AeroString]
         public string TextObjectiveProgress;
 
-        public byte Unk2; // Some special type
+        public byte Status; // Some special type (2 => completed)
 
         public float Unk3; // Progress as Percentage
     }

diff --git a/AeroMessages/GSS/V66/Generic/Event/MissionReturnToChanged.cs b/AeroMessages/GSS/V66/Generic/Event/MissionReturnToChanged.cs
@@ -6,7 +6,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 66)]
     public partial class MissionReturnToChanged
     {
-        public uint Unk1; // Mission id?
+        public uint MissionId; // Assumption
         public byte Unk2;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/MissionsAvailable.cs b/AeroMessages/GSS/V66/Generic/Event/MissionsAvailable.cs
@@ -6,14 +6,14 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 67)]
     public partial class MissionsAvailable
     {
-        [AeroArray(typeof(byte))] public MissionsAvailableData[] Unk1;
+        [AeroArray(typeof(byte))] public MissionsAvailableData[] Missions;
         public ulong Unk2;
     }
 
     [AeroBlock]
     public struct MissionsAvailableData
     {
-        public uint Unk1;
-        public byte Unk2;
+        public uint MissionId;
+        public byte MissionAvailability; // 0,1,2,3
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/NpcVoxelInfo.cs b/AeroMessages/GSS/V66/Generic/Event/NpcVoxelInfo.cs
@@ -9,16 +9,8 @@ namespace AeroMessages.GSS.V66.Generic
     public partial class NpcVoxelInfo
     {
         public EntityId Unk1;
-        public NpcVoxelInfoData Unk2;
+        [AeroArray(typeof(byte))] public Vector3[] Unk2;
         [AeroArray(typeof(byte))] public uint[] Unk3;
-        public byte Unk4;
-    }
-
-    [AeroBlock]
-    public struct NpcVoxelInfoData
-    {
-        public uint Unk1;
-        public uint Unk2;
-        public uint Unk3;
+        public byte Unk4; // 0 seems to clear?
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/ScoreBoardUpdatePlayerStats.cs b/AeroMessages/GSS/V66/Generic/Event/ScoreBoardUpdatePlayerStats.cs
@@ -15,5 +15,21 @@ public partial class ScoreBoardUpdatePlayerStats
         [AeroIf(nameof(HaveData), 1)]
         [AeroArray(typeof(ushort))]
         public byte[] Data;
+        /*
+        byte a (enum) (!= 0)
+        byte b (enum) (!= 0) [0x01 - 0x3d] determines format, lots of structs
+        (b == 1)
+            uint32
+            byte (enum)
+            byte (enum)
+            uint32
+        (b == 2)
+            uint32
+            uint16
+        (b == [3,4,5,6,9,10,0xe,0x13,0x14,0x15,0x16,0x17,0x1d,0x25,0x26,0x30])
+            uint32
+        
+        ...
+        */
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/SetClientDailyInfo.cs b/AeroMessages/GSS/V66/Generic/Event/SetClientDailyInfo.cs
@@ -7,7 +7,7 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 115)]
     public partial class SetClientDailyInfo
     {   
-        public uint Unk1;
-        [AeroArray(typeof(byte))] public int[] Unk2; // 00b0af40
+        public uint Unk1; // time?
+        [AeroArray(typeof(byte))] public int[] Unk2; // 00b0af40 missions?
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/Trail.cs b/AeroMessages/GSS/V66/Generic/Event/Trail.cs
@@ -8,7 +8,7 @@ namespace AeroMessages.GSS.V66.Generic
     public partial class Trail
     {
         public uint Unk1;
-        public byte Unk2;
+        public byte Unk2; // 0, 1 or 2
 
         [AeroArray(typeof(byte))]
         public Vector3[] Points;

diff --git a/AeroMessages/GSS/V66/Generic/Event/VendorPurchaseResponse.cs b/AeroMessages/GSS/V66/Generic/Event/VendorPurchaseResponse.cs
@@ -7,10 +7,10 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 121)]
     public partial class VendorPurchaseResponse
     {
-        public byte Unk1;
-        public ulong Unk2;
-        public ulong Unk3;
-        public uint Unk4;
-        [AeroString] public string Unk5;
+        public byte Success;
+        public ulong ProductId;
+        public ulong PriceId;
+        public uint VendorId;
+        [AeroString] public string Code; // Tries to default to "PURCHASE_SUCCESSFUL" if Success is not 0
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/VotekickInitiated.cs b/AeroMessages/GSS/V66/Generic/Event/VotekickInitiated.cs
@@ -7,11 +7,11 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 33)]
     public partial class VotekickInitiated
     {
-        public ulong Unk1;
-        [AeroString] public string Unk2;
-        [AeroString] public string Unk3;
-        public uint Unk4;
-        public ulong Unk5;
-        public sbyte Unk6;
+        public ulong DefendantId;
+        [AeroString] public string Defendant;
+        [AeroString] public string Initiator;
+        public uint NumVoters;
+        public ulong Timeout; // Double
+        public sbyte IsParticipant;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/VotekickResponded.cs b/AeroMessages/GSS/V66/Generic/Event/VotekickResponded.cs
@@ -7,11 +7,11 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 34)]
     public partial class VotekickResponded
     {
-        public ulong Unk1;
-        [AeroString] public string Unk2;
-        [AeroString] public string Unk3;
-        public sbyte Unk4;
-        public ushort Unk5;
-        public ushort Unk6;
+        public ulong DefendantId;
+        [AeroString] public string Defendant;
+        [AeroString] public string Respondant;
+        public sbyte ShouldKick;
+        public ushort VotesFor;
+        public ushort VotesAgainst;
     }
 }