mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11652] Diminishing returns for some paladin abilities.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
elecyb 2011-06-19 06:08:00 +04:00 • committed by VladimirMangos
parent 248bfd2a81
commit 2776f55d7a
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/game/SpellMgr.cpp
View file

@ -4270,10 +4270,10 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
{ {
// Blind // Blind
if (spellproto->SpellFamilyFlags & UI64LIT(0x00001000000)) if (spellproto->IsFitToFamilyMask(UI64LIT(0x00001000000)))
return DIMINISHING_FEAR_CHARM_BLIND; return DIMINISHING_FEAR_CHARM_BLIND;
// Cheap Shot // Cheap Shot
else if (spellproto->SpellFamilyFlags & UI64LIT(0x00000000400)) else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000400)))
return DIMINISHING_CHEAPSHOT_POUNCE; return DIMINISHING_CHEAPSHOT_POUNCE;
// Crippling poison - Limit to 10 seconds in PvP (No SpellFamilyFlags) // Crippling poison - Limit to 10 seconds in PvP (No SpellFamilyFlags)
else if (spellproto->SpellIconID == 163) else if (spellproto->SpellIconID == 163)
@ -4290,27 +4290,34 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
case SPELLFAMILY_WARLOCK: case SPELLFAMILY_WARLOCK:
{ {
// Curses/etc // Curses/etc
if (spellproto->SpellFamilyFlags & UI64LIT(0x00080000000)) if (spellproto->IsFitToFamilyMask(UI64LIT(0x00080000000)))
return DIMINISHING_LIMITONLY;
break;
}
case SPELLFAMILY_PALADIN:
{
// Judgement of Justice - Limit to 10 seconds in PvP
if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000100000)))
return DIMINISHING_LIMITONLY; return DIMINISHING_LIMITONLY;
break; break;
} }
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
{ {
// Cyclone // Cyclone
if (spellproto->SpellFamilyFlags & UI64LIT(0x02000000000)) if (spellproto->IsFitToFamilyMask(UI64LIT(0x02000000000)))
return DIMINISHING_CYCLONE; return DIMINISHING_CYCLONE;
// Pounce // Pounce
else if (spellproto->SpellFamilyFlags & UI64LIT(0x00000020000)) else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000020000)))
return DIMINISHING_CHEAPSHOT_POUNCE; return DIMINISHING_CHEAPSHOT_POUNCE;
// Faerie Fire // Faerie Fire
else if (spellproto->SpellFamilyFlags & UI64LIT(0x00000000400)) else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000400)))
return DIMINISHING_LIMITONLY; return DIMINISHING_LIMITONLY;
break; break;
} }
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
// Hamstring - limit duration to 10s in PvP // Hamstring - limit duration to 10s in PvP
if (spellproto->SpellFamilyFlags & UI64LIT(0x00000000002)) if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000002)))
return DIMINISHING_LIMITONLY; return DIMINISHING_LIMITONLY;
break; break;
} }
@ -4345,7 +4352,7 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
return DIMINISHING_DISORIENT; return DIMINISHING_DISORIENT;
if (mechanic & (1<<(MECHANIC_ROOT-1))) if (mechanic & (1<<(MECHANIC_ROOT-1)))
return triggered ? DIMINISHING_TRIGGER_ROOT : DIMINISHING_CONTROL_ROOT; return triggered ? DIMINISHING_TRIGGER_ROOT : DIMINISHING_CONTROL_ROOT;
if (mechanic & ((1<<(MECHANIC_FEAR-1))|(1<<(MECHANIC_CHARM-1)))) if (mechanic & ((1<<(MECHANIC_FEAR-1))|(1<<(MECHANIC_CHARM-1))|(1<<(MECHANIC_TURN-1))))
return DIMINISHING_FEAR_CHARM_BLIND; return DIMINISHING_FEAR_CHARM_BLIND;
if (mechanic & ((1<<(MECHANIC_SILENCE-1))|(1<<(MECHANIC_INTERRUPT-1)))) if (mechanic & ((1<<(MECHANIC_SILENCE-1))|(1<<(MECHANIC_INTERRUPT-1))))
return DIMINISHING_SILENCE; return DIMINISHING_SILENCE;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11651" #define REVISION_NR "11652"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__