diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-18 06:03:01 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-18 06:03:01 -0700 |
| commit | 346be644ca589a5844a07f4a3b6b56f8a23c6b24 (patch) | |
| tree | d0c03e2986e7d693694787e7fcaf92171b80523e /src | |
| parent | b55537e510d1d1a1363b4c1c87431523c6822a1e (diff) | |
| parent | 60e28bbc3436e64b879f68e78a546ddda9697f9b (diff) | |
Merge pull request #7430 from Tuxity/banecurse_434
[434] Banes and Curses
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 1220601edd6..df22b10e533 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -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; diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 2fb0234997c..9387ad750a0 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -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 |