mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
[8899] Implement glyph 43374
Original patch provided by Splinter. Also sort Unit::HandleDummyAuraProc generic family spells in case.
This commit is contained in:
parent
cd2ec48742
commit
840fad2d07
7 changed files with 51 additions and 33 deletions
|
|
@ -4762,6 +4762,10 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
triggered_spell_id = 26654;
|
||||
break;
|
||||
}
|
||||
// Twisted Reflection (boss spell)
|
||||
case 21063:
|
||||
triggered_spell_id = 21064;
|
||||
break;
|
||||
// Unstable Power
|
||||
case 24658:
|
||||
{
|
||||
|
|
@ -4852,6 +4856,30 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
triggered_spell_id = 34650;
|
||||
break;
|
||||
}
|
||||
// Divine purpose
|
||||
case 31871:
|
||||
case 31872:
|
||||
{
|
||||
// Roll chane
|
||||
if (!roll_chance_i(triggerAmount))
|
||||
return false;
|
||||
|
||||
// Remove any stun effect on target
|
||||
AuraMap& Auras = pVictim->GetAuras();
|
||||
for(AuraMap::const_iterator iter = Auras.begin(); iter != Auras.end();)
|
||||
{
|
||||
SpellEntry const *spell = iter->second->GetSpellProto();
|
||||
if( spell->Mechanic == MECHANIC_STUN ||
|
||||
spell->EffectMechanic[iter->second->GetEffIndex()] == MECHANIC_STUN)
|
||||
{
|
||||
pVictim->RemoveAurasDueToSpell(spell->Id);
|
||||
iter = Auras.begin();
|
||||
}
|
||||
else
|
||||
++iter;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// Mark of Malice
|
||||
case 33493:
|
||||
{
|
||||
|
|
@ -4863,10 +4891,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
triggered_spell_id = 33494;
|
||||
break;
|
||||
}
|
||||
// Twisted Reflection (boss spell)
|
||||
case 21063:
|
||||
triggered_spell_id = 21064;
|
||||
break;
|
||||
// Vampiric Aura (boss spell)
|
||||
case 38196:
|
||||
{
|
||||
|
|
@ -4936,12 +4960,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
((Player*)this)->Say("This is Madness!", LANG_UNIVERSAL);
|
||||
break;
|
||||
}
|
||||
/*
|
||||
// Sunwell Exalted Caster Neck (??? neck)
|
||||
// cast ??? Light's Wrath if Exalted by Aldor
|
||||
// cast ??? Arcane Bolt if Exalted by Scryers*/
|
||||
case 46569:
|
||||
return false; // old unused version
|
||||
// Sunwell Exalted Caster Neck (Shattered Sun Pendant of Acumen neck)
|
||||
// cast 45479 Light's Wrath if Exalted by Aldor
|
||||
// cast 45429 Arcane Bolt if Exalted by Scryers
|
||||
|
|
@ -5050,6 +5068,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
}
|
||||
return false;
|
||||
}
|
||||
/*
|
||||
// Sunwell Exalted Caster Neck (??? neck)
|
||||
// cast ??? Light's Wrath if Exalted by Aldor
|
||||
// cast ??? Arcane Bolt if Exalted by Scryers*/
|
||||
case 46569:
|
||||
return false; // old unused version
|
||||
// Living Seed
|
||||
case 48504:
|
||||
{
|
||||
|
|
@ -5067,28 +5091,15 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
|
|||
target = this;
|
||||
break;
|
||||
}
|
||||
// Divine purpose
|
||||
case 31871:
|
||||
case 31872:
|
||||
// Shadowfiend Death (Gain mana if pet dies with Glyph of Shadowfiend)
|
||||
case 57989:
|
||||
{
|
||||
// Roll chane
|
||||
if (!roll_chance_i(triggerAmount))
|
||||
Unit *owner = GetOwner();
|
||||
if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
|
||||
return false;
|
||||
|
||||
// Remove any stun effect on target
|
||||
AuraMap& Auras = pVictim->GetAuras();
|
||||
for(AuraMap::const_iterator iter = Auras.begin(); iter != Auras.end();)
|
||||
{
|
||||
SpellEntry const *spell = iter->second->GetSpellProto();
|
||||
if( spell->Mechanic == MECHANIC_STUN ||
|
||||
spell->EffectMechanic[iter->second->GetEffIndex()] == MECHANIC_STUN)
|
||||
{
|
||||
pVictim->RemoveAurasDueToSpell(spell->Id);
|
||||
iter = Auras.begin();
|
||||
}
|
||||
else
|
||||
++iter;
|
||||
}
|
||||
// Glyph of Shadowfiend (need cast as self cast for owner, no hidden cooldown)
|
||||
owner->CastSpell(owner,58227,true,castItem,triggeredByAura);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue