diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 98d8c98139e..70112f6713a 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1225,39 +1225,30 @@ void Spell::EffectDummy(SpellEffIndex effIndex) return; } // Execute - if (m_spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG_WARRIOR_EXECUTE) + if (m_spellInfo->SpellFamilyFlags[EFFECT_0] & SPELLFAMILYFLAG_WARRIOR_EXECUTE) { if (!unitTarget) return; - uint32 rage = m_caster->GetPower(POWER_RAGE); - - // Glyph of Execution bonus - if (AuraEffect *aura = m_caster->GetAuraEffect(58367, 0)) - rage += aura->GetAmount(); - spell_id = 20647; - // Sudden death cost modifier - if (Aura * aur = m_caster->GetAura(52437)) - { - rage += m_powerCost; - m_caster->ModifyPower(POWER_RAGE, -m_powerCost); - if (m_caster->GetPower(POWER_RAGE) < 100) - m_caster->SetPower(POWER_RAGE, 100); - m_caster->RemoveAura(aur); - } - else + int32 rageUsed = std::min<int32>(300 - m_powerCost, m_caster->GetPower(POWER_RAGE)); + int32 newRage = std::max<int32>(0, m_caster->GetPower(POWER_RAGE) - rageUsed); + + // Sudden Death rage save + if (AuraEffect * aurEff = m_caster->GetAuraEffect(SPELL_AURA_PROC_TRIGGER_SPELL, SPELLFAMILY_GENERIC, 1989, EFFECT_0)) { - rage += m_powerCost; - m_caster->ModifyPower(POWER_RAGE, -m_powerCost); + int32 ragesave = SpellMgr::CalculateSpellEffectAmount(aurEff->GetSpellProto(), EFFECT_1) * 10; + newRage = std::max(newRage, ragesave); } - if (rage > 300) - rage = 300; + m_caster->SetPower(POWER_RAGE, uint32(newRage)); + + // Glyph of Execution bonus + if (AuraEffect * aurEff = m_caster->GetAuraEffect(58367, EFFECT_0)) + rageUsed += aurEff->GetAmount() * 10; - bp = damage+int32(rage * m_spellInfo->EffectDamageMultiplier[effIndex] + - m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); + bp = damage + int32(rageUsed * m_spellInfo->EffectDamageMultiplier[effIndex] + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f); break; } // Concussion Blow |