From f1fcefce4fc42decfb42437b42eca69eaf567558 Mon Sep 17 00:00:00 2001 From: Den Date: Sun, 19 Jun 2011 02:45:21 +0400 Subject: [PATCH] [11648] Breath/fatigue/fire damage timers tick each 2 sec. --- src/game/Player.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 33e638ca6..50e11e07e 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1036,7 +1036,7 @@ void Player::HandleDrowning(uint32 time_diff) // Timer limit - need deal damage if (m_MirrorTimer[BREATH_TIMER] < 0) { - m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILLISECONDS; + m_MirrorTimer[BREATH_TIMER] += 2 * IN_MILLISECONDS; // Calculate and deal damage // TODO: Check this formula uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1); @@ -1072,7 +1072,7 @@ void Player::HandleDrowning(uint32 time_diff) // Timer limit - need deal damage or teleport ghost to graveyard if (m_MirrorTimer[FATIGUE_TIMER] < 0) { - m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILLISECONDS; + m_MirrorTimer[FATIGUE_TIMER] += 2 * IN_MILLISECONDS; if (isAlive()) // Calculate and deal damage { uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1); @@ -1105,7 +1105,7 @@ void Player::HandleDrowning(uint32 time_diff) m_MirrorTimer[FIRE_TIMER]-=time_diff; if (m_MirrorTimer[FIRE_TIMER] < 0) { - m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILLISECONDS; + m_MirrorTimer[FIRE_TIMER] += 2 * IN_MILLISECONDS; // Calculate and deal damage // TODO: Check this formula uint32 damage = urand(600, 700); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b822541ef..5fcec2e8c 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 "11647" + #define REVISION_NR "11648" #endif // __REVISION_NR_H__