[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();
|
Powers pt = m_target->getPowerType();
|
||||||
if(m_modifier.periodictime == 0)
|
if(m_modifier.periodictime == 0)
|
||||||
{
|
{
|
||||||
|
// Anger Management (only spell use this aura for rage)
|
||||||
if (pt == POWER_RAGE)
|
if (pt == POWER_RAGE)
|
||||||
m_modifier.periodictime = 1000;
|
m_modifier.periodictime = 3000;
|
||||||
else
|
else
|
||||||
m_modifier.periodictime = 2000;
|
m_modifier.periodictime = 2000;
|
||||||
}
|
}
|
||||||
@@ -5905,9 +5906,11 @@ void Aura::PeriodicTick()
|
|||||||
m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
|
m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Warrior talent, gain 1 rage every 3 seconds while in combat
|
// Anger Management
|
||||||
if(pt == POWER_RAGE && m_target->isInCombat())
|
// amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
|
||||||
m_target->ModifyPower(pt, m_modifier.m_amount*10/17);
|
// 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;
|
break;
|
||||||
}
|
}
|
||||||
// Here tick dummy auras
|
// Here tick dummy auras
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7273"
|
#define REVISION_NR "7274"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|||||||
Reference in New Issue
Block a user