gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-13 12:06:31 -05:00
Code Issues Releases Wiki Activity

updated life/mana globes and text placement to not use magic numbers (#750)

Browse Source
This commit is contained in:
leahiel 2020-09-23 23:00:15 -04:00 committed by GitHub
parent a4c8aef8aa
commit 481b3a0134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
d2game/d2player/game_controls.go
View File

@ -826,24 +826,19 @@ func (g *GameControls) Render(target d2interface.Surface) error {
g.zoneChangeText.Render(target) g.zoneChangeText.Render(target)
} }
hpWithin := (mx <= 95) && (mx >= 30) && (my <= 575) && (my >= 525)
manaWithin := (mx <= 765) && (mx >= 700) && (my <= 575) && (my >= 525)
// Display current hp and mana stats hpGlobe or manaGlobe region is clicked // Display current hp and mana stats hpGlobe or manaGlobe region is clicked
if hpWithin || g.hpStatsIsVisible { if g.actionableRegions[hpGlobe].Rect.IsInRect(mx, my) || g.hpStatsIsVisible {
g.hpManaStatsLabel.SetText(d2ui.ColorTokenize( g.hpManaStatsLabel.SetText(fmt.Sprintf("Life: %v / %v", float64(g.hero.Stats.Health), float64(g.hero.Stats.MaxHealth)))
fmt.Sprintf("LIFE: %v / %v", float64(g.hero.Stats.Health), float64(g.hero.Stats.MaxHealth)), g.hpManaStatsLabel.SetPosition(15, 487)
d2ui.ColorTokenWhite),
)
g.hpManaStatsLabel.SetPosition(15, 485)
g.hpManaStatsLabel.Render(target) g.hpManaStatsLabel.Render(target)
} }
if manaWithin || g.manaStatsIsVisible { if g.actionableRegions[manaGlobe].Rect.IsInRect(mx, my) || g.manaStatsIsVisible {
g.hpManaStatsLabel.SetText(fmt.Sprintf("MANA: %v / %v", float64(g.hero.Stats.Mana), float64(g.hero.Stats.MaxMana))) g.hpManaStatsLabel.SetText(fmt.Sprintf("Mana: %v / %v", float64(g.hero.Stats.Mana), float64(g.hero.Stats.MaxMana)))
// In case if the mana value gets higher, we need to shift the label to the left a little, hense widthManaLabel.
widthManaLabel, _ := g.hpManaStatsLabel.GetSize() widthManaLabel, _ := g.hpManaStatsLabel.GetSize()
xManaLabel := 785 - widthManaLabel xManaLabel := 785 - widthManaLabel
g.hpManaStatsLabel.SetPosition(xManaLabel, 485) g.hpManaStatsLabel.SetPosition(xManaLabel, 487)
g.hpManaStatsLabel.Render(target) g.hpManaStatsLabel.Render(target)
} }