Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14461 from gigatotem/6.x

Browse Source 
[6.x] Heroism/Bloodlust/Time Warp
This commit is contained in:
MitchesD
2015-03-27 15:34:53 +01:00
parent 39bdd06446 bc8f4ee976
commit b05d74ba46
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Spells/spell_mage.cpp
View File

@@ -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;
}

9
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -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;
}