Skip to content

Commit 9aa9c47

Browse files
authored
fix: Display appropriate max vital when at 0 vital (AscensionGameDev#2100)
1 parent 03f7911 commit 9aa9c47

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Intersect.Client/Interface/Game/EntityPanel/EntityBox.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,11 @@ private void UpdateHpBar(float elapsedTime, bool instant = false)
690690
var barDirectionSetting = ClientConfiguration.Instance.EntityBarDirections[(int)Vital.Health];
691691
var barPercentageSetting = Globals.Database.ShowHealthAsPercentage;
692692
var entityVital = (float)MyEntity.Vital[(int)Vital.Health];
693+
var entityMaxVital = (float)MyEntity.MaxVital[(int)Vital.Health];
693694

694695
if (entityVital > 0)
695696
{
696-
var entityMaxVital = (float)MyEntity.MaxVital[(int)Vital.Health];
697+
697698
var shieldSize = (float)MyEntity.GetShieldSize();
698699
var vitalSize = (int)barDirectionSetting < (int)DisplayDirection.TopToBottom
699700
? HpBackground.Width
@@ -718,8 +719,8 @@ private void UpdateHpBar(float elapsedTime, bool instant = false)
718719
}
719720
else
720721
{
721-
HpLbl.Text = barPercentageSetting ? "0%" : Strings.EntityBox.vital0val.ToString(0, 0);
722-
HpBackground.SetToolTipText(barPercentageSetting ? Strings.EntityBox.vital0val.ToString(0, 0) : "0%");
722+
HpLbl.Text = barPercentageSetting ? "0%" : Strings.EntityBox.vital0val.ToString(0, entityMaxVital);
723+
HpBackground.SetToolTipText(barPercentageSetting ? Strings.EntityBox.vital0val.ToString(0, entityMaxVital) : "0%");
723724
targetHpSize = 0;
724725
targetShieldSize = 0;
725726
}
@@ -759,10 +760,11 @@ private void UpdateMpBar(float elapsedTime, bool instant = false)
759760
var barDirectionSetting = ClientConfiguration.Instance.EntityBarDirections[(int)Vital.Mana];
760761
var barPercentageSetting = Globals.Database.ShowManaAsPercentage;
761762
var entityVital = (float)MyEntity.Vital[(int)Vital.Mana];
763+
var entityMaxVital = (float)MyEntity.MaxVital[(int)Vital.Mana];
762764

763765
if (entityVital > 0)
764766
{
765-
var entityMaxVital = (float)MyEntity.MaxVital[(int)Vital.Mana];
767+
766768
var entityVitalRatio = entityVital / entityMaxVital;
767769
var vitalSize = (int)barDirectionSetting < (int)DisplayDirection.TopToBottom
768770
? MpBackground.Width
@@ -776,8 +778,8 @@ private void UpdateMpBar(float elapsedTime, bool instant = false)
776778
}
777779
else
778780
{
779-
MpLbl.Text = barPercentageSetting ? "0%" : Strings.EntityBox.vital1val.ToString(0, 0);
780-
MpBackground.SetToolTipText(barPercentageSetting ? Strings.EntityBox.vital1val.ToString(0, 0) : "0%");
781+
MpLbl.Text = barPercentageSetting ? "0%" : Strings.EntityBox.vital1val.ToString(0, entityMaxVital);
782+
MpBackground.SetToolTipText(barPercentageSetting ? Strings.EntityBox.vital1val.ToString(0, entityMaxVital) : "0%");
781783
targetMpSize = 0;
782784
}
783785

0 commit comments

Comments
 (0)