From a865f7a50d39f015fbfdb72b99ed3070a9b2d01d Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Fri, 1 Nov 2019 09:22:43 -0700 Subject: [PATCH 1/2] MarketTaxRates packet opcode and structure --- src/common/Common.h | 2 ++ src/common/Network/PacketDef/Ipcs.h | 2 ++ src/common/Network/PacketDef/Zone/ServerZoneDef.h | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/src/common/Common.h b/src/common/Common.h index 7bb57000..95420945 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -27,6 +27,8 @@ namespace Sapphire::Common const uint8_t CLASSJOB_TOTAL = 38; const uint8_t CLASSJOB_SLOTS = 28; + const uint8_t TOWN_COUNT = 6; + /*! * @brief The maximum length (in ms) of a combo before it is canceled/voided. * diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index f524467e..4225017b 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -106,6 +106,8 @@ namespace Sapphire::Network::Packets ReqMoogleMailLetter = 0x0139, // updated 5.0 MailLetterNotification = 0x013A, // updated 5.0 + MarketTaxRates = 0x0076, // added 5.1 + MarketBoardItemListingCount = 0x013B, // updated 5.0 MarketBoardItemListing = 0x036A, // updated 5.1 MarketBoardItemListingHistory = 0x0194, // updated 5.1 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 3b4de057..f3935be0 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -283,6 +283,14 @@ namespace Sapphire::Network::Packets::Server char unk2[0x4]; // This has probs something to do with the support desk (inquiry id?) }; + struct FFFXIVIpcMarketTaxRates : FFXIVIpcBasePacket< MarketTaxRates > + { + uint32_t unknown1; + uint16_t padding1; + uint32_t taxRate[Common::TOWN_COUNT]; // In the order of Common::Town + uint64_t unknown2; + }; + struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount > { uint32_t itemCatalogId; From e808619329b010a2453b5d61bdf992dca23685e5 Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Fri, 1 Nov 2019 09:25:35 -0700 Subject: [PATCH 2/2] Corrected MarketTaxRates packet structure --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index f3935be0..9dc959b9 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -287,8 +287,9 @@ namespace Sapphire::Network::Packets::Server { uint32_t unknown1; uint16_t padding1; + uint16_t unknown2; uint32_t taxRate[Common::TOWN_COUNT]; // In the order of Common::Town - uint64_t unknown2; + uint64_t unknown3; }; struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount >