diff options
| author | megamage <none@none> | 2009-02-13 20:05:16 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-13 20:05:16 -0600 |
| commit | 136e49f39f961c6a9dd97bb2c9a8188aa24fe0fe (patch) | |
| tree | fb82f9e670b7286b98d5c96aaef765863f83ae27 /src | |
| parent | 1d18f3d8703f7f5704bfdf17deeddcfc891a8263 (diff) | |
[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
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 11 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 0cf9c979c14..d411d490f14 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8410719de21..b8cef1ee077 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7273" + #define REVISION_NR "7274" #endif // __REVISION_NR_H__ |