From 34386e2b470887cca73631cb18024bc12d243b99 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 29 Sep 2022 22:27:57 +0200 Subject: [PATCH] Core/Packets: converted SMSG_PERIODIC_AURA_LOG to packet class --- src/server/game/Entities/Unit/Unit.cpp | 43 ++++++++--------- .../game/Server/Packets/CombatLogPackets.cpp | 47 +++++++++++++++++++ .../game/Server/Packets/CombatLogPackets.h | 24 ++++++++++ src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/Protocol/Opcodes.h | 2 +- 5 files changed, 93 insertions(+), 25 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b0a7b70660..2a52120660 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5087,46 +5087,43 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo* pInfo) { AuraEffect const* aura = pInfo->auraEff; - WorldPacket data(SMSG_PERIODICAURALOG, 30); - data << GetPackGUID(); - data << aura->GetCasterGUID().WriteAsPacked(); - data << uint32(aura->GetId()); // spellId - data << uint32(1); // count - data << uint32(aura->GetAuraType()); // auraId - switch (aura->GetAuraType()) + WorldPackets::CombatLog::SpellPeriodicAuraLog periodicAuraLog; + periodicAuraLog.TargetGUID = GetGUID(); + periodicAuraLog.CasterGUID = aura->GetCasterGUID(); + periodicAuraLog.SpellID = aura->GetId(); + + WorldPackets::CombatLog::PeriodicAuraLogEffect& logEffect = periodicAuraLog.Entries.emplace_back(); + logEffect.Effect = aura->GetAuraType(); + logEffect.Amount = pInfo->damage; + logEffect.OverHealOrKill = pInfo->overDamage; + logEffect.Resisted = pInfo->resist; + logEffect.Crit = pInfo->critical; + + switch (logEffect.Effect) { case SPELL_AURA_PERIODIC_DAMAGE: case SPELL_AURA_PERIODIC_DAMAGE_PERCENT: - data << uint32(pInfo->damage); // damage - data << uint32(pInfo->overDamage); // overkill? - data << uint32(aura->GetSpellInfo()->GetSchoolMask()); - data << uint32(pInfo->absorb); // absorb - data << uint32(pInfo->resist); // resist - data << uint8(pInfo->critical); // new 3.1.2 critical tick + logEffect.AbsorbedOrAmplitude = pInfo->absorb; + logEffect.SchoolMaskOrPower = aura->GetSpellInfo()->GetSchoolMask(); break; case SPELL_AURA_PERIODIC_HEAL: case SPELL_AURA_OBS_MOD_HEALTH: - data << uint32(pInfo->damage); // damage - data << uint32(pInfo->overDamage); // overheal - data << uint32(pInfo->absorb); // absorb - data << uint8(pInfo->critical); // new 3.1.2 critical tick + logEffect.AbsorbedOrAmplitude = pInfo->absorb; break; case SPELL_AURA_OBS_MOD_POWER: case SPELL_AURA_PERIODIC_ENERGIZE: - data << uint32(aura->GetMiscValue()); // power type - data << uint32(pInfo->damage); // damage + logEffect.SchoolMaskOrPower = aura->GetMiscValue(); break; case SPELL_AURA_PERIODIC_MANA_LEECH: - data << uint32(aura->GetMiscValue()); // power type - data << uint32(pInfo->damage); // amount - data << float(pInfo->multiplier); // gain multiplier + logEffect.SchoolMaskOrPower = aura->GetMiscValue(); + logEffect.AbsorbedOrAmplitude = pInfo->multiplier; break; default: TC_LOG_ERROR("entities.unit", "Unit::SendPeriodicAuraLog: unknown aura %u", uint32(aura->GetAuraType())); return; } - SendMessageToSet(&data, true); + SendMessageToSet(periodicAuraLog.Write(), true); } void Unit::SendSpellDamageResist(Unit* target, uint32 spellId) diff --git a/src/server/game/Server/Packets/CombatLogPackets.cpp b/src/server/game/Server/Packets/CombatLogPackets.cpp index 49a792a4a8..76124b8058 100644 --- a/src/server/game/Server/Packets/CombatLogPackets.cpp +++ b/src/server/game/Server/Packets/CombatLogPackets.cpp @@ -134,3 +134,50 @@ WorldPacket const* WorldPackets::CombatLog::SpellMissLog::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::CombatLog::SpellPeriodicAuraLog::Write() +{ + _worldPacket << TargetGUID.WriteAsPacked(); + _worldPacket << CasterGUID.WriteAsPacked(); + _worldPacket << int32(SpellID); + _worldPacket << int32(Entries.size()); + + for (PeriodicAuraLogEffect const& logEffect : Entries) + { + _worldPacket << int32(logEffect.Effect); + + switch (logEffect.Effect) + { + case SPELL_AURA_PERIODIC_DAMAGE: + case SPELL_AURA_PERIODIC_DAMAGE_PERCENT: + _worldPacket << int32(logEffect.Amount); + _worldPacket << int32(logEffect.OverHealOrKill); + _worldPacket << int32(logEffect.SchoolMaskOrPower); + _worldPacket << int32(logEffect.AbsorbedOrAmplitude); + _worldPacket << int32(logEffect.Resisted); + _worldPacket << bool(logEffect.Crit); + break; + case SPELL_AURA_PERIODIC_HEAL: + case SPELL_AURA_OBS_MOD_HEALTH: + _worldPacket << int32(logEffect.Amount); + _worldPacket << int32(logEffect.OverHealOrKill); + _worldPacket << int32(logEffect.AbsorbedOrAmplitude); + _worldPacket << bool(logEffect.Crit); + break; + case SPELL_AURA_OBS_MOD_POWER: + case SPELL_AURA_PERIODIC_ENERGIZE: + _worldPacket << int32(logEffect.SchoolMaskOrPower); + _worldPacket << int32(logEffect.Amount); + break; + case SPELL_AURA_PERIODIC_MANA_LEECH: + _worldPacket << int32(logEffect.SchoolMaskOrPower); + _worldPacket << int32(logEffect.Amount); + _worldPacket << float(logEffect.AbsorbedOrAmplitude); + break; + default: + break; + } + } + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/CombatLogPackets.h b/src/server/game/Server/Packets/CombatLogPackets.h index 6ae3bc31dc..a1062d37d5 100644 --- a/src/server/game/Server/Packets/CombatLogPackets.h +++ b/src/server/game/Server/Packets/CombatLogPackets.h @@ -144,6 +144,30 @@ namespace WorldPackets ObjectGuid Caster; std::vector Entries; }; + + struct PeriodicAuraLogEffect + { + int32 Effect = 0; + int32 Amount = 0; + int32 OverHealOrKill = 0; + int32 SchoolMaskOrPower = 0; + int32 AbsorbedOrAmplitude = 0; + int32 Resisted = 0; + bool Crit = false; + }; + + class SpellPeriodicAuraLog final : public ServerPacket + { + public: + SpellPeriodicAuraLog() : ServerPacket(SMSG_PERIODIC_AURA_LOG, 8 + 8 + 4 + 4) { } + + int32 SpellID = 0; + ObjectGuid TargetGUID; + ObjectGuid CasterGUID; + std::vector Entries; + + WorldPacket const* Write() override; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 3bd4d9f85b..7abff1d830 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1088,7 +1088,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_MEMBER_FULL_STATE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAUSE_MIRROR_TIMER, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_PENDING_RAID_LOCK, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_PERIODICAURALOG, STATUS_NEVER, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_PERIODIC_AURA_LOG, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETGODMODE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_ALREADY_SIGNED, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_QUERY_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_REALM); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index d5e8e506bd..dd6bea560a 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1044,7 +1044,7 @@ enum OpcodeServer SMSG_PARTY_MEMBER_FULL_STATE = 0x0215, SMSG_PAUSE_MIRROR_TIMER = 0x4015, SMSG_PENDING_RAID_LOCK = 0x4F17, - SMSG_PERIODICAURALOG = 0x0416, + SMSG_PERIODIC_AURA_LOG = 0x0416, SMSG_PETGODMODE = 0x2E36, SMSG_PETITION_ALREADY_SIGNED = 0x5DA3, SMSG_PETITION_QUERY_RESPONSE = 0x4B37,