From 817ffb7a8d8fb0028b39dd25044bc73c8254f4cc Mon Sep 17 00:00:00 2001 From: goldberg002 Date: Mon, 21 Dec 2009 01:49:17 +0300 Subject: [PATCH] [9042] Remove double apply bonuses for spell 635/31935 and ranks One time in code and second time by DB data. Signed-off-by: VladimirMangos --- src/game/SpellEffects.cpp | 16 ---------------- src/shared/revision_nr.h | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index d11576e22..4f4b4b90d 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -668,22 +668,6 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) if(stacks) damage += damage * stacks * 10 /100; } - // Avenger's Shield ($m1+0.07*$SPH+0.07*$AP) - ranged sdb for future - else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000004000)) - { - float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); - int32 holy = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)) + - m_caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget); - damage += int32(ap * 0.07f) + int32(holy * 7 / 100); - } - // Hammer of Wrath ($m1+0.15*$SPH+0.15*$AP) - ranged type sdb future fix - else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000008000000000)) - { - float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); - int32 holy = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)) + - m_caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget); - damage += int32(ap * 0.15f) + int32(holy * 15 / 100); - } // Hammer of the Righteous else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0004000000000000)) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d3be9202a..b3daa46ed 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9041" + #define REVISION_NR "9042" #endif // __REVISION_NR_H__