[8266] Move percent spells with flat energize effect spells to effect code. Author: VladimirMangos

    * This is fix talent 51521 and ranks.
    * And replace hardcoded percent for talent 31876 and ranks.

--HG--
branch : trunk

2 files changed, 11 insertions, 19 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index cf32a96f9f2..2dca13cd08a 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -2880,31 +2880,31 @@ void Spell::EffectEnergize(uint32 i)
     Powers power = Powers(m_spellInfo->EffectMiscValue[i]);
 
     // Some level depends spells
-    int multiplier = 0;
+    int level_multiplier = 0;
     int level_diff = 0;
     switch (m_spellInfo->Id)
     {
-        // Restore Energy
-        case 9512:
+        case 9512:                                          // Restore Energy
             level_diff = m_caster->getLevel() - 40;
-            multiplier = 2;
+            level_multiplier = 2;
             break;
-        // Blood Fury
-        case 24571:
+        case 24571:                                         // Blood Fury
             level_diff = m_caster->getLevel() - 60;
-            multiplier = 10;
+            level_multiplier = 10;
             break;
-        // Burst of Energy
-        case 24532:
+        case 24532:                                         // Burst of Energy
             level_diff = m_caster->getLevel() - 60;
-            multiplier = 4;
+            level_multiplier = 4;
             break;
+        case 31930:                                         // Judgements of the Wise
+        case 63375:                                         // Improved Stormstrike
+            damage = damage * unitTarget->GetCreateMana() / 100;
         default:
             break;
     }
 
     if (level_diff > 0)
-        damage -= multiplier * level_diff;
+        damage -= level_multiplier * level_diff;
 
     if(damage < 0)
         return;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 825e552dc6f..692185910db 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6202,8 +6202,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             // Judgements of the Wise
             if (dummySpell->SpellIconID == 3017)
             {
-                // hardcoded amount
-                basepoints0 = 25 * GetCreatePowers(POWER_MANA)/100;
                 target = this;
                 triggered_spell_id = 31930;
                 // replenishment
@@ -7873,12 +7871,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                 ((Player*)this)->RemoveSpellCategoryCooldown(1209, true);
             break;
         }
-        // Improved Stormstrike
-        case 63375:
-        {
-            basepoints0 = int32(GetCreateMana() * triggerAmount / 100);
-            break;
-        }
         // Maelstrom Weapon
         case 53817:
         {