Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: fix Wild Growth losing info about caster bonuses

Browse Source 
Closes #21281
This commit is contained in:
ariel-
2018-01-20 19:08:03 -03:00
parent 946856258c
commit cb75105434
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -2312,29 +2312,34 @@ class spell_dru_wild_growth : public SpellScriptLoader
return ValidateSpellInfo({ SPELL_DRUID_RESTORATION_T10_2P_BONUS });
}
void SetTickHeal(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
// includes caster bonuses already
_baseTick = amount;
if (Unit* caster = GetCaster())
if (AuraEffect const* bonus = caster->GetAuraEffect(SPELL_DRUID_RESTORATION_T10_2P_BONUS, EFFECT_0))
AddPct(_baseReduction, -bonus->GetAmount());
}
void HandleTickUpdate(AuraEffect* aurEff)
{
Unit* caster = GetCaster();
if (!caster)
return;
// calculate from base damage, not from aurEff->GetAmount() (already modified)
float damage = caster->CalculateSpellDamage(GetUnitOwner(), GetSpellInfo(), aurEff->GetEffIndex());
// Wild Growth = first tick gains a 6% bonus, reduced by 2% each tick
float reduction = 2.f;
if (AuraEffect* bonus = caster->GetAuraEffect(SPELL_DRUID_RESTORATION_T10_2P_BONUS, EFFECT_0))
reduction -= CalculatePct(reduction, bonus->GetAmount());
float reduction = _baseReduction;
reduction *= (aurEff->GetTickNumber() - 1);
AddPct(damage, 6.f - reduction);
aurEff->SetAmount(int32(damage));
float const bonus = 6.f - reduction;
int32 const amount = int32(_baseTick + CalculatePct(_baseTick, bonus));
aurEff->SetAmount(amount);
}
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_wild_growth_AuraScript::SetTickHeal, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dru_wild_growth_AuraScript::HandleTickUpdate, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
}
float _baseTick = 0.f;
float _baseReduction = 2.f;
};
SpellScript* GetSpellScript() const override