Permalink
Browse files

[9130] Implement spell 48603 script effect.

Also apply some ordering to existed spell cases code.
  • Loading branch information...
VladimirMangos
VladimirMangos committed Jan 9, 2010
1 parent f31e329 commit 80a69ae923d6d47e1ba50dbd438ab50cf21e107e
Showing with 53 additions and 48 deletions.
  1. +52 −47 src/game/SpellEffects.cpp
  2. +1 −1 src/shared/revision_nr.h
View
@@ -4947,23 +4947,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
{
switch(m_spellInfo->Id)
{
- // PX-238 Winter Wondervolt TRAP
- case 26275:
- {
- uint32 spells[4] = { 26272, 26157, 26273, 26274 };
-
- // check presence
- for(int j = 0; j < 4; ++j)
- if(unitTarget->HasAura(spells[j],0))
- return;
-
- // select spell
- uint32 iTmpSpellId = spells[urand(0,3)];
-
- // cast
- unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
- return;
- }
// Bending Shinbone
case 8856:
{
@@ -4980,10 +4963,45 @@ void Spell::EffectScriptEffect(uint32 effIndex)
m_caster->CastSpell(m_caster,spell_id,true,NULL);
return;
}
+ // Piccolo of the Flaming Fire
+ case 17512:
+ {
+ if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+ return;
+ unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE);
+ return;
+ }
+ // Escape artist
+ case 20589:
+ {
+ if(!unitTarget)
+ return;
+
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+ return;
+ }
// Brittle Armor - need remove one 24575 Brittle Armor aura
case 24590:
unitTarget->RemoveSingleSpellAurasFromStack(24575);
return;
+ // PX-238 Winter Wondervolt TRAP
+ case 26275:
+ {
+ uint32 spells[4] = { 26272, 26157, 26273, 26274 };
+
+ // check presence
+ for(int j = 0; j < 4; ++j)
+ if(unitTarget->HasAura(spells[j],0))
+ return;
+
+ // select spell
+ uint32 iTmpSpellId = spells[urand(0,3)];
+
+ // cast
+ unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
+ return;
+ }
// Mercurial Shield - need remove one 26464 Mercurial Shield aura
case 26465:
unitTarget->RemoveSingleSpellAurasFromStack(26464);
@@ -5061,36 +5079,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
unitTarget->CastSpell(unitTarget, 26655, false);
return;
}
- // Piccolo of the Flaming Fire
- case 17512:
- {
- if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
- return;
- unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE);
- return;
- }
- // Demonic Empowerment (succubus Vanish effect)
- case 54436:
- {
- if(!unitTarget)
- return;
-
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STUN);
- return;
- }
- // Escape artist
- case 20589:
- {
- if(!unitTarget)
- return;
-
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
- unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
- return;
- }
// Mirren's Drinking Hat
case 29830:
{
@@ -5178,6 +5166,11 @@ void Spell::EffectScriptEffect(uint32 effIndex)
break;
}
+ // High Executor's Branding Iron
+ case 48603:
+ // Torture the Torturer: High Executor's Branding Iron Impact
+ unitTarget->CastSpell(unitTarget, 48614, true);
+ return;
// Emblazon Runeblade
case 51770:
{
@@ -5215,6 +5208,18 @@ void Spell::EffectScriptEffect(uint32 effIndex)
}
return;
}
+ // Demonic Empowerment (succubus Vanish effect)
+ case 54436:
+ {
+ if(!unitTarget)
+ return;
+
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
+ unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STUN);
+ return;
+ }
case 55693: // Remove Collapsing Cave Aura
if(!unitTarget)
return;
View
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "9129"
+ #define REVISION_NR "9130"
#endif // __REVISION_NR_H__

0 comments on commit 80a69ae

Please sign in to comment.