Merge pull request #10 from SzymonKaminski/few-messages

Update few messages
themeldingwars · Aug 31, 2024 · 0a6f832 · 0a6f832
2 parents b3cbddd + bbaf294
commit 0a6f832
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/AeroMessages/GSS/V66/Character/Command/FriendsListRequest.cs b/AeroMessages/GSS/V66/Character/Command/FriendsListRequest.cs
@@ -6,6 +6,6 @@ namespace AeroMessages.GSS.V66.Character.Command
     [AeroMessageId(MsgType.GSS, MsgSrc.Command, 2, 248)]
     public partial class FriendsListRequest
     {
-        public uint Page; // Assumption
+        public uint Page;
     }
 }
diff --git a/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs b/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs
@@ -1,11 +1,12 @@
 using Aero.Gen.Attributes;
+using AeroMessages.Common;
 using static Aero.Gen.Attributes.AeroMessageIdAttribute;
 namespace AeroMessages.GSS.V66.Character.Command
 {
     [Aero]
     [AeroMessageId(MsgType.GSS, MsgSrc.Command, 2, 189)]
     public partial class PickupCarryableObjectByProximity
     {
-        public ulong Unk1;
+        public EntityId Carryable;
     }
 }
diff --git a/AeroMessages/GSS/V66/Character/Command/RequestTransfer.cs b/AeroMessages/GSS/V66/Character/Command/RequestTransfer.cs
@@ -6,7 +6,9 @@ namespace AeroMessages.GSS.V66.Character.Command
     [AeroMessageId(MsgType.GSS, MsgSrc.Command, 2, 199)]
     public partial class RequestTransfer
     {
-        public uint Unk1;
+        [AeroSdb("dbzonemetadata::ZoneRecord", "id")]
+        public uint ZoneId;
+
         public byte Unk2;
     }
 }
diff --git a/AeroMessages/GSS/V66/Character/Event/FactionReputationUpdate.cs b/AeroMessages/GSS/V66/Character/Event/FactionReputationUpdate.cs
@@ -13,7 +13,9 @@ public partial class FactionReputationUpdate
     [AeroBlock]
     public struct FactionReputationData
     {
+        [AeroSdb("dbcharacter::Faction", "id")]
         public byte FactionId;
+
         public uint Points;
     }
 }
diff --git a/AeroMessages/GSS/V66/Character/Event/FoundResourceAreas.cs b/AeroMessages/GSS/V66/Character/Event/FoundResourceAreas.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Aero.Gen.Attributes;
 using static Aero.Gen.Attributes.AeroMessageIdAttribute;
 namespace AeroMessages.GSS.V66.Character.Event
@@ -6,16 +7,18 @@ namespace AeroMessages.GSS.V66.Character.Event
     [AeroMessageId(MsgType.GSS, MsgSrc.Message, 2, 138)]
     public partial class FoundResourceAreas
     {
-        [AeroArray(typeof(byte))] public ResourceAreaData[] Data;
+        [AeroArray(typeof(byte))] public ResourceArea[] Data;
     }
 
     [AeroBlock]
-    public struct ResourceAreaData
+    public struct ResourceArea
     {
-        public uint Unk1;
-        public uint Unk2;
-        public uint Unk3;
+        public Vector3 Center;
+
         public uint Unk4;
-        public uint Unk5;
+
+        [AeroSdb("dbzonemetadata::ResourceNodeTypeResource", "node_type_id")]
+        // [AeroSdb("dbzonemetadata::ResourceNodeType", "id")]
+        public uint NodeTypeId;
     }
 }
diff --git a/AeroMessages/GSS/V66/Character/Event/ResourceLocationInfosResponse.cs b/AeroMessages/GSS/V66/Character/Event/ResourceLocationInfosResponse.cs
@@ -14,9 +14,9 @@ public partial class ResourceLocationInfosResponse
     [AeroBlock]
     public struct ResourceLocationInfo
     {
-        public uint Unk1; // x?
-        public uint Unk2; // y?
-        public uint Unk3; // z?
+        public float Unk1; // x?
+        public float Unk2; // y?
+        public float Unk3; // z?
         public uint Unk4; // radius?
         [AeroArray(typeof(byte))] public ResourceLocationInfoInner[] Unk5; // 'composition'
     }

diff --git a/AeroMessages/GSS/V66/Generic/Event/EncounterUIScopeIn.cs b/AeroMessages/GSS/V66/Generic/Event/EncounterUIScopeIn.cs
@@ -41,7 +41,7 @@ public struct SinCardData
 
         [AeroSdb("dbencounterdata::SinCardTemplate", "Id")]
         //[AeroSdb("dbencounterdata::SinCardFields", "TemplateId")]
-        public int Type;
+        public uint Type;
 
         [AeroArray(typeof(byte))] public SinCardFieldData[] Fields;
     }