From b7573a1bc70eede743bfb7cdeb2f29b45758347a Mon Sep 17 00:00:00 2001 From: Kandera Date: Thu, 24 May 2012 16:58:09 -0400 Subject: Core/Auras: change from if to switch and fix calculation for inifinite replenishment. --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index b49cad74244..0d0931e481b 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -660,19 +660,25 @@ int32 AuraEffect::CalculateAmount(Unit* caster) } break; case SPELL_AURA_PERIODIC_ENERGIZE: - if (GetSpellInfo()->SpellFamilyName == SPELLFAMILY_GENERIC) + switch (m_spellInfo->Id) { - // Replenishment (0.2% from max) - // Infinite Replenishment + case 57669: // Replenishment (0.2% from max) if (m_spellInfo->SpellIconID == 3184 && m_spellInfo->SpellVisual[0] == 12495) amount = GetBase()->GetUnitOwner()->GetMaxPower(POWER_MANA) * 0.002f; - } - // Innervate - else if (m_spellInfo->Id == 29166) + break; + case 61782: // Infinite Replenishment + if (m_spellInfo->SpellIconID == 3184 && m_spellInfo->SpellVisual[0] == 12495) + amount = GetBase()->GetUnitOwner()->GetMaxPower(POWER_MANA) * 0.0025f; + break; + case 29166: // Innervate ApplyPctF(amount, float(GetBase()->GetUnitOwner()->GetCreatePowers(POWER_MANA)) / GetTotalTicks()); - // Owlkin Frenzy - else if (m_spellInfo->Id == 48391) + break; + case 48391: // Owlkin Frenzy ApplyPctU(amount, GetBase()->GetUnitOwner()->GetCreatePowers(POWER_MANA)); + break; + default: + break; + } break; case SPELL_AURA_PERIODIC_HEAL: if (!caster) -- cgit v1.2.3