aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Spells
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-12-21 00:40:08 +0100
committerOvahlord <dreadkiller@gmx.de>2024-12-21 17:41:47 +0100
commitcb29e42e3a2d7e7bf7d6008881129f6052fb184e (patch)
tree4e52626b622d178368e26456d3f50906f279d401 /src/server/scripts/Spells
parent4011a0df2b9c79eec570aebb17e14187cda37af5 (diff)
Core/Scripts: Added SpellEffectInfo argument to CalcDamage and CalcHealing spell script hooks
(cherry picked from commit 884662a75a901af6f61cab9efc171d052e8042f4) # Conflicts: # src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp # src/server/scripts/Spells/spell_azerite.cpp # src/server/scripts/Spells/spell_evoker.cpp # src/server/scripts/Spells/spell_priest.cpp # src/server/scripts/Spells/spell_rogue.cpp # src/server/scripts/Spells/spell_warlock.cpp
Diffstat (limited to 'src/server/scripts/Spells')
-rw-r--r--src/server/scripts/Spells/spell_dk.cpp2
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp4
-rw-r--r--src/server/scripts/Spells/spell_rogue.cpp2
-rw-r--r--src/server/scripts/Spells/spell_warrior.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index ed333b3e956..fb4371fe069 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -239,7 +239,7 @@ private:
// 45477 - Icy Touch
class spell_dk_icy_touch : public SpellScript
{
- void CalculateDamage(Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/)
+ void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/)
{
damage += GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f;
}
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 1a2fffd6414..056de776e5c 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -1029,7 +1029,7 @@ private:
// 64208 - Consumption
class spell_gen_consumption : public SpellScript
{
- void CalculateDamage(Unit const* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) const
+ void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) const
{
if (SpellInfo const* createdBySpell = sSpellMgr->GetSpellInfo(GetCaster()->m_unitData->CreatedBySpell, GetCastDifficulty()))
damage = createdBySpell->GetEffect(EFFECT_1).CalcValue();
@@ -5302,7 +5302,7 @@ class spell_gen_major_healing_cooldown_modifier : public SpellScript
});
}
- void CalculateHealingBonus(Unit* /*victim*/, int32& /*healing*/, int32& /*flatMod*/, float& pctMod) const
+ void CalculateHealingBonus(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& /*healing*/, int32& /*flatMod*/, float& pctMod) const
{
AddPct(pctMod, MajorPlayerHealingCooldownHelpers::GetBonusMultiplier(GetCaster(), GetSpellInfo()->Id));
}
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 60e930f6c94..e45a69acaae 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -36,7 +36,7 @@ class spell_rog_eviscerate : public SpellScript
}
// Damage: effectValue + (basePoints * Combo) + (AP * 0.091 * Combo)
- void CalculateDamage(Unit* /*victim*/, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const
+ void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const
{
int32 combo = GetSpell()->m_spentComboPoints;
flatMod += (GetSpellInfo()->GetEffect(EFFECT_0).BasePoints * combo) + (GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.091f * combo);
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 96e86dbd444..0b1e7ecda21 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -29,7 +29,7 @@
class spell_warr_heroic_strike : public SpellScript
{
// Damage = {8+$ap*60/100}
- void CalculateDamage(Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/)
+ void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/)
{
damage = static_cast<int32>(8 + GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.6f);
}