araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 14:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed Execute formula, patch by dr.tenma

Browse Source 
Closes issue #3478.

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-09-05 14:28:13 +02:00
parent 1b6eea7eee
commit 77130c910f
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellEffects.cpp
+14 -23
View File
@@ -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))
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);
if (m_caster->GetPower(POWER_RAGE) < 100)
m_caster->SetPower(POWER_RAGE, 100);
m_caster->RemoveAura(aur);
}
else
{
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));
bp = damage+int32(rage * m_spellInfo->EffectDamageMultiplier[effIndex] +
m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
// Glyph of Execution bonus
if (AuraEffect * aurEff = m_caster->GetAuraEffect(58367, EFFECT_0))
rageUsed += aurEff->GetAmount() * 10;
bp = damage + int32(rageUsed * m_spellInfo->EffectDamageMultiplier[effIndex] + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.2f);
break;
}
// Concussion Blow