diff options
| author | n0n4m3 <none@none> | 2009-12-20 06:00:39 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-20 06:00:39 +0100 |
| commit | 18d5940f5cdc50bd9138a8f2b9393a91582587cc (patch) | |
| tree | d0ba4b195286da22b8e4cac779b60ad1525ef05c /src/game/SpellEffects.cpp | |
| parent | 5c9bd7ecd90b04f563dc8cea23b89a8d333e56b8 (diff) | |
| parent | a21f0da24fe99becc06eb2a08016d7acb4d82027 (diff) | |
merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 217497820c4..26fd94a3ef6 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -437,7 +437,14 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); // Shield Slam else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) + { damage += int32(m_caster->GetShieldBlockValue()); + + // Glyph of Shield Slam + if (m_caster->HasAura(58375)) + m_caster->CastSpell(m_caster, 58374, true); + } + // Victory Rush else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) { @@ -611,7 +618,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) for (uint32 i = 0; i < doses; ++i) unitTarget->RemoveAuraFromStack(spellId); damage *= doses; - damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.03f * doses); + damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * doses); } // Eviscerate and Envenom Bonus Damage (item set effect) if (m_caster->HasAura(37169)) |