Merge pull request #5 from SzymonKaminski/uiquery-collision

Update UI query, vehicle collision
themeldingwars · Apr 28, 2024 · f05e51d · f05e51d
2 parents cba6889 + c559578
commit f05e51d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/AeroMessages/GSS/V66/Character/Command/UiQueryResponse.cs b/AeroMessages/GSS/V66/Character/Command/UiQueryResponse.cs
@@ -6,16 +6,20 @@ namespace AeroMessages.GSS.V66.Character.Command
     [AeroMessageId(MsgType.GSS, MsgSrc.Command, 2, 59)]
     public partial class UiQueryResponse
     {
-        public ulong Unk1;
-        public uint Unk2;
-        public byte Unk3;
-        [AeroArray(typeof(byte))] public UiQueryResponseData Unk4;
+        public ulong QueryGuid;
+
+        [AeroSdb("dbencounterdata::EncUiQueryOption", "id")]
+        public uint SelectedOptionId;
+
+        [AeroArray(typeof(byte))] public UiQueryResponseOutput[] Outputs;
     }
 
     [AeroBlock]
-    public struct UiQueryResponseData
+    public struct UiQueryResponseOutput
     {
-        public uint Unk1;
-        public uint Unk2;
+        [AeroSdb("dbencounterdata::EncUiQueryOutput", "id")]
+        public uint Id;
+
+        public float Amount;
     }
-}
+}
diff --git a/AeroMessages/GSS/V66/Character/Event/NewUiQuery.cs b/AeroMessages/GSS/V66/Character/Event/NewUiQuery.cs
@@ -6,16 +6,25 @@ namespace AeroMessages.GSS.V66.Character.Event
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 2, 143)]
     public partial class NewUiQuery
     {
-        public ulong Unk1;
-        public uint Unk2;
-        public uint Unk3;
-        [AeroArray(typeof(byte))] public NewUiQuery2x4Data[] Unk4;
+        public ulong QueryGuid;
+
+        [AeroSdb("dbencounterdata::EncUiQuery", "id")]
+        // [AeroSdb("dbencounterdata::EncUiQueryInput", "query_id")]
+        public uint Type;
+
+        [AeroSdb("dbencounterdata::EncUiQuery", "localized_text")]
+        // [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint Prompt;
+
+        [AeroArray(typeof(byte))] public NewUiQueryInput[] Inputs;
     }
 
     [AeroBlock]
-    public struct NewUiQuery2x4Data
+    public struct NewUiQueryInput
     {
-        public uint Unk1;
-        public uint Unk2;
+        [AeroSdb("dbencounterdata::EncUiQueryInput", "id")]
+        public uint Id;
+
+        public uint Value;
     }
-}
+}
diff --git a/AeroMessages/GSS/V66/Character/Event/UiQueryCancelled.cs b/AeroMessages/GSS/V66/Character/Event/UiQueryCancelled.cs
@@ -1,13 +1,11 @@
 using Aero.Gen.Attributes;
-using AeroMessages.Common;
 using static Aero.Gen.Attributes.AeroMessageIdAttribute;
-using System.Numerics;
 namespace AeroMessages.GSS.V66.Character.Event
 {
     [Aero]
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 2, 144)]
     public partial class UiQueryCancelled
     {
-        public ulong Unk1;
+        public ulong QueryGuid;
     }
-}
+}
diff --git a/AeroMessages/GSS/V66/Vehicle/Command/ReceiveCollisionDamage.cs b/AeroMessages/GSS/V66/Vehicle/Command/ReceiveCollisionDamage.cs
@@ -7,8 +7,8 @@ namespace AeroMessages.GSS.V66.Vehicle.Command
     [AeroMessageId(MsgType.GSS, MsgSrc.Command, 27, 86)]
     public partial class ReceiveCollisionDamage
     {
-        public ushort Value; // Not really sure about this value
-        public byte HaveEntity; // Possibly number of entities we collided with, or just if we collided with one
+        public ushort ShortTime; // Time when this collision is reported
+        public byte HaveEntity; // 0 or 1; separate messages are sent if collided with multiple entities at once
         [AeroIf(nameof(HaveEntity), 1)]
         public EntityId CollidedWithEntity;
     }