Merge pull request #6 from SzymonKaminski/ui-messages

Update UI-related messages
themeldingwars · May 1, 2024 · 2fd18ef · 2fd18ef
2 parents f05e51d + fb15222
commit 2fd18ef
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 18 deletions.
diff --git a/AeroMessages/GSS/V66/AreaVisualData/View/MapMarkerView.cs b/AeroMessages/GSS/V66/AreaVisualData/View/MapMarkerView.cs
@@ -56,9 +56,11 @@ public partial class MapMarkerView
     public struct MapMarkerData
     {
         [AeroSdb("dbencounterdata::MapMarkerInfo", "id")]
-        public ushort MarkerType; // Weird
-        public uint Unk2;
-        public uint Unk3;
+        public ushort MarkerType;
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint TitleId;
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint DescriptionId;
 
         public EntityId EncounterId;
         public EntityId EncounterMarkerId; // No controller specified.

diff --git a/AeroMessages/GSS/V66/Character/Controller/MissionAndMarkerController.cs b/AeroMessages/GSS/V66/Character/Controller/MissionAndMarkerController.cs
@@ -115,9 +115,11 @@ public partial class MissionAndMarkerController
     public struct PersonalMapMarkerData
     {
         [AeroSdb("dbencounterdata::MapMarkerInfo", "id")]
-        public ushort MarkerType; // Weird
-        public uint Unk2;
-        public uint Unk3;
+        public ushort MarkerType;
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint TitleId;
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint DescriptionId;
         public EntityId EncounterId;
         public EntityId EncounterMarkerId; // No controller specified.
 

diff --git a/AeroMessages/GSS/V66/Generic/Event/DisplayUiNotification.cs b/AeroMessages/GSS/V66/Generic/Event/DisplayUiNotification.cs
@@ -6,11 +6,21 @@ namespace AeroMessages.GSS.V66.Generic
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 103)]
     public partial class DisplayUiNotification
     {
+        public enum BannerType : byte
+        {
+            Normal = 1,
+            MoneyBomb = 2,
+        }
+
         [AeroSdb("dblocalization::LocalizedText", "id")]
         public uint LocalizedTextId;
-        public uint Unk1;
+
+        public uint Duration; // seconds
+
         [AeroArray(typeof(byte))] public UiNotificationData[] Unk2;
-        public byte Unk3;
+
+        [AeroSdb("dbcharacter::BannerType", "id")]
+        public BannerType Banner;
     }
 
     [AeroBlock]

diff --git a/AeroMessages/GSS/V66/Generic/Event/PingMap.cs b/AeroMessages/GSS/V66/Generic/Event/PingMap.cs
@@ -6,8 +6,17 @@ namespace AeroMessages.GSS.V66.Generic
     [Aero]
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 110)]
     public partial class PingMap
-    {   
+    {
+        public enum PingMapType : uint
+        {
+            Normal = 1, // orange
+            Dynamic = 2, // purple
+            // anything else => white
+        }
+
         public Vector3 Position;
-        public uint Unk;
+
+        [AeroSdb("dbcharacter::UiPingType", "id")]
+        public PingMapType Type;
     }
 }
diff --git a/AeroMessages/GSS/V66/Generic/Event/SendTipMessage.cs b/AeroMessages/GSS/V66/Generic/Event/SendTipMessage.cs
@@ -1,18 +1,30 @@
 using Aero.Gen.Attributes;
 using static Aero.Gen.Attributes.AeroMessageIdAttribute;
 using AeroMessages.Common;
-using System.Numerics;
-using System;
 namespace AeroMessages.GSS.V66.Generic
 {
     [Aero]
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 92)]
     public partial class SendTipMessage
-    {   
-        public byte Unk1;
-        public uint Unk2;
-        public uint Unk3;
-        public HalfFloat Unk4;
-        public sbyte Unk5;
+    {
+        public enum HintType : byte
+        {
+            None = 0,
+            Movement = 1,
+            TechSlot = 2
+        }
+
+        [AeroSdb("clientmissions::UiHints", "id")]
+        public HintType Hint;
+
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint MessageId;
+
+        [AeroSdb("dblocalization::LocalizedText", "id")]
+        public uint HeaderId;
+
+        public HalfFloat Duration; // seconds
+
+        public sbyte Persistent;
     }
 }