From d55b6753c911cb9c5e1a0121582a0f3d11f170e1 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 18 Nov 2023 23:36:59 -0300 Subject: [PATCH] =?UTF-8?q?feat(Core/Scripting):=20Implement=20Unit=20hook?= =?UTF-8?q?s=20to=20modify=20damage=20before=20ca=E2=80=A6=20(#17785)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/AI/CoreAI/UnitAI.h | 7 +++++++ src/server/game/Entities/Unit/Unit.cpp | 10 ++++++++++ src/server/game/Spells/Auras/SpellAuraEffects.cpp | 15 +++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 2b1b574d488721..d891590233dd33 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -364,6 +364,13 @@ class UnitAI // Called when the unit heals virtual void HealDone(Unit* /*done_to*/, uint32& /*addhealth*/) {} + // Called during damage calculations + virtual void OnCalculateMeleeDamageReceived(uint32& /*damage*/, Unit* /*attacker*/) {} + virtual void OnCalculateSpellDamageReceived(int32& /*damage*/, Unit* /*attacker*/) {} + + // Called during calculation when receiving periodic healing or damage (DoT or HoT) + virtual void OnCalculatePeriodicTickReceived(uint32& /*damage*/, Unit* /*attacker*/) {} + void AttackStartCaster(Unit* victim, float dist); SpellCastResult DoAddAuraToAllHostilePlayers(uint32 spellid); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index eb870e8fc6bb72..bf4a32d3d3caf0 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1308,6 +1308,11 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama // Script Hook For CalculateSpellDamageTaken -- Allow scripts to change the Damage post class mitigation calculations sScriptMgr->ModifySpellDamageTaken(damageInfo->target, damageInfo->attacker, damage, spellInfo); + if (victim->GetAI()) + { + victim->GetAI()->OnCalculateSpellDamageReceived(damage, this); + } + int32 cleanDamage = 0; if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo)) { @@ -1558,6 +1563,11 @@ void Unit::CalculateMeleeDamage(Unit* victim, CalcDamageInfo* damageInfo, Weapon // Script Hook For CalculateMeleeDamage -- Allow scripts to change the Damage pre class mitigation calculations sScriptMgr->ModifyMeleeDamage(damageInfo->target, damageInfo->attacker, damage); + if (victim->GetAI()) + { + victim->GetAI()->OnCalculateMeleeDamageReceived(damage, this); + } + // Calculate armor reduction if (IsDamageReducedByArmor((SpellSchoolMask)(damageInfo->damages[i].damageSchoolMask))) { diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 1a2087ca51fcc5..81e324c9001fdb 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6701,6 +6701,11 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage, GetSpellInfo()); + if (target->GetAI()) + { + target->GetAI()->OnCalculatePeriodicTickReceived(damage, caster); + } + if (GetAuraType() == SPELL_AURA_PERIODIC_DAMAGE) { // xinef: leave only target depending bonuses, rest is handled in calculate amount @@ -6811,6 +6816,11 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c // Script Hook For HandlePeriodicHealthLeechAurasTick -- Allow scripts to change the Damage pre class mitigation calculations sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage, GetSpellInfo()); + if (target->GetAI()) + { + target->GetAI()->OnCalculatePeriodicTickReceived(damage, caster); + } + if (GetBase()->GetType() == DYNOBJ_AURA_TYPE) damage = caster->SpellDamageBonusDone(target, GetSpellInfo(), damage, DOT, GetEffIndex(), 0.0f, GetBase()->GetStackAmount()); damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()); @@ -7020,6 +7030,11 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, heal, GetSpellInfo()); sScriptMgr->ModifyHealReceived(target, caster, heal, GetSpellInfo()); + if (target->GetAI()) + { + target->GetAI()->OnCalculatePeriodicTickReceived(heal, caster); + } + HealInfo healInfo(caster, target, heal, GetSpellInfo(), GetSpellInfo()->GetSchoolMask()); Unit::CalcHealAbsorb(healInfo); int32 gain = Unit::DealHeal(caster, target, healInfo.GetHeal());