Merge pull request #7543 from gigatotem/4.3.4

Spells/Shaman: Heroism and Bloodlust
This commit is contained in:
Nay
2012-08-27 15:17:54 -07:00

View File

@@ -35,6 +35,8 @@ enum ShamanSpells
SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1 = 8349,
SHAMAN_SPELL_SATED = 57724,
SHAMAN_SPELL_EXHAUSTION = 57723,
HUNTER_SPELL_INSANITY = 95809,
MAGE_SPELL_TEMPORAL_DISPLACEMENT = 80354,
SHAMAN_SPELL_STORM_EARTH_AND_FIRE = 51483,
EARTHBIND_TOTEM_SPELL_EARTHGRAB = 64695,
@@ -319,6 +321,8 @@ class spell_sha_bloodlust : public SpellScriptLoader
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED));
targets.remove_if(Trinity::UnitAuraCheck(true, HUNTER_SPELL_INSANITY));
targets.remove_if(Trinity::UnitAuraCheck(true, MAGE_SPELL_TEMPORAL_DISPLACEMENT));
}
void ApplyDebuff()
@@ -361,6 +365,8 @@ class spell_sha_heroism : public SpellScriptLoader
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION));
targets.remove_if(Trinity::UnitAuraCheck(true, HUNTER_SPELL_INSANITY));
targets.remove_if(Trinity::UnitAuraCheck(true, MAGE_SPELL_TEMPORAL_DISPLACEMENT));
}
void ApplyDebuff()