diff options
| author | megamage <none@none> | 2009-04-11 14:53:16 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-11 14:53:16 -0500 |
| commit | ccd9f4eeb249378ed4e966e54d6f08f0c5288cce (patch) | |
| tree | 24e904909ea6b2096f9553200e890051d3ce944a /src/game/SpellEffects.cpp | |
| parent | 3120221deb93af2125a9baefe745cbbab8426ffe (diff) | |
| parent | 37548b02fdc27289191d0b85d7944b821da52d01 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 8a37f3757cd..d9ca84c18ae 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -430,6 +430,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 12 / 100); break; } + // Concussion Blow + else if(m_spellInfo->SpellFamilyFlags[0] & 0x4000000) + { + int32 pct = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget); + damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * pct / 100); + break; + } break; } case SPELLFAMILY_WARLOCK: @@ -493,6 +500,11 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) { damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f); } + // Faerie Fire (Feral) + else if(m_spellInfo->Id == 60089) + { + damage += int32((m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 5 / 100) + 1); + } //Mangle Bonus for the initial damage of Lacerate and Rake if((m_spellInfo->SpellFamilyFlags.IsEqual(0x1000,0,0) && m_spellInfo->SpellIconID==494) || (m_spellInfo->SpellFamilyFlags.IsEqual(0,0x100,0) && m_spellInfo->SpellIconID==2246)) |