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

Core/Spells: Exclude empty mods from affecting spells and ignore PointsIndexX mods for spells that don't have any effect at that index

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4fbf6dacffc83c2ae0a983d5981c3ad0c382f0ae)
This commit is contained in:
hondacrx
2022-03-04 17:47:56 -05:00
parent 3143cf5c9d
commit b1de89a781
1 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Spells.cs
+56 -13
View File
@@ -2868,7 +2868,11 @@ namespace Game.Entities
if (!IsAffectedBySpellmod(spellInfo, mod, spell)) if (!IsAffectedBySpellmod(spellInfo, mod, spell))
continue; continue;
flat += mod.value; int value = mod.value;
if (value == 0)
continue;
flat += value;
ApplyModToSpell(mod, spell); ApplyModToSpell(mod, spell);
} }
@@ -2877,7 +2881,11 @@ namespace Game.Entities
if (!IsAffectedBySpellmod(spellInfo, mod, spell)) if (!IsAffectedBySpellmod(spellInfo, mod, spell))
continue; continue;
flat += mod.value.ModifierValue; int value = mod.value.ModifierValue;
if (value == 0)
continue;
flat += value;
ApplyModToSpell(mod, spell); ApplyModToSpell(mod, spell);
} }
@@ -2890,14 +2898,18 @@ namespace Game.Entities
if (baseValue + (dynamic)flat == 0) if (baseValue + (dynamic)flat == 0)
continue; continue;
int value = mod.value;
if (value == 0)
continue;
// special case (skip > 10sec spell casts for instant cast setting) // special case (skip > 10sec spell casts for instant cast setting)
if (op == SpellModOp.ChangeCastTime) if (op == SpellModOp.ChangeCastTime)
{ {
if (baseValue.CompareTo(10000) > 0 && mod.value <= -100) if (baseValue.CompareTo(10000) > 0 && value <= -100)
continue; continue;
} }
pct *= 1.0f + MathFunctions.CalculatePct(1.0f, mod.value); pct *= 1.0f + MathFunctions.CalculatePct(1.0f, value);
ApplyModToSpell(mod, spell); ApplyModToSpell(mod, spell);
} }
@@ -2910,14 +2922,18 @@ namespace Game.Entities
if (baseValue + (dynamic)flat == 0) if (baseValue + (dynamic)flat == 0)
continue; continue;
float value = mod.value.ModifierValue;
if (value == 1.0f)
continue;
// special case (skip > 10sec spell casts for instant cast setting) // special case (skip > 10sec spell casts for instant cast setting)
if (op == SpellModOp.ChangeCastTime) if (op == SpellModOp.ChangeCastTime)
{ {
if (baseValue.CompareTo(10000) > 0 && mod.value.ModifierValue <= -1.0f) if (baseValue.CompareTo(10000) > 0 && value <= -1.0f)
continue; continue;
} }
pct *= mod.value.ModifierValue; pct *= value;
ApplyModToSpell(mod, spell); ApplyModToSpell(mod, spell);
} }
} }
@@ -2931,13 +2947,40 @@ namespace Game.Entities
if (spell && mod.ownerAura.IsUsingCharges() && mod.ownerAura.GetCharges() == 0 && !spell.m_appliedMods.Contains(mod.ownerAura)) if (spell && mod.ownerAura.IsUsingCharges() && mod.ownerAura.GetCharges() == 0 && !spell.m_appliedMods.Contains(mod.ownerAura))
return false; return false;
// +duration to infinite duration spells making them limited switch (mod.op)
if (mod.op == SpellModOp.Duration && spellInfo.GetDuration() == -1) {
return false; case SpellModOp.Duration: // +duration to infinite duration spells making them limited
if (spellInfo.GetDuration() == -1)
// mod crit to spells that can't crit return false;
if (mod.op == SpellModOp.CritChance && !spellInfo.HasAttribute(SpellCustomAttributes.CanCrit)) break;
return false; case SpellModOp.CritChance: // mod crit to spells that can't crit
if (!spellInfo.HasAttribute(SpellCustomAttributes.CanCrit))
return false;
break;
case SpellModOp.PointsIndex0: // check if spell has any effect at that index
case SpellModOp.Points:
if (spellInfo.GetEffects().Count <= 0)
return false;
break;
case SpellModOp.PointsIndex1: // check if spell has any effect at that index
if (spellInfo.GetEffects().Count <= 1)
return false;
break;
case SpellModOp.PointsIndex2: // check if spell has any effect at that index
if (spellInfo.GetEffects().Count <= 2)
return false;
break;
case SpellModOp.PointsIndex3: // check if spell has any effect at that index
if (spellInfo.GetEffects().Count <= 3)
return false;
break;
case SpellModOp.PointsIndex4: // check if spell has any effect at that index
if (spellInfo.GetEffects().Count <= 4)
return false;
break;
default:
break;
}
return spellInfo.IsAffectedBySpellMod(mod); return spellInfo.IsAffectedBySpellMod(mod);
} }