diff options
| author | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
|---|---|---|
| committer | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
| commit | a3f00be577f33e41d70ce0c9b0e9e0951d5dc082 (patch) | |
| tree | 1d98d3e898b6e4888eef99cb09ea0a4eca8cd1a7 /src/game/SpellMgr.cpp | |
| parent | a68d8302d54b8d119006f0c5e9fe346e5d0baf24 (diff) | |
| parent | af1c18852446e6be81376a98eba8e2543985479d (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index c4e521d4977..df583d098fc 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2586,6 +2586,19 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto // Explicit Diminishing Groups switch(spellproto->SpellFamilyName) { + case SPELLFAMILY_MAGE: + { + // Frostbite 0x80000000 + if (spellproto->SpellFamilyFlags[1] & 0x80000000) + return DIMINISHING_TRIGGER_ROOT; + // Shattered Barrier (triggered so doesn't share with Frost Nova) + else if (spellproto->SpellFamilyFlags[0] & 0x80000) + return DIMINISHING_TRIGGER_ROOT; + // Frost Nova / Freeze (Water Elemental) + else if (spellproto->SpellIconID == 193) + return DIMINISHING_CONTROL_ROOT; + break; + } case SPELLFAMILY_ROGUE: { // Sap 0x80 Gouge 0x8 @@ -2634,13 +2647,6 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto return DIMINISHING_LIMITONLY; break; } - case SPELLFAMILY_MAGE: - { - // Frostbite - if (spellproto->SpellFamilyFlags[1] & 0x80000000) - return DIMINISHING_TRIGGER_ROOT; - break; - } case SPELLFAMILY_WARRIOR: { // Hamstring - limit duration to 10s in PvP |