Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Author: reeshack <richard.galis@gmail.com> 2010-11-14 21:57:10
- Committer: reeshack <richard.galis@gmail.com> 2010-11-14 21:57:10
- Parent: 95cf8604df97e0e12213d84c7c29ad38dbf4f574 ([pr934] Even more absorb & proc fixes)
- Branches: master, remotes/origin/master
- Follows: 333a
- Precedes:
- [pr935] Power Word: Fortitude & Fortitude(Svitek), Fortitude(Svitek) & Prayer of Fortitude(plosna) stacking (thx to Wallker)
- Signed-off-by: reeshack <richard.galis@gmail.com>
- ---------------------------- src/game/SpellMgr.cpp ----------------------------
- index 22caf49..db0d9a0 100644
- @@ -2019,6 +2019,18 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
- break;
- }
- + case SPELLFAMILY_PRIEST:
- + {
- + // Power Word: Fortitude and Fortitude(Svitek)
- + if (spellInfo_1->SpellIconID == 312 && spellInfo_2->SpellIconID == 685)
- + return true;
- +
- + // Fortitude(Svitek) and Prayer of Fortitude(plosna)
- + if (spellInfo_1->SpellIconID == 312 && spellInfo_2->SpellIconID == 1669)
- + return true;
- +
- + break;
- + }
- }
- // Dragonmaw Illusion, Blood Elf Illusion, Human Illusion, Illidari Agent Illusion, Scarlet Crusade Disguise
- if (spellInfo_1->SpellIconID == 1691 && spellInfo_2->SpellIconID == 1691)
- @@ -2206,6 +2218,12 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
- //Renewed hope and gift of the naaru(have diff spell families)
- else if (spellInfo_1->SpellIconID == 329 && spellInfo_2->SpellIconID == 329 && spellInfo_2->SpellVisual[0] == 7625)
- return false;
- + // Power Word: Fortitude and Fortitude(Svitek)
- + else if (spellInfo_2->SpellIconID == 312 && spellInfo_1->SpellIconID == 685)
- + return true;
- + // Fortitude(Svitek) and Prayer of Fortitude(plosna)
- + else if (spellInfo_2->SpellIconID == 312 && spellInfo_1->SpellIconID == 1669)
- + return true;
- break;
- case SPELLFAMILY_DRUID:
- if ( spellInfo_2->SpellFamilyName == SPELLFAMILY_DRUID )
- --------------------------- src/shared/revision_nr.h ---------------------------
- index fbec432..cef58d0 100644
- @@ -1,6 +1,6 @@
- #ifndef __REVISION_NR_H__
- #define __REVISION_NR_H__
- #define REVISION_NR "10663"
- - #define REVISION_VP "pr934"
- + #define REVISION_VP "pr935"
- #define REVISION_VP_DATE "14.11.2010"
- #endif // __REVISION_NR_H__
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
