diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index c626c1ebf..493ada45c 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -3934,14 +3934,16 @@ namespace Game.Spells if (Scaling.ResourceCoefficient != 0) comboDamage = Scaling.ResourceCoefficient * value; } - else + else if(GetScalingExpectedStat() == ExpectedStatType.None) { - if (GetScalingExpectedStat() == ExpectedStatType.None) + if (caster != null && basePointsPerLevel != 0.0f) { - int level = caster ? (int)caster.GetLevel() : 0; + int level = (int)caster.GetLevel(); if (level > (int)_spellInfo.MaxLevel && _spellInfo.MaxLevel > 0) level = (int)_spellInfo.MaxLevel; - level -= (int)_spellInfo.BaseLevel; + + // if base level is greater than spell level, reduce by base level (eg. pilgrims foods) + level -= (int)Math.Max(_spellInfo.BaseLevel, _spellInfo.SpellLevel); if (level < 0) level = 0; value += level * basePointsPerLevel; diff --git a/Source/Game/Spells/SpellManager.cs b/Source/Game/Spells/SpellManager.cs index 3acdccf0f..720bee661 100644 --- a/Source/Game/Spells/SpellManager.cs +++ b/Source/Game/Spells/SpellManager.cs @@ -3014,6 +3014,15 @@ namespace Game.Entities spellInfo.AuraInterruptFlags[0] |= (uint)SpellAuraInterruptFlags.ChangeMap; break; // ENDOF FIRELANDS SPELLS + + // ANTORUS THE BURNING THRONE SPELLS + // Decimation + case 244449: + // For some reason there is a instakill effect that serves absolutely no purpose. + // Until we figure out what it's actually used for we disable it. + spellInfo.GetEffect(2).Effect = 0; + break; + // ENDOF ANTORUS THE BURNING THRONE SPELLS case 102445: // Summon Master Li Fei spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.DestDb); break;