mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11648] Breath/fatigue/fire damage timers tick each 2 sec.

Browse source
This commit is contained in:
Den 2011-06-19 02:45:21 +04:00 • committed by VladimirMangos
parent fc88429972
commit f1fcefce4f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Player.cpp
View file

@ -1036,7 +1036,7 @@ void Player::HandleDrowning(uint32 time_diff)
// Timer limit - need deal damage // Timer limit - need deal damage
if (m_MirrorTimer[BREATH_TIMER] < 0) if (m_MirrorTimer[BREATH_TIMER] < 0)
{ {
m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILLISECONDS; m_MirrorTimer[BREATH_TIMER] += 2 * IN_MILLISECONDS;
// Calculate and deal damage // Calculate and deal damage
// TODO: Check this formula // TODO: Check this formula
uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1); 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 // Timer limit - need deal damage or teleport ghost to graveyard
if (m_MirrorTimer[FATIGUE_TIMER] < 0) 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 if (isAlive()) // Calculate and deal damage
{ {
uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1); uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
@ -1105,7 +1105,7 @@ void Player::HandleDrowning(uint32 time_diff)
m_MirrorTimer[FIRE_TIMER]-=time_diff; m_MirrorTimer[FIRE_TIMER]-=time_diff;
if (m_MirrorTimer[FIRE_TIMER] < 0) if (m_MirrorTimer[FIRE_TIMER] < 0)
{ {
m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILLISECONDS; m_MirrorTimer[FIRE_TIMER] += 2 * IN_MILLISECONDS;
// Calculate and deal damage // Calculate and deal damage
// TODO: Check this formula // TODO: Check this formula
uint32 damage = urand(600, 700); uint32 damage = urand(600, 700);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11647" #define REVISION_NR "11648"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__