diff --git a/src/common/Common.h b/src/common/Common.h index 2840339e..61e3c3f2 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -624,8 +624,8 @@ namespace Sapphire::Common TpLoss = 12, TpGain = 13, GpGain = 14, - ApplyStatusEffect = 15, - //ApplyStatusEffect2 = 16, // thin air uses this one but works fine with 15 wtf? + ApplyStatusEffectTarget = 15, + ApplyStatusEffectSource = 16, StatusNoEffect = 21, /*! * @brief Tells the client that it should show combo indicators on actions. diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 19651f7b..3eb19d67 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -159,6 +159,7 @@ namespace Sapphire::Network::Packets ActorOwner = 0x03BB, // updated 5.18 PlayerStateFlags = 0x02C6, // updated 5.18 PlayerClassInfo = 0x01B0, // updated 5.18 + Effect037F = 0x037F, // 5.18 ModelEquip = 0x02E6, // updated 5.18 Examine = 0x0366, // updated 5.18 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 6e715282..f60ad57a 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1994,6 +1994,12 @@ namespace Sapphire::Network::Packets::Server char otherName[32]; }; + struct FFXIVIpcEffect037F : FFXIVIpcBasePacket< Effect037F > + { + uint32_t value1; + uint32_t value2; + }; + } #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/ diff --git a/src/scripts/action/war/ActionMaim37.cpp b/src/scripts/action/war/ActionMaim37.cpp new file mode 100644 index 00000000..63df4928 --- /dev/null +++ b/src/scripts/action/war/ActionMaim37.cpp @@ -0,0 +1,29 @@ +#include