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

Blessing of Might and Battle Shout can't be at the same time, fixed by naitsabes.s and me. Thanks to QAston and thenecromancer.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-01-17 01:53:28 -03:00
parent 7e183d6b2f
commit 054db2fa5c
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/game/SpellMgr.cpp
View File

@@ -550,7 +550,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
}
case SPELLFAMILY_WARRIOR:
{
if (spellInfo->SpellFamilyFlags[1] & 0x000080 || spellInfo->SpellFamilyFlags[0] & 0x10000)
if (spellInfo->SpellFamilyFlags[0] & 0x10000)
return SPELL_SPECIFIC_BATTLE_SHOUT;
if (spellInfo->SpellFamilyFlags[1] & 0x000080)
return SPELL_SPECIFIC_POSITIVE_SHOUT;
if (spellInfo->Id == 12292) // Death Wish
return SPELL_SPECIFIC_WARRIOR_ENRAGE;
@@ -603,6 +605,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
if (IsSealSpell(spellInfo))
return SPELL_SPECIFIC_SEAL;
if (spellInfo->SpellFamilyFlags[0] & 0x00000002)
return SPELL_SPECIFIC_BLESSING_OF_MIGHT;
if (spellInfo->SpellFamilyFlags[0] & 0x11010002)
return SPELL_SPECIFIC_BLESSING;
@@ -670,12 +675,14 @@ bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1,SpellSpecific s
switch(spellSpec1)
{
case SPELL_SPECIFIC_SEAL:
case SPELL_SPECIFIC_BLESSING_OF_MIGHT:
case SPELL_SPECIFIC_BLESSING:
case SPELL_SPECIFIC_HAND:
case SPELL_SPECIFIC_AURA:
case SPELL_SPECIFIC_STING:
case SPELL_SPECIFIC_CURSE:
case SPELL_SPECIFIC_ASPECT:
case SPELL_SPECIFIC_BATTLE_SHOUT:
case SPELL_SPECIFIC_POSITIVE_SHOUT:
case SPELL_SPECIFIC_JUDGEMENT:
case SPELL_SPECIFIC_WARLOCK_CORRUPTION:
@@ -723,6 +730,16 @@ bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific
return spellSpec2==SPELL_SPECIFIC_BATTLE_ELIXIR
|| spellSpec2==SPELL_SPECIFIC_GUARDIAN_ELIXIR
|| spellSpec2==SPELL_SPECIFIC_FLASK_ELIXIR;
case SPELL_SPECIFIC_BLESSING_OF_MIGHT:
return spellSpec2==SPELL_SPECIFIC_BATTLE_SHOUT
|| spellSpec2==SPELL_SPECIFIC_BLESSING;
case SPELL_SPECIFIC_BATTLE_SHOUT:
return spellSpec2==SPELL_SPECIFIC_BLESSING_OF_MIGHT
|| spellSpec2==SPELL_SPECIFIC_POSITIVE_SHOUT;
case SPELL_SPECIFIC_POSITIVE_SHOUT:
return spellSpec2==SPELL_SPECIFIC_BATTLE_SHOUT;
case SPELL_SPECIFIC_BLESSING:
return spellSpec2==SPELL_SPECIFIC_BLESSING_OF_MIGHT;
default:
return false;
}

4
src/game/SpellMgr.h
View File

@@ -119,7 +119,7 @@ enum SpellFamilyFlag
SPELLFAMILYFLAG2_DRUID_STARFALL = 0x00000100,
// Paladin
SPELLFAMILYFLAG1_PALADIN_DIVINESTORM = 0x00020000,
SPELLFAMILYFLAG1_PALADIN_DIVINESTORM = 0x00020000,
// Shaman
SPELLFAMILYFLAG_SHAMAN_FROST_SHOCK = 0x80000000,
@@ -173,6 +173,8 @@ enum SpellSpecific
SPELL_SPECIFIC_PRIEST_DIVINE_SPIRIT = 27,
SPELL_SPECIFIC_HAND = 28,
SPELL_SPECIFIC_PHASE = 29,
SPELL_SPECIFIC_BLESSING_OF_MIGHT = 30,
SPELL_SPECIFIC_BATTLE_SHOUT = 31
};
#define SPELL_LINKED_MAX_SPELLS 200000