Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: Added SpellEffectInfo argument to CalcDamage and CalcHealing spell script hooks

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/884662a75a901af6f61cab9efc171d052e8042f4)
This commit is contained in:
Hondacrx
2025-05-19 11:01:52 -04:00
parent 6097bf92cc
commit 94877fed77
13 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Shadowlands/Torghast/SpellTorghast.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace Scripts.Shadowlands.Torghast
[Script] // 305060 - Yel'Shir's Powerglove
class spell_torghast_yelshirs_powerglove : SpellScript
{
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
SpellInfo triggeringSpell = GetTriggeringSpell();
if (triggeringSpell != null)
Source/Scripts/Spells/Azerite.cs
+1 -1
View File
@@ -435,7 +435,7 @@ namespace Scripts.Spells.Azerite
return ValidateSpellEffect((SpellEchoingBladesTrait, 2));
}
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
AuraEffect trait = GetCaster().GetAuraEffect(SpellEchoingBladesTrait, 2);
if (trait != null)
Source/Scripts/Spells/Evoker.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace Scripts.Spells.Evoker
&& spellInfo.GetEffect(2).IsAura(AuraType.ModSilence); // validate we are removing the correct effect
}
void AddBonusUpfrontDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void AddBonusUpfrontDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
int empowerLevel = (int)GetSpell().m_customArg;
if (empowerLevel == 0)
Source/Scripts/Spells/Generic.cs
+2 -2
View File
@@ -942,7 +942,7 @@ namespace Scripts.Spells.Generic
[Script] // 64208 - Consumption
class spell_gen_consumption : SpellScript
{
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
SpellInfo createdBySpell = SpellMgr.GetSpellInfo(GetCaster().m_unitData.CreatedBySpell, GetCastDifficulty());
if (createdBySpell != null)
@@ -5100,7 +5100,7 @@ namespace Scripts.Spells.Generic
);
}
void CalculateHealingBonus(Unit victim, ref int healing, ref int flatMod, ref float pctMod)
void CalculateHealingBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int healing, ref int flatMod, ref float pctMod)
{
MathFunctions.AddPct(ref pctMod, MajorPlayerHealingCooldownHelpers.GetBonusMultiplier(GetCaster(), GetSpellInfo().Id));
}
Source/Scripts/Spells/Priest.cs
+8 -8
View File
@@ -439,7 +439,7 @@ namespace Scripts.Spells.Priest
return ValidateSpellEffect((SpellIds.AbyssalReverie, 0));
}
void CalculateHealingBonus(Unit victim, ref int healing, ref int flatMod, ref float pctMod)
void CalculateHealingBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int healing, ref int flatMod, ref float pctMod)
{
spell_pri_atonement.TriggerArgs args = (spell_pri_atonement.TriggerArgs)GetSpell().m_customArg;
if (args == null || (args.DamageSchoolMask & SpellSchoolMask.Shadow) == 0)
@@ -919,7 +919,7 @@ namespace Scripts.Spells.Priest
&& ValidateSpellEffect((SpellIds.DivineService, 0));
}
void CalculateHealingBonus(Unit victim, ref int healing, ref int flatMod, ref float pctMod)
void CalculateHealingBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int healing, ref int flatMod, ref float pctMod)
{
AuraEffect divineServiceEffect = GetCaster().GetAuraEffect(SpellIds.DivineService, 0);
if (divineServiceEffect != null)
@@ -1183,7 +1183,7 @@ namespace Scripts.Spells.Priest
return ValidateSpellEffect((SpellIds.FocusedMending, 0));
}
void CalculateHealingBonus(Unit victim, ref int healing, ref int flatMod, ref float pctMod)
void CalculateHealingBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int healing, ref int flatMod, ref float pctMod)
{
AuraEffect focusedMendingEffect = GetCaster().GetAuraEffect(SpellIds.FocusedMending, 0);
if (focusedMendingEffect != null)
@@ -1574,7 +1574,7 @@ namespace Scripts.Spells.Priest
}
}
void CalculateDamageBonus(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamageBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
Aura atonement = GetCaster().GetAura(SpellIds.Atonement);
if (atonement == null)
@@ -1680,7 +1680,7 @@ namespace Scripts.Spells.Priest
_damageIncrease = mindDevourer.GetAmount();
}
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
MathFunctions.AddPct(ref pctMod, _damageIncrease);
}
@@ -1966,7 +1966,7 @@ namespace Scripts.Spells.Priest
return ValidateSpellInfo(SpellIds.PowerOfTheDarkSide);
}
void CalculateDamageBonus(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamageBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
AuraEffect powerOfTheDarkSide = GetCaster().GetAuraEffect(SpellIds.PowerOfTheDarkSide, 0);
if (powerOfTheDarkSide != null)
@@ -1988,7 +1988,7 @@ namespace Scripts.Spells.Priest
return ValidateSpellInfo(SpellIds.PowerOfTheDarkSide);
}
void CalculateHealingBonus(Unit victim, ref int healing, ref int flatMod, ref float pctMod)
void CalculateHealingBonus(SpellEffectInfo spellEffectInfo, Unit victim, ref int healing, ref int flatMod, ref float pctMod)
{
AuraEffect powerOfTheDarkSide = GetCaster().GetAuraEffect(SpellIds.PowerOfTheDarkSide, 0);
if (powerOfTheDarkSide != null)
@@ -3003,7 +3003,7 @@ namespace Scripts.Spells.Priest
&& ValidateSpellEffect((spellInfo.Id, 4));
}
void HandleDamageCalculation(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void HandleDamageCalculation(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
if (victim.HealthBelowPct(GetEffectInfo(1).CalcValue(GetCaster())))
MathFunctions.AddPct(ref pctMod, GetEffectInfo(2).CalcValue(GetCaster()));
Source/Scripts/Spells/Rogue.cs
+2 -2
View File
@@ -293,7 +293,7 @@ namespace Scripts.Spells.Rogue
[Script] // 32645 - Envenom
class spell_rog_envenom : SpellScript
{
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
pctMod *= GetSpell().GetPowerTypeCostAmount(PowerType.ComboPoints).GetValueOrDefault(0);
@@ -311,7 +311,7 @@ namespace Scripts.Spells.Rogue
[Script] // 196819 - Eviscerate
class spell_rog_eviscerate : SpellScript
{
void CalculateDamage(Unit victim, ref int damage, ref int flatMod, ref float pctMod)
void CalculateDamage(SpellEffectInfo spellEffectInfo, Unit victim, ref int damage, ref int flatMod, ref float pctMod)
{
pctMod *= GetSpell().GetPowerTypeCostAmount(PowerType.ComboPoints).GetValueOrDefault(0);