Core/Spells: Removed duplicated check
Revert "Core/Groups: fix wrong query for loading group instance data. canReset attribute was calculated in the wrong way"
Core/Scripts: moved Wild Growth calculation to script and fixed formula
This commit is contained in:
hondacrx
2020-06-21 13:10:09 -04:00
parent 1a2411ae0f
commit b600c21ac2
4 changed files with 43 additions and 22 deletions
-13
View File
@@ -5690,19 +5690,6 @@ namespace Game.Spells
}
else
{
// Wild Growth = amount + (6 - 2*doneTicks) * ticks* amount / 100
if (m_spellInfo.SpellFamilyName == SpellFamilyNames.Druid && m_spellInfo.SpellFamilyFlags & new FlagArray128(0, 0x04000000, 0, 0))
{
int addition = (int)((damage * GetTotalTicks()) * ((6 - (2 * (GetTickNumber() - 1))) / 100));
// Item - Druid T10 Restoration 2P Bonus
AuraEffect aurEff = caster.GetAuraEffect(70658, 0);
if (aurEff != null)
// divided by 50 instead of 100 because calculated as for every 2 tick
addition += Math.Abs((addition * aurEff.GetAmount()) / 50);
damage += addition;
}
if (isAreaAura)
damage = (int)(caster.SpellHealingBonusDone(target, GetSpellInfo(), (uint)damage, DamageEffectType.DOT, GetSpellEffectInfo(), GetBase().GetStackAmount()) * caster.SpellHealingPctDone(target, m_spellInfo));
damage = (int)target.SpellHealingBonusTaken(caster, GetSpellInfo(), (uint)damage, DamageEffectType.DOT, GetSpellEffectInfo(), GetBase().GetStackAmount());
+1 -4
View File
@@ -2447,12 +2447,9 @@ namespace Game.Spells
if (effectHandleMode != SpellEffectHandleMode.HitTarget)
return;
if (unitTarget == null)
return;
// this effect use before aura Taunt apply for prevent taunt already attacking target
// for spell as marked "non effective at already attacking target"
if (!unitTarget.CanHaveThreatList() || unitTarget.GetVictim() == m_caster)
if (unitTarget == null || !unitTarget.CanHaveThreatList() || unitTarget.GetVictim() == m_caster)
{
SendCastResult(SpellCastResult.DontReport);
return;