Core/Spells: Define all spell modifier types and implement ProcCooldown mod and PeriodicHealingAndDamage for melee periodic damage

3 files changed, 4 insertions, 4 deletions

diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index c46909bdf13..f194156c321 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -516,7 +516,7 @@ public:
             if (!spellMod)
             {
                 spellMod = new SpellModifier(GetAura());
-                spellMod->op = SPELLMOD_DOT;
+                spellMod->op = SpellModOp::PeriodicHealingAndDamage;
                 spellMod->type = SPELLMOD_FLAT;
                 spellMod->spellId = GetId();
                 spellMod->mask = aurEff->GetSpellEffectInfo()->SpellClassMask;
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 4f401a5823b..5ff9aa3145b 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -373,7 +373,7 @@ class spell_warl_health_funnel : public SpellScriptLoader
                 uint32 damage = caster->CountPctFromMaxHealth(aurEff->GetBaseAmount());
 
                 if (Player* modOwner = caster->GetSpellModOwner())
-                    modOwner->ApplySpellMod(GetSpellInfo(), SPELLMOD_COST, damage);
+                    modOwner->ApplySpellMod(GetSpellInfo(), SpellModOp::PowerCost0, damage);
 
                 SpellNonMeleeDamage damageInfo(caster, caster, GetSpellInfo(), GetAura()->GetSpellVisual(), GetSpellInfo()->SchoolMask, GetAura()->GetCastGUID());
                 damageInfo.periodicLog = true;
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp
index 5ddd5f7a081..947d705cc80 100644
--- a/src/server/scripts/World/duel_reset.cpp
+++ b/src/server/scripts/World/duel_reset.cpp
@@ -98,13 +98,13 @@ class DuelResetScript : public PlayerScript
                 int32 totalCooldown = spellInfo->RecoveryTime;
                 int32 categoryCooldown = spellInfo->CategoryRecoveryTime;
 
-                player->ApplySpellMod(spellInfo, SPELLMOD_COOLDOWN, totalCooldown, nullptr);
+                player->ApplySpellMod(spellInfo, SpellModOp::Cooldown, totalCooldown, nullptr);
 
                 if (int32 cooldownMod = player->GetTotalAuraModifier(SPELL_AURA_MOD_COOLDOWN))
                     totalCooldown += cooldownMod * IN_MILLISECONDS;
 
                 if (!spellInfo->HasAttribute(SPELL_ATTR6_IGNORE_CATEGORY_COOLDOWN_MODS))
-                    player->ApplySpellMod(spellInfo, SPELLMOD_COOLDOWN, categoryCooldown, nullptr);
+                    player->ApplySpellMod(spellInfo, SpellModOp::Cooldown, categoryCooldown, nullptr);
 
                 return remainingCooldown > 0
                     && !itr->second.OnHold