From bbaf294b681086c3e69acf1df86f841823d6dc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Kami=C5=84ski?= Date: Sat, 31 Aug 2024 16:29:22 +0200 Subject: [PATCH] Update few messages --- .../V66/Character/Command/FriendsListRequest.cs | 2 +- .../Command/PickupCarryableObjectByProximity.cs | 3 ++- .../GSS/V66/Character/Command/RequestTransfer.cs | 4 +++- .../Character/Event/FactionReputationUpdate.cs | 2 ++ .../GSS/V66/Character/Event/FoundResourceAreas.cs | 15 +++++++++------ .../Event/ResourceLocationInfosResponse.cs | 6 +++--- .../GSS/V66/Generic/Event/EncounterUIScopeIn.cs | 2 +- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/AeroMessages/GSS/V66/Character/Command/FriendsListRequest.cs b/AeroMessages/GSS/V66/Character/Command/FriendsListRequest.cs index 9799722..1ae8804 100644 --- 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; } } \ No newline at end of file diff --git a/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs b/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs index e3662ad..87dd66b 100644 --- a/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs +++ b/AeroMessages/GSS/V66/Character/Command/PickupCarryableObjectByProximity.cs @@ -1,4 +1,5 @@ using Aero.Gen.Attributes; +using AeroMessages.Common; using static Aero.Gen.Attributes.AeroMessageIdAttribute; namespace AeroMessages.GSS.V66.Character.Command { @@ -6,6 +7,6 @@ namespace AeroMessages.GSS.V66.Character.Command [AeroMessageId(MsgType.GSS, MsgSrc.Command, 2, 189)] public partial class PickupCarryableObjectByProximity { - public ulong Unk1; + public EntityId Carryable; } } \ No newline at end of file diff --git a/AeroMessages/GSS/V66/Character/Command/RequestTransfer.cs b/AeroMessages/GSS/V66/Character/Command/RequestTransfer.cs index 652150b..1404a0e 100644 --- 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; } } \ No newline at end of file diff --git a/AeroMessages/GSS/V66/Character/Event/FactionReputationUpdate.cs b/AeroMessages/GSS/V66/Character/Event/FactionReputationUpdate.cs index 6c93427..0b6db20 100644 --- 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; } } \ No newline at end of file diff --git a/AeroMessages/GSS/V66/Character/Event/FoundResourceAreas.cs b/AeroMessages/GSS/V66/Character/Event/FoundResourceAreas.cs index 5713281..d77cf4f 100644 --- 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; } } \ No newline at end of file diff --git a/AeroMessages/GSS/V66/Character/Event/ResourceLocationInfosResponse.cs b/AeroMessages/GSS/V66/Character/Event/ResourceLocationInfosResponse.cs index 95a4320..d126f91 100644 --- 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 index cb35b6b..a22a13e 100644 --- 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; }