mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[8298] Use new Aura::HandleSpellSpecificBoosts for apply/remove dependent auras.
This provided more clear place where dependent auras can be applied/removed, if expected manual apply _with_ aura remove at parent aura expire. This can be used for more cases. In current state it implement additional effects for 29836 and ranks, 61846 and ranks, 31869, 53379 and ranks, 20254 and ranks, 20138 an ranks, 48263, and 48265. Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
aa56961f94
commit
39eca7d43a
6 changed files with 233 additions and 100 deletions
|
|
@ -1463,9 +1463,15 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
|
|||
if( spellInfo_2->SpellFamilyName == SPELLFAMILY_PALADIN )
|
||||
{
|
||||
// Paladin Seals
|
||||
if( IsSealSpell(spellInfo_1) && IsSealSpell(spellInfo_2) )
|
||||
if (IsSealSpell(spellInfo_1) && IsSealSpell(spellInfo_2))
|
||||
return true;
|
||||
|
||||
// Swift Retribution / Improved Devotion Aura (talents) and Paladin Auras
|
||||
if ((spellInfo_1->SpellFamilyFlags2 & 0x00000020) && (spellInfo_2->SpellIconID == 291 || spellInfo_2->SpellIconID == 3028) ||
|
||||
(spellInfo_2->SpellFamilyFlags2 & 0x00000020) && (spellInfo_1->SpellIconID == 291 || spellInfo_1->SpellIconID == 3028))
|
||||
return false;
|
||||
}
|
||||
|
||||
// Combustion and Fire Protection Aura (multi-family check)
|
||||
if( spellInfo_2->Id == 11129 && spellInfo_1->SpellIconID == 33 && spellInfo_1->SpellVisual[0] == 321 )
|
||||
return false;
|
||||
|
|
@ -1494,6 +1500,18 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
|
|||
if( spellInfo_1->Id == 2825 && spellInfo_2->SpellIconID == 38 && spellInfo_2->SpellVisual[0] == 0 )
|
||||
return false;
|
||||
break;
|
||||
case SPELLFAMILY_DEATHKNIGHT:
|
||||
if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
|
||||
{
|
||||
// Frost Presence and Frost Presence (triggered)
|
||||
if( spellInfo_1->SpellIconID == 2632 && spellInfo_2->SpellIconID == 2632 )
|
||||
return false;
|
||||
|
||||
// Unholy Presence and Unholy Presence (triggered)
|
||||
if( spellInfo_1->SpellIconID == 2633 && spellInfo_2->SpellIconID == 2633 )
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue