From bae6c7f12afdc27fe8edfd413bcd4ef4f50d1b1e Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 10 Oct 2019 22:58:59 +0200 Subject: [PATCH] Some packet cleanup, long overdue --- src/common/Network/PacketDef/Ipcs.h | 13 ++++--------- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 9 +++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index a26e11d7..8ffe9347 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -55,7 +55,7 @@ namespace Sapphire::Network::Packets ActorControl = 0x0142, ActorControlSelf = 0x0143, ActorControlTarget = 0x0144, - UpdateHpMpTp = 0x0145, + UpdateHpMpTp = 0x0145, // used when resting /////////////////////////////////////////////////// @@ -137,9 +137,7 @@ namespace Sapphire::Network::Packets ActorSetPos = 0x0184, // updated 5.0 ActorCast = 0x0186, // updated 5.0 - SomeCustomiseChangePacketProbably = 0x0187, // added 5.0 - PartyList = 0x0188, // updated 5.0 HateRank = 0x0189, // updated 5.0 HateList = 0x018A, // updated 5.0 @@ -166,7 +164,6 @@ namespace Sapphire::Network::Packets ContainerInfo = 0x01A2, // updated 5.0 InventoryTransactionFinish = 0x01A3, // updated 5.0 InventoryTransaction = 0x01A4, // updated 5.0 - CurrencyCrystalInfo = 0x01A5, // updated 5.0 InventoryActionAck = 0x01A7, // updated 5.0 @@ -244,11 +241,9 @@ namespace Sapphire::Network::Packets PrepareZoning = 0x02A4, // updated 5.0 ActorGauge = 0x0292, // updated 4.3 - // Unknown IPC types that still need to be sent - // TODO: figure all these out properly - // daily quest related, init seed and current quota probably - IPCTYPE_UNK_320 = 0x025E, // updated 5.0 - IPCTYPE_UNK_322 = 0x0260, // updated 5.0 + // daily quest info -> without them sent, login will take longer... + DailyQuests = 0x025E, // updated 5.0 + DailyQuestRepeatFlags = 0x0260, // updated 5.0 /// Doman Mahjong ////////////////////////////////////// MahjongOpenGui = 0x02A4, // only available in mahjong instance diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 992b87a1..8812e17f 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -520,8 +520,9 @@ namespace Sapphire::Network::Packets::Server /* 0000 */ uint32_t hp; /* 0004 */ uint16_t mp; /* 0006 */ uint16_t tp; - /* 0008 */ uint32_t unknown_8; - /* 000C */ uint32_t unknown_12; + /* 0008 */ uint16_t gp; + /* 0010 */ uint16_t unknown_10; + /* 0012 */ uint32_t unknown_12; }; @@ -1557,7 +1558,7 @@ namespace Sapphire::Network::Packets::Server /** * UNKOWN TYPE */ - struct FFXIVARR_IPC_UNK322 : FFXIVIpcBasePacket< IPCTYPE_UNK_322 > + struct FFXIVARR_IPC_UNK322 : FFXIVIpcBasePacket< DailyQuestRepeatFlags > { /* 0000 */ uint8_t unk[8]; }; @@ -1565,7 +1566,7 @@ namespace Sapphire::Network::Packets::Server /** * UNKOWN TYPE */ - struct FFXIVARR_IPC_UNK320 : FFXIVIpcBasePacket< IPCTYPE_UNK_320 > + struct FFXIVARR_IPC_UNK320 : FFXIVIpcBasePacket< DailyQuests > { /* 0000 */ uint8_t unk[0x38]; };