From 4dd10462d0175dd6cff2b7600743eb0c606a8298 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Sat, 7 Jun 2025 19:22:16 +0200
Subject: [PATCH] Scripts/Spells: modernize aura script for Frost Fever and
 Blood Plague

---
 src/server/scripts/Spells/spell_dk.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 8f0a0232dc..0c4b2373f5 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -1454,19 +1454,10 @@ class spell_dk_disease : public AuraScript
             });
     }
 
-    void CalculateAmount(AuraEffect const* /*aurEff*/, int32 &amount, bool & /*canBeRecalculated*/)
+    // According to tooltip: ($m1*1.15+$AP*0.055*1.15)
+    void CalculateDamage(AuraEffect const* /*aurEff*/, Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/)
     {
-        Unit* caster = GetCaster();
-        Unit* target = GetUnitOwner();
-        if (!caster || !target)
-            return;
-
-        // Formular: ${$m1 * 1.15 + $AP * 0.055 * 1.15}
-        AddPct(amount, 15);
-        int32 bonus = caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.055f * 1.15f;
-
-        bonus = caster->SpellDamageBonusDone(target, GetSpellInfo(), bonus, DOT, EFFECT_0);
-        amount += bonus;
+        damage = damage * 1.15f + GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.055f * 1.15f;
     }
 
     void HandleResilientInfection(DispelInfo* /*dispelInfo*/)
@@ -1488,7 +1479,7 @@ class spell_dk_disease : public AuraScript
 
     void Register() override
     {
-        DoEffectCalcAmount.Register(&spell_dk_disease::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
+        DoEffectCalcDamageAndHealing.Register(&spell_dk_disease::CalculateDamage, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
         AfterDispel.Register(&spell_dk_disease::HandleResilientInfection);
     }
 };