From 65b27fef91f33ea89213f763738393bf028d7b49 Mon Sep 17 00:00:00 2001 From: Gigatotem Date: Fri, 27 Mar 2015 13:36:46 +0000 Subject: Spells/Shaman: Bloodlust and Heroism should also check for the Fatigued debuff from Nether Ray Hunter Pets "Netherwinds" ability. --- src/server/scripts/Spells/spell_shaman.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index f9224e435af..af4ff1f4485 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -61,7 +61,8 @@ enum ShamanSpells SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM = 6474, SPELL_SHAMAN_TOTEM_EARTHEN_POWER = 59566, SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL = 52042, - SPELL_SHAMAN_TIDAL_WAVES = 53390 + SPELL_SHAMAN_TIDAL_WAVES = 53390, + SPELL_PET_NETHERWINDS_FATIGUED = 160455 }; enum ShamanSpellIcons @@ -176,7 +177,8 @@ class spell_sha_bloodlust : public SpellScriptLoader { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) - || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT)) + || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHERWINDS_FATIGUED)) return false; return true; } @@ -671,7 +673,8 @@ class spell_sha_heroism : public SpellScriptLoader { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) - || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT)) + || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHERWINDS_FATIGUED)) return false; return true; } -- cgit v1.2.3 From bc8f4ee9768d558a4e270dd55c397fb8d0596e46 Mon Sep 17 00:00:00 2001 From: Gigatotem Date: Fri, 27 Mar 2015 13:40:15 +0000 Subject: Spells/Mage: Time Warp should also check for the Fatigued debuff given when a Hunter's Nether Ray pet casts Netherwinds. --- src/server/scripts/Spells/spell_mage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 91ef240a1a3..2e3f5f051b5 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -85,6 +85,7 @@ enum MageSpells SPELL_MAGE_FINGERS_OF_FROST = 44544, SPELL_MAGE_TEMPORAL_DISPLACEMENT = 80354, + SPELL_PET_NETHWERINDS_FATIGUED = 160455, }; enum MageIcons @@ -1434,7 +1435,8 @@ class spell_mage_time_warp : public SpellScriptLoader if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION) - || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) + || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHWERINDS_FATIGUED)) return false; return true; } -- cgit v1.2.3