mangos_one diminishing returns cleanup (original author vovk)

gistfile1.diff

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 367cd32..19ece1b 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -3790,26 +3790,25 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
             // Kidney Shot
             if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000200000)))
                 return DIMINISHING_KIDNEYSHOT;
+            // Gouge
+            else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000008)))
+                return DIMINISHING_POLYMORPH;
             // Blind
             else if (spellproto->IsFitToFamilyMask(UI64LIT(0x00001000000)))
                 return DIMINISHING_BLIND_CYCLONE;
             break;
         }
-        case SPELLFAMILY_HUNTER:
-        {
-            // Freezing trap
-            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000008)))
-                return DIMINISHING_FREEZE;
-            break;
-        }
         case SPELLFAMILY_WARLOCK:
         {
             // Fear
             if (spellproto->IsFitToFamilyMask(UI64LIT(0x40840000000)))
-                return DIMINISHING_WARLOCK_FEAR;
+                return DIMINISHING_FEAR;
             // Curses/etc
             if (spellproto->IsFitToFamilyMask(UI64LIT(0x00080000000)))
                 return DIMINISHING_LIMITONLY;
+            // Unstable Affliction
+            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000100)))
+                return DIMINISHING_SILENCE;
             break;
         }
         case SPELLFAMILY_DRUID:
@@ -3826,6 +3825,13 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
                 return DIMINISHING_LIMITONLY;
             break;
         }
+        case SPELLFAMILY_PALADIN:
+        {
+            // Repentance
+            if (spellproto->IsFitToFamilyMask(UI64LIT(0x00000000004)))
+                return DIMINISHING_POLYMORPH;
+            break;
+        }
         default:
             break;
     }
@@ -3841,20 +3847,18 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
         return DIMINISHING_SLEEP;
     if (mechanic & (1<<(MECHANIC_POLYMORPH-1)))
         return DIMINISHING_POLYMORPH;
+    if (mechanic & (1<<(MECHANIC_SAPPED-1)))
+        return DIMINISHING_POLYMORPH;
     if (mechanic & (1<<(MECHANIC_ROOT-1)))
         return triggered ? DIMINISHING_TRIGGER_ROOT : DIMINISHING_CONTROL_ROOT;
     if (mechanic & (1<<(MECHANIC_FEAR-1)))
         return DIMINISHING_FEAR;
     if (mechanic & (1<<(MECHANIC_CHARM-1)))
         return DIMINISHING_CHARM;
-    if (mechanic & (1<<(MECHANIC_SILENCE-1)))
-        return DIMINISHING_SILENCE;
     if (mechanic & (1<<(MECHANIC_DISARM-1)))
         return DIMINISHING_DISARM;
     if (mechanic & (1<<(MECHANIC_FREEZE-1)))
         return DIMINISHING_FREEZE;
-    if (mechanic & ((1<<(MECHANIC_KNOCKOUT-1))|(1<<(MECHANIC_SAPPED-1))))
-        return DIMINISHING_KNOCKOUT;
     if (mechanic & (1<<(MECHANIC_BANISH-1)))
         return DIMINISHING_BANISH;
     if (mechanic & (1<<(MECHANIC_HORROR-1)))

no DR for: knockout, silence, freezing trap
sap & gouge on same DR as polymorph

and just one type of fear DR...

todo: change -> disarm was placed on DR at patch 2.3!
change -> unstable affliction was placed on DR at patch 2.3 too!

   check riposte (also on DR since 2.3)

check repentance