mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 16:37:00 +00:00
[10837] Implement script effect of spell 26218.
Also do small spells ordering around. Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
29d5f56247
commit
8d5fdb300e
2 changed files with 33 additions and 23 deletions
|
|
@ -5688,6 +5688,31 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
|
||||||
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
|
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
case 22539: // Shadow Flame (All script effects, not just end ones to
|
||||||
|
case 22972: // prevent player from dodging the last triggered spell)
|
||||||
|
case 22975:
|
||||||
|
case 22976:
|
||||||
|
case 22977:
|
||||||
|
case 22978:
|
||||||
|
case 22979:
|
||||||
|
case 22980:
|
||||||
|
case 22981:
|
||||||
|
case 22982:
|
||||||
|
case 22983:
|
||||||
|
case 22984:
|
||||||
|
case 22985:
|
||||||
|
{
|
||||||
|
if (!unitTarget || !unitTarget->isAlive())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Onyxia Scale Cloak
|
||||||
|
if (unitTarget->GetDummyAura(22683))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Shadow Flame
|
||||||
|
m_caster->CastSpell(unitTarget, 22682, true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
case 24590: // Brittle Armor - need remove one 24575 Brittle Armor aura
|
case 24590: // Brittle Armor - need remove one 24575 Brittle Armor aura
|
||||||
unitTarget->RemoveAuraHolderFromStack(24575);
|
unitTarget->RemoveAuraHolderFromStack(24575);
|
||||||
return;
|
return;
|
||||||
|
|
@ -5707,9 +5732,6 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
|
||||||
unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
|
unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case 26465: // Mercurial Shield - need remove one 26464 Mercurial Shield aura
|
|
||||||
unitTarget->RemoveAuraHolderFromStack(26464);
|
|
||||||
return;
|
|
||||||
case 25140: // Orb teleport spells
|
case 25140: // Orb teleport spells
|
||||||
case 25143:
|
case 25143:
|
||||||
case 25650:
|
case 25650:
|
||||||
|
|
@ -5740,31 +5762,19 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
|
||||||
unitTarget->CastSpell(unitTarget,spellid,false);
|
unitTarget->CastSpell(unitTarget,spellid,false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case 22539: // Shadow Flame (All script effects, not just end ones to
|
case 26218: // Mistletoe
|
||||||
case 22972: // prevent player from dodging the last triggered spell)
|
|
||||||
case 22975:
|
|
||||||
case 22976:
|
|
||||||
case 22977:
|
|
||||||
case 22978:
|
|
||||||
case 22979:
|
|
||||||
case 22980:
|
|
||||||
case 22981:
|
|
||||||
case 22982:
|
|
||||||
case 22983:
|
|
||||||
case 22984:
|
|
||||||
case 22985:
|
|
||||||
{
|
{
|
||||||
if (!unitTarget || !unitTarget->isAlive())
|
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Onyxia Scale Cloak
|
uint32 spells[3] = {26206, 26207, 45036};
|
||||||
if (unitTarget->GetDummyAura(22683))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Shadow Flame
|
m_caster->CastSpell(unitTarget, spells[urand(0, 2)], true);
|
||||||
m_caster->CastSpell(unitTarget, 22682, true);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
case 26465: // Mercurial Shield - need remove one 26464 Mercurial Shield aura
|
||||||
|
unitTarget->RemoveAuraHolderFromStack(26464);
|
||||||
|
return;
|
||||||
case 26656: // Summon Black Qiraji Battle Tank
|
case 26656: // Summon Black Qiraji Battle Tank
|
||||||
{
|
{
|
||||||
if (!unitTarget)
|
if (!unitTarget)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "10836"
|
#define REVISION_NR "10837"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue