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

pull/57/head
sigonasr2 6 months ago
parent c7b5660a70
commit 2b6201f641
  1. 7
      Adventures in Lestoria/Player.cpp
  2. 2
      Adventures in Lestoria/Player.h
  3. 4
      Adventures in Lestoria/Version.h
  4. BIN
      x64/Release/Adventures in Lestoria.exe

@ -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());
}
}

@ -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;

@ -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

Loading…
Cancel
Save