[patch]Butchery

[tehmarto]

What bug does the patch fix? What features does the patch add?

Fixes Butchery to restore runic power.

For which repository revision was the patch created?

Works with 9842.

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

Don't find any.

Who has been writing this patch? Please include either forum user names or email addresses.

Me.

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index e71b630..b0d9908 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5309,11 +5441,13 @@ void Aura::HandleModPowerRegen(bool apply, bool Real)       // drinking
    if(m_modifier.periodictime == 0)
    {
        // Anger Management (only spell use this aura for rage)
        if (pt == POWER_RAGE)
            m_modifier.periodictime = 3000;
-        else
+        else if(pt == POWER_RUNIC_POWER)
+            m_modifier.periodictime = 5000;
+        else
            m_modifier.periodictime = 2000;
    }

    m_periodicTimer = 5000;

@@ -7555,10 +7713,13 @@ void Aura::PeriodicTick()
            // Anger Management
            // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
            // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec
            if(pt == POWER_RAGE)
                m_target->ModifyPower(pt, m_modifier.m_amount * 3 / 5);
+            // Butchery
+            else if(pt == POWER_RUNIC_POWER && m_target->isInCombat())
+                m_target->ModifyPower(pt, m_modifier.m_amount);
            break;
        }
        // Here tick dummy auras
        case SPELL_AURA_DUMMY:                              // some spells have dummy aura
        case SPELL_AURA_PERIODIC_DUMMY: