[7274] Fixed work of warrior talent 12296.
* Proper tick in 3 sec
* Replace amount calculation hack by more proved formula.
* Ignore in combat state.
Author: domingo
--HG--
branch : trunk
This commit is contained in:
@@ -4387,8 +4387,9 @@ void Aura::HandleModPowerRegen(bool apply, bool Real) // drinking
|
||||
Powers pt = m_target->getPowerType();
|
||||
if(m_modifier.periodictime == 0)
|
||||
{
|
||||
// Anger Management (only spell use this aura for rage)
|
||||
if (pt == POWER_RAGE)
|
||||
m_modifier.periodictime = 1000;
|
||||
m_modifier.periodictime = 3000;
|
||||
else
|
||||
m_modifier.periodictime = 2000;
|
||||
}
|
||||
@@ -5905,9 +5906,11 @@ void Aura::PeriodicTick()
|
||||
m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
|
||||
}
|
||||
|
||||
// Warrior talent, gain 1 rage every 3 seconds while in combat
|
||||
if(pt == POWER_RAGE && m_target->isInCombat())
|
||||
m_target->ModifyPower(pt, m_modifier.m_amount*10/17);
|
||||
// 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);
|
||||
break;
|
||||
}
|
||||
// Here tick dummy auras
|
||||
|
||||
Reference in New Issue
Block a user