Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: moved Wild Growth calculation to script and fixed formula

Browse Source 
Thanks ccrs for the formula

(cherry picked from commit 96ee23487f)
This commit is contained in:
ariel-
2017-06-02 14:12:53 -03:00
committed by funjoker
parent 8e44a6a381
commit 7c2e83604c
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -5896,18 +5896,6 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
}
else
{
// Wild Growth = amount + (6 - 2*doneTicks) * ticks* amount / 100
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags & flag128(0, 0x04000000, 0, 0))
{
int32 addition = int32(float(damage * GetTotalTicks()) * ((6-float(2*(GetTickNumber()-1)))/100));
// Item - Druid T10 Restoration 2P Bonus
if (AuraEffect* aurEff = caster->GetAuraEffect(70658, 0))
// divided by 50 instead of 100 because calculated as for every 2 tick
addition += abs(int32((addition * aurEff->GetAmount()) / 50));
damage += addition;
}
if (isAreaAura)
damage = caster->SpellHealingBonusDone(target, GetSpellInfo(), damage, DOT, GetSpellEffectInfo(), GetBase()->GetStackAmount()) * caster->SpellHealingPctDone(target, m_spellInfo);
damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT, GetSpellEffectInfo(), GetBase()->GetStackAmount());

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

@@ -66,6 +66,7 @@ enum DruidSpells
SPELL_DRUID_REJUVENATION_T10_PROC = 70691,
SPELL_DRUID_BALANCE_T10_BONUS = 70718,
SPELL_DRUID_BALANCE_T10_BONUS_PROC = 70721,
SPELL_DRUID_RESTORATION_T10_2P_BONUS = 70658,
SPELL_DRUID_SUNFIRE_DAMAGE = 164815,
SPELL_DRUID_SURVIVAL_INSTINCTS = 50322
};
@@ -1434,14 +1435,52 @@ public:
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
}
private:
std::list<WorldObject*> _targets;
};
class spell_dru_wild_growth_AuraScript : public AuraScript
{
PrepareAuraScript(spell_dru_wild_growth_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_RESTORATION_T10_2P_BONUS });
}
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());
reduction *= (aurEff->GetTickNumber() - 1);
AddPct(damage, 6.f - reduction);
aurEff->SetAmount(int32(damage));
}
void Register() override
{
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dru_wild_growth_AuraScript::HandleTickUpdate, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_dru_wild_growth_SpellScript();
}
AuraScript* GetAuraScript() const override
{
return new spell_dru_wild_growth_AuraScript();
}
};
void AddSC_druid_spell_scripts()