From 2202c4fa9771428a225ba4f11bf3824511cbbc18 Mon Sep 17 00:00:00 2001 From: Trazom62 Date: Mon, 12 Apr 2010 23:37:47 +0200 Subject: Fix PW:S bonus from Twin Disciplines and Focused Power. Thanks Proof. See issue #1322. --HG-- branch : trunk --- src/game/SpellAuraEffects.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/game/SpellAuraEffects.cpp') diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp index 28f525fe544..2e46f4866a9 100644 --- a/src/game/SpellAuraEffects.cpp +++ b/src/game/SpellAuraEffects.cpp @@ -501,11 +501,21 @@ int32 AuraEffect::CalculateAmount(Unit * caster) { //+80.68% from sp bonus float bonus = 0.8068f; + AuraEffect const* pAurEff; + // Borrowed Time - if (AuraEffect const * aurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_PRIEST, 2899, 1)) - bonus += aurEff->GetAmount() / 100; + if (pAurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_PRIEST, 2899, 1)) + bonus += (float)pAurEff->GetAmount() / 100.0f; + + // Twin Disciplines + if (pAurEff = caster->GetAuraEffect(SPELL_AURA_ADD_PCT_MODIFIER, SPELLFAMILY_PRIEST, 0x400000, 0, 0, caster->GetGUID())) + bonus += (float)pAurEff->GetAmount() / 100.0f; + + // Focused Power + if (pAurEff = caster->GetAuraEffect(SPELL_AURA_MOD_HEALING_DONE_PERCENT, SPELLFAMILY_PRIEST, 2210, 2)) + bonus += (float)pAurEff->GetAmount() / 100.0f; - DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus; + DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus; } break; case SPELLFAMILY_PALADIN: -- cgit v1.2.3