From a95de16c4e416610300ef2d84add957aa1cd81d7 Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sat, 27 Jun 2020 18:41:59 +0930 Subject: [PATCH 1/2] Add RetainerInformation packet definition --- src/common/Network/PacketDef/Ipcs.h | 1 + .../Network/PacketDef/Zone/ServerZoneDef.h | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 254186fc..b212d056 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -165,6 +165,7 @@ namespace Sapphire::Network::Packets // nb: see #565 on github UpdateRetainerItemSalePrice = 0x019F, // updated 5.0 + RetainerInformation = 0x0169, // updated 5.25 SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index a60dad20..d2b89684 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -2021,6 +2021,26 @@ namespace Sapphire::Network::Packets::Server char otherName[32]; }; + + struct FFXIVIpcRetainerInformation : FFXIVIpcBasePacket< RetainerInformation > + { + uint8_t unknown0[8]; + uint32_t retainerId; + uint8_t unknown2[4]; + uint8_t hireOrder; + uint8_t itemCount; + uint8_t unknown5[2]; + uint32_t gil; + uint8_t sellingCount; + uint8_t cityId; + uint8_t classJob; + uint8_t level; + uint8_t unknown11[4]; + uint32_t retainerTask; + uint32_t retainerTaskComplete; + uint8_t unknown14; + char retainerName[20]; + }; struct FFXIVIpcCharaVisualEffect : FFXIVIpcBasePacket< CharaVisualEffect > { From ba046002f13724e4d48f51a4ad5ae49d0b7cafd1 Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sat, 27 Jun 2020 18:52:52 +0930 Subject: [PATCH 2/2] Wow that was stupid --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index d2b89684..f941f744 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -2025,8 +2025,7 @@ namespace Sapphire::Network::Packets::Server struct FFXIVIpcRetainerInformation : FFXIVIpcBasePacket< RetainerInformation > { uint8_t unknown0[8]; - uint32_t retainerId; - uint8_t unknown2[4]; + uint64_t retainerId; uint8_t hireOrder; uint8_t itemCount; uint8_t unknown5[2];