From cbb00b9cb393e68255ec96fd348e38aae897c0fe Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Thu, 10 Oct 2019 14:47:35 -0700 Subject: [PATCH 1/4] MarketCity enum --- src/common/Common.h | 10 ++++++++++ src/common/Network/PacketDef/Zone/ServerZoneDef.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 7bb57000..21e6ba60 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,6 +993,16 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; + enum MarketCity : uint8_t + { + LimsaLominsa = 1, + Gridania = 2, + Uldah = 3, + Ishgard = 4, + Kugane = 7, + Crystarium = 10 + } + enum class Role : uint8_t { None, diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 8812e17f..fe376702 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,15 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - /** - * 0x01 Limsa Lominsa - * 0x02 Gridania - * 0x03 Ul'dah - * 0x04 Ishgard - * 0x07 Kugane - * 0x0A Crystarium - */ - uint8_t retainerCity; + Common::MarketCity marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4; From c9edbc8aac4af0de2ae6cee53bcd590cb61c2a3a Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Sat, 12 Oct 2019 23:50:41 -0700 Subject: [PATCH 2/4] This was marked todo --- src/common/Network/PacketDef/Zone/ClientZoneDef.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index 7b0d39ea..bc728cbe 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -40,9 +40,9 @@ struct FFXIVIpcClientTrigger : /* 0004 */ uint32_t param11; /* 0008 */ uint32_t param12; /* 000C */ uint32_t param2; - /* 0010 */ uint32_t param4; // todo: really? - /* 0014 */ uint32_t param5; - /* 0018 */ uint64_t param3; + /* 0010 */ uint32_t param3; + /* 0014 */ uint32_t param4; + /* 0018 */ uint64_t param5; }; struct FFXIVIpcUpdatePosition : From c16749c60064998b1cae2b1ba247bedd830c8601 Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Tue, 29 Oct 2019 11:02:01 -0700 Subject: [PATCH 3/4] MarketBoardItemListing and MarketBoardItemListingHistory opcodes --- src/common/Common.h | 4 ++-- src/common/Network/CommonActorControl.h | 9 +++++++++ src/common/Network/PacketDef/Ipcs.h | 4 ++-- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 21e6ba60..2f912b29 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,7 +993,7 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; - enum MarketCity : uint8_t + enum City : uint8_t { LimsaLominsa = 1, Gridania = 2, @@ -1001,7 +1001,7 @@ namespace Sapphire::Common Ishgard = 4, Kugane = 7, Crystarium = 10 - } + }; enum class Role : uint8_t { diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index f620b381..7c61f47b 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -24,6 +24,9 @@ namespace Sapphire::Network::ActorControl SetStatus = 0x02, CastStart = 0x03, ToggleAggro = 0x04, + /*! + * param1 = ClassJob ID + */ ClassJobChange = 0x05, DefeatMsg = 0x06, GainExpMsg = 0x07, @@ -347,6 +350,12 @@ namespace Sapphire::Network::ActorControl EmoteReq = 0x1F4, EmoteCancel = 0x1F6, PersistentEmoteCancel = 0x1F7, + /*! + * param2 = pose ID + * 0 = idle pose 0 (just standing) + * 1 = idle pose 1 + * 2-4 = idle poses 2-4 + */ PoseChange = 0x1F9, PoseReapply = 0x1FA, PoseCancel = 0x1FB, diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 8ffe9347..f524467e 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -107,8 +107,8 @@ namespace Sapphire::Network::Packets MailLetterNotification = 0x013A, // updated 5.0 MarketBoardItemListingCount = 0x013B, // updated 5.0 - MarketBoardItemListing = 0x013C, // updated 5.0 - MarketBoardItemListingHistory = 0x012A, // updated 4.5 + MarketBoardItemListing = 0x036A, // updated 5.1 + MarketBoardItemListingHistory = 0x0194, // updated 5.1 MarketBoardSearchResult = 0x0139, // updated 4.5 CharaFreeCompanyTag = 0x013B, // updated 4.5 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index fe376702..d7dd9a04 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - Common::MarketCity marketCity; + Common::City marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4; From 3328bb347f332124b368b87fff7b4b7da630bc40 Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Tue, 29 Oct 2019 20:06:26 -0700 Subject: [PATCH 4/4] Commit review responses --- src/common/Common.h | 10 ---------- src/common/Network/PacketDef/Zone/ClientZoneDef.h | 6 +++--- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 2f912b29..7bb57000 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,16 +993,6 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; - enum City : uint8_t - { - LimsaLominsa = 1, - Gridania = 2, - Uldah = 3, - Ishgard = 4, - Kugane = 7, - Crystarium = 10 - }; - enum class Role : uint8_t { None, diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index bc728cbe..7b0d39ea 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -40,9 +40,9 @@ struct FFXIVIpcClientTrigger : /* 0004 */ uint32_t param11; /* 0008 */ uint32_t param12; /* 000C */ uint32_t param2; - /* 0010 */ uint32_t param3; - /* 0014 */ uint32_t param4; - /* 0018 */ uint64_t param5; + /* 0010 */ uint32_t param4; // todo: really? + /* 0014 */ uint32_t param5; + /* 0018 */ uint64_t param3; }; struct FFXIVIpcUpdatePosition : diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index d7dd9a04..3b4de057 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - Common::City marketCity; + Common::Town marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4;