From dd3abf2f18b8d70ed5335968344d38137b6bb5f4 Mon Sep 17 00:00:00 2001 From: collett Date: Wed, 12 Jun 2024 03:56:01 +0900 Subject: [PATCH] fix Effect --- src/common/Common.h | 14 +++++++------- src/common/Network/PacketDef/Ipcs.h | 2 +- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index d11af36a..5fb9444d 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -694,10 +694,10 @@ namespace Sapphire::Common MpGain = 11, TpLoss = 12, TpGain = 13, - GpGain = 14, - ApplyStatusEffectTarget = 15, - ApplyStatusEffectSource = 16, // effect entry on target but buff applies to source, like storm's eye - StatusNoEffect = 20, // shifted one up from 5.18 + //GpGain = 14, + ApplyStatusEffectTarget = 14, // shifted up again 6.x, need to recheck everything I guess + ApplyStatusEffectSource = 15, + StatusNoEffect = 20, /*! * @brief Tells the client that it should show combo indicators on actions. * @@ -705,10 +705,10 @@ namespace Sapphire::Common * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo */ Provoke = 24, - StartActionCombo = 27, // shifted one up from 5.18 - ComboSucceed = 28, // shifted one up from 5.18, on retail this is not seen anymore, still working though. + StartActionCombo = 27, + ComboSucceed = 28, Knockback = 33, - Mount = 40, // shifted one down from 5.18 + Mount = 40, VFX = 59, // links to VFX sheet }; diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 22f0ca59..22ec030c 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -88,7 +88,7 @@ enum ServerZoneIpcType : LogMessage = 0x316, // updated 6.48 - Chat = 0x2d7, // updated 6.48 + Chat = 0xF2d7, // updated 6.48 PartyChat = 0x0065, WorldVisitList = 0xF0FE, // added 4.5 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index bc1564e8..b3640279 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -554,11 +554,11 @@ namespace Sapphire::Network::Packets::Server */ uint32_t sequence; - float animationLockTime; // maybe? doesn't seem to do anything + float animationLockTime; uint32_t someTargetId; // always 0x0E000000? /*! - * @brief The cast sequence from the originating player. Should only be sent to the source, 0 for every other player. + * @brief The cast sequence from the originating player. * * This needs to match the sequence sent from the player in the action start packet otherwise you'll cancel the * initial animation and start a new one once the packet arrives. @@ -575,7 +575,7 @@ namespace Sapphire::Network::Packets::Server uint16_t padding_22[3]; - uint8_t effects[65]; + uint8_t effects[64]; uint16_t padding_6A[3];