aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2015-02-11 15:32:23 +0000
committerDuarte Duarte <dnpd.dd@gmail.com>2015-02-11 15:32:23 +0000
commit7257c81b162c4f776c59f9d8dba692f699020f23 (patch)
tree0ee9803a2bfde8e115313eea7156d65c4fa07547
parentc9ca81f8064277eeeeb50cc6e0c7ea59a0274c7c (diff)
parent1abfe990559f872a3006dd6dd779386883952fa7 (diff)
Merge pull request #14097 from flippy84/hp_fix
Fix health calculation.
-rw-r--r--src/server/game/Entities/Unit/StatSystem.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index d9d6cd9d2e5..fd1d2cc20c8 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -256,16 +256,14 @@ void Player::UpdateArmor()
float Player::GetHealthBonusFromStamina()
{
- // Taken from PaperDollFrame.lua - 4.3.4.15595
+ // Taken from PaperDollFrame.lua - 6.0.3.19085
float ratio = 10.0f;
if (gtOCTHpPerStaminaEntry const* hpBase = sGtOCTHpPerStaminaStore.EvaluateTable(getLevel() - 1, 0))
ratio = hpBase->ratio;
float stamina = GetStat(STAT_STAMINA);
- float baseStam = std::min(20.0f, stamina);
- float moreStam = stamina - baseStam;
- return baseStam + moreStam * ratio;
+ return stamina * ratio;
}
float Player::GetManaBonusFromIntellect()