Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r edc78ad11b83 src/game/SpellAuraEffects.cpp
- --- a/src/game/SpellAuraEffects.cpp Thu Mar 11 23:25:04 2010 +0100
- +++ b/src/game/SpellAuraEffects.cpp Fri Mar 12 16:15:17 2010 -0300
- -483,16 +483,33 @@
- // Ice Barrier
- if(GetSpellProto()->SpellFamilyFlags[1] & 0x1 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
- {
- - // +80.67% from sp bonus
- - DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8067f;
- + // +80.68% from sp bonus
- + DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
- +
- + // Glyph of Ice Barrier: its weird having a SPELLMOD_ALL_EFFECTS here but its blizzards doing :)
- + // Glyph of Ice Barrier is only applied at the spell damage bonus because it was already applied to the base value in CalculateSpellDamage
- + if (Player* modOwner = caster->GetSpellModOwner())
- + modOwner->ApplySpellMod(GetSpellProto()->Id, SPELLMOD_ALL_EFFECTS, DoneActualBenefit);
- + }
- + // Fire Ward
- + else if(GetSpellProto()->SpellFamilyFlags[0] & 0x8 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
- + {
- + // +80.68% from sp bonus
- + DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
- + }
- + // Frost Ward
- + else if(GetSpellProto()->SpellFamilyFlags[0] & 0x100 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
- + {
- + // +80.68% from sp bonus
- + DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
- }
- break;
- case SPELLFAMILY_WARLOCK:
- // Shadow Ward
- - if(m_spellProto->SpellFamilyFlags[2]& 0x40)
- + if(m_spellProto->SpellFamilyFlags[2] & 0x40)
- {
- - // +30% from sp bonus
- - DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.3f;
- + // +80.68% from sp bonus
- + DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
- }
- break;
- case SPELLFAMILY_PRIEST:
- -504,8 +521,26 @@
- // Borrowed Time
- if (AuraEffect const * aurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_PRIEST, 2899, 1))
- bonus += aurEff->GetAmount() / 100;
- -
- - DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
- +
- + DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(GetSpellProto())) * bonus;
- + // Improved PW: Shield: its weird having a SPELLMOD_ALL_EFFECTS here but its blizzards doing :)
- + // Improved PW: Shield is only applied at the spell healing bonus because it was already applied to the base value in CalculateSpellDamage
- + if (Player* modOwner = caster->GetSpellModOwner())
- + modOwner->ApplySpellMod(GetSpellProto()->Id, SPELLMOD_ALL_EFFECTS, DoneActualBenefit);
- + DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
- +
- + amount += (int32)DoneActualBenefit;
- +
- + // Twin Disciplines
- + if (Player* modOwner = caster->GetSpellModOwner())
- + modOwner->ApplySpellMod(GetSpellProto()->Id, SPELLMOD_DAMAGE, amount);
- +
- + // Focused Power
- + Unit::AuraEffectList const& mHealingDonePct = caster->GetAuraEffectsByType(SPELL_AURA_MOD_HEALING_DONE_PERCENT);
- + for (Unit::AuraEffectList::const_iterator i = mHealingDonePct.begin(); i != mHealingDonePct.end(); ++i)
- + amount *= (100.0f + (*i)->GetAmount()) / 100.0f;
- +
- + return amount;
- }
- break;
- case SPELLFAMILY_PALADIN:
Advertisement
Add Comment
Please, Sign In to add comment
