From 74620494b902e18735a00e65bedb747b0781cc30 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 18 Aug 2012 09:54:44 -0500 Subject: Core/Entities: Update health bonus from stamina to use DBC values --- src/server/game/DataStores/DBCfmt.h | 2 +- src/server/game/Entities/Unit/StatSystem.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 9c82497b15d..9f4d20358da 100755 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -67,7 +67,7 @@ const char GlyphSlotfmt[]="nii"; const char GtBarberShopCostBasefmt[]="xf"; const char GtCombatRatingsfmt[]="xf"; -const char GtOCTHpPerStaminafmt[]="xf"; +const char GtOCTHpPerStaminafmt[]="df"; const char GtChanceToMeleeCritBasefmt[]="xf"; const char GtChanceToMeleeCritfmt[]="xf"; const char GtChanceToSpellCritBasefmt[]="xf"; diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index d44feeecd08..bee6ae39a35 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -225,12 +225,8 @@ void Player::UpdateArmor() float Player::GetHealthBonusFromStamina() { - float stamina = GetStat(STAT_STAMINA); - - float baseStam = stamina < 20 ? stamina : 20; - float moreStam = stamina - baseStam; - - return baseStam + (moreStam*10.0f); + gtOCTHpPerStaminaEntry const* hpBase = sGtOCTHpPerStaminaStore.LookupEntry((getClass() - 1) * GT_MAX_LEVEL + getLevel() - 1); + return GetStat(STAT_STAMINA) * hpBase->ratio; } float Player::GetManaBonusFromIntellect() -- cgit v1.2.3