araxiaonline/TrinityCore2
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore2.git synced 2026-06-13 03:22:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7430 from Tuxity/banecurse_434

Browse Source 
[434] Banes and Curses
This commit is contained in:
Nay
2012-08-18 06:03:01 -07:00
parent b55537e510 60e28bbc34
commit 346be644ca
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Spells/SpellInfo.cpp
View File

@@ -1341,6 +1341,7 @@ bool SpellInfo::IsAuraExclusiveBySpecificPerCasterWith(SpellInfo const* spellInf
case SPELL_SPECIFIC_AURA:
case SPELL_SPECIFIC_STING:
case SPELL_SPECIFIC_CURSE:
case SPELL_SPECIFIC_BANE:
case SPELL_SPECIFIC_ASPECT:
case SPELL_SPECIFIC_JUDGEMENT:
case SPELL_SPECIFIC_WARLOCK_CORRUPTION:
@@ -1953,6 +1954,10 @@ SpellSpecificType SpellInfo::GetSpellSpecific() const
if (Dispel == DISPEL_CURSE)
return SPELL_SPECIFIC_CURSE;
// Warlock (Bane of Doom | Bane of Agony | Bane of Havoc)
if (Id == 603 || Id == 980 || Id == 80240)
return SPELL_SPECIFIC_BANE;
// Warlock (Demon Armor | Demon Skin | Fel Armor)
if (SpellFamilyFlags[1] & 0x20000020 || SpellFamilyFlags[2] & 0x00000010)
return SPELL_SPECIFIC_WARLOCK_ARMOR;

2
src/server/game/Spells/SpellInfo.h
View File

@@ -166,6 +166,8 @@ enum SpellSpecificType
SPELL_SPECIFIC_WARRIOR_ENRAGE = 26,
SPELL_SPECIFIC_PRIEST_DIVINE_SPIRIT = 27,
SPELL_SPECIFIC_HAND = 28,
SPELL_SPECIFIC_PHASE = 29,
SPELL_SPECIFIC_BANE = 30,
};
enum SpellCustomAttributes