From 2582e3c0d54619ba9265572b87824ed3d43997f3 Mon Sep 17 00:00:00 2001 From: Northstrider Date: Thu, 23 Aug 2012 18:14:08 +0200 Subject: Core/Player: updated player health regeneation to Cataclysm --- src/server/game/Entities/Player/Player.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 812383b9616..800498a82dd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2690,10 +2690,6 @@ void Player::RegenerateHealth() return; float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH); - - if (getLevel() < 15) - HealthIncreaseRate = sWorld->getRate(RATE_HEALTH) * (2.066f - (getLevel() * 0.066f)); - float addvalue = 0.0f; // polymorphed case @@ -2705,6 +2701,11 @@ void Player::RegenerateHealth() addvalue = HealthIncreaseRate; if (!isInCombat()) { + if (getLevel() < 15) + addvalue = (0.20f*((float)GetMaxHealth())/getLevel()*HealthIncreaseRate); + else + addvalue = 0.015f*((float)GetMaxHealth())*HealthIncreaseRate; + AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT); for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i) AddPctN(addvalue, (*i)->GetAmount()); -- cgit v1.2.3