*Fix Elemental Oath bonus for Elemental Focus clearcasting

*Fix Glyph of Death Grip.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-06-12 14:38:22 +02:00
parent bc7a381b62
commit e5092285eb
2 changed files with 26 additions and 0 deletions

View File

@@ -4462,6 +4462,22 @@ void AuraEffect::HandleAuraProcTriggerSpell(bool apply, bool Real, bool /*change
{
if(!Real)
return;
// Elemental oath - "while Clearcasting from Elemental Focus is active, you deal 5%/10% more spell damage."
if (m_target->GetTypeId()==TYPEID_PLAYER && (GetId() == 51466 || GetId() == 51470))
{
if (apply)
{
SpellModifier *mod = new SpellModifier;
mod->op = SPELLMOD_EFFECT2;
mod->value = (GetId() == 51466) ? 5 : 10;
mod->type = SPELLMOD_FLAT;
mod->spellId = GetId();
mod->mask[1] = 0x0004000;
m_spellmod = mod;
}
((Player*)m_target)->AddSpellMod(m_spellmod, apply);
}
}
void AuraEffect::HandleAuraModStalked(bool apply, bool Real, bool /*changeAmount*/)

View File

@@ -7425,6 +7425,16 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
}
}
break;
case SPELLFAMILY_DEATHKNIGHT:
// Glyph of Death Grip
if (trigger_spell_id == 58628)
{
// remove cooldown of Death Grip
if (GetTypeId()==TYPEID_PLAYER)
((Player*)this)->RemoveCategoryCooldown(82);
return true;
}
break;
}
}