Execute should only apply damage based on rage up to 30. Thanks 19Maxx83. Fixes issue #953.
--HG-- branch : trunk
This commit is contained in:
@@ -1544,27 +1544,32 @@ void Spell::EffectDummy(uint32 i)
|
|||||||
if(!unitTarget)
|
if(!unitTarget)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
uint32 rage=0;
|
uint32 rage = m_caster->GetPower(POWER_RAGE);
|
||||||
|
|
||||||
// Glyph of Execution bonus
|
// Glyph of Execution bonus
|
||||||
if (AuraEffect *aura = m_caster->GetAuraEffect(58367, 0))
|
if (AuraEffect *aura = m_caster->GetAuraEffect(58367, 0))
|
||||||
rage+=aura->GetAmount();
|
rage += aura->GetAmount();
|
||||||
|
|
||||||
spell_id = 20647;
|
spell_id = 20647;
|
||||||
|
|
||||||
// Sudden death cost modifier
|
// Sudden death cost modifier
|
||||||
if (Aura * aur = m_caster->GetAura(52437))
|
if (Aura * aur = m_caster->GetAura(52437))
|
||||||
{
|
{
|
||||||
rage += m_powerCost;
|
rage += m_powerCost;
|
||||||
m_caster->ModifyPower(POWER_RAGE,- m_powerCost);
|
m_caster->ModifyPower(POWER_RAGE, -m_powerCost);
|
||||||
if (m_caster->GetPower(POWER_RAGE)<100)
|
if (m_caster->GetPower(POWER_RAGE) < 100)
|
||||||
m_caster->SetPower(POWER_RAGE,100);
|
m_caster->SetPower(POWER_RAGE, 100);
|
||||||
m_caster->RemoveAura(aur);
|
m_caster->RemoveAura(aur);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rage += m_powerCost;
|
rage += m_powerCost;
|
||||||
m_caster->ModifyPower(POWER_RAGE,- m_powerCost);
|
m_caster->ModifyPower(POWER_RAGE, -m_powerCost);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(rage > 300)
|
||||||
|
rage = 300;
|
||||||
|
|
||||||
bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] +
|
bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] +
|
||||||
m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
|
m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user