*Cleanups and fixes in Unrelenting Assault.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-19 01:09:23 +02:00
parent 4af68b87d3
commit b7ac1c253b
3 changed files with 25 additions and 31 deletions

View File

@@ -1321,35 +1321,6 @@ void Spell::EffectDummy(uint32 i)
m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
return;
}
// Overpower
if(m_spellInfo->SpellFamilyFlags[0] & 0x4)
{
// Must be casting target
if (!unitTarget->IsNonMeleeSpellCasted(false))
return;
// Find Unrelenting Assault
Unit::AuraEffectList const& modifierAuras = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
for(Unit::AuraEffectList::const_iterator itr = modifierAuras.begin(); itr != modifierAuras.end(); ++itr)
{
if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARRIOR && (*itr)->GetSpellProto()->SpellIconID == 2775)
{
switch ((*itr)->GetSpellProto()->Id)
{
// Unrelenting Assault, rank 1
case 46859:
m_caster->CastSpell(unitTarget,64849,true,0,(*itr));
break;
// Unrelenting Assault, rank 2
case 46860:
m_caster->CastSpell(unitTarget,64850,true,0,(*itr));
break;
default:
break;
}
}
}
return;
}
switch(m_spellInfo->Id)
{
// Warrior's Wrath