Cherry pick health % not being applied bug from commit 94c3125e73 into master branch. Release Build 9424.

This commit is contained in:
sigonasr2 2024-05-24 20:46:50 -05:00
parent 3ed876aa91
commit 81776a2c4e
4 changed files with 7 additions and 6 deletions

View File

@ -250,8 +250,9 @@ const int Player::GetHealth()const{
return hp;
}
const float&Player::GetMaxHealth()const{
return GetStat("Health");
const float Player::GetMaxHealth()const{
const float hpPctIncrease=GetStat("Health")*GetStat("Health %")/100.f;
return GetStat("Health")+hpPctIncrease;
}
const int Player::GetMana()const{
@ -1527,7 +1528,7 @@ const bool Player::UsingAutoAim()const{
void Player::UpdateHealthAndMana(){
//Perform a check to make sure stats are initialized before they can be used.
if(game->GameInitialized()){
hp=std::min(hp,int(GetStat("Health")));
hp=std::min(hp,int(GetMaxHealth()));
mana=std::min(mana,GetMaxMana());
}
}

View File

@ -108,7 +108,7 @@ public:
const float&GetBaseStat(std::string_view a)const;
void SetBaseStat(std::string_view a,float val);
void SetBaseStat(ItemAttribute a,float val);
const float&GetMaxHealth()const;
const float GetMaxHealth()const;
const int GetHealth()const;
const int GetMana()const;
const int GetMaxMana()const;

View File

@ -38,8 +38,8 @@ All rights reserved.
#pragma once
#define VERSION_MAJOR 1
#define VERSION_MINOR 2
#define VERSION_PATCH 0
#define VERSION_BUILD 9416
#define VERSION_PATCH 3
#define VERSION_BUILD 9426
#define stringify(a) stringify_(a)
#define stringify_(a) #a