evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak item stat formatting to prevent way too many decimals

Browse Source
This commit is contained in:
Kae 2024-04-22 15:26:31 +10:00
parent ad72057c38
commit 85a23231d4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/frontend/StarInventory.cpp
View File

@ -364,16 +364,16 @@ void InventoryPane::update(float dt) {
techOverlay->setVisibility(m_player->techOverridden()); techOverlay->setVisibility(m_player->techOverridden());
auto healthLabel = fetchChild<LabelWidget>("healthtext"); auto healthLabel = fetchChild<LabelWidget>("healthtext");
healthLabel->setText(toString(m_player->maxHealth())); healthLabel->setText(strf("{:.2f}", m_player->maxHealth()));
auto energyLabel = fetchChild<LabelWidget>("energytext"); auto energyLabel = fetchChild<LabelWidget>("energytext");
energyLabel->setText(toString(m_player->maxEnergy())); energyLabel->setText(strf("{:.2f}", m_player->maxEnergy()));
auto weaponLabel = fetchChild<LabelWidget>("weapontext"); auto weaponLabel = fetchChild<LabelWidget>("weapontext");
weaponLabel->setText(strf("{}%", ceil(m_player->powerMultiplier() * 100))); weaponLabel->setText(strf("{:.2f}%", m_player->powerMultiplier() * 100));
auto defenseLabel = fetchChild<LabelWidget>("defensetext"); auto defenseLabel = fetchChild<LabelWidget>("defensetext");
if (m_player->protection() == 0) if (m_player->protection() == 0)
defenseLabel->setText("--"); defenseLabel->setText("--");
else else
defenseLabel->setText(toString(ceil(m_player->protection()))); defenseLabel->setText(strf("{:.2f}", m_player->protection()));
auto moneyLabel = fetchChild<LabelWidget>("lblMoney"); auto moneyLabel = fetchChild<LabelWidget>("lblMoney");
moneyLabel->setText(toString(m_player->currency("money"))); moneyLabel->setText(toString(m_player->currency("money")));
@ -406,14 +406,14 @@ void InventoryPane::update(float dt) {
auto attackLabel = fetchChild<LabelWidget>("companionAttackStat"); auto attackLabel = fetchChild<LabelWidget>("companionAttackStat");
if (auto attack = pet->stat("attack")) { if (auto attack = pet->stat("attack")) {
attackLabel->setText(strf("{:.0f}", *attack)); attackLabel->setText(strf("{:.2f}", *attack));
} else { } else {
attackLabel->setText(""); attackLabel->setText("");
} }
auto defenseLabel = fetchChild<LabelWidget>("companionDefenseStat"); auto defenseLabel = fetchChild<LabelWidget>("companionDefenseStat");
if (auto defense = pet->stat("defense")) { if (auto defense = pet->stat("defense")) {
defenseLabel->setText(strf("{:.0f}", *defense)); defenseLabel->setText(strf("{:.2f}", *defense));
} else { } else {
defenseLabel->setText(""); defenseLabel->setText("");
} }

4
source/frontend/StarItemTooltip.cpp
View File

@ -198,7 +198,7 @@ void ItemTooltipBuilder::describePersistentEffect(
auto listItem = container->addItem(); auto listItem = container->addItem();
listItem->fetchChild<ImageWidget>("statusImage") listItem->fetchChild<ImageWidget>("statusImage")
->setImage(statsConfig.get(baseMultiplier->statName).getString("icon")); ->setImage(statsConfig.get(baseMultiplier->statName).getString("icon"));
listItem->setLabel("statusLabel", strf("{}%", (baseMultiplier->baseMultiplier - 1) * 100)); listItem->setLabel("statusLabel", strf("{:.2f}%", (baseMultiplier->baseMultiplier - 1) * 100));
} }
} else if (auto valueModifier = modifierEffect->ptr<StatValueModifier>()) { } else if (auto valueModifier = modifierEffect->ptr<StatValueModifier>()) {
if (statsConfig.contains(valueModifier->statName)) { if (statsConfig.contains(valueModifier->statName)) {
@ -212,7 +212,7 @@ void ItemTooltipBuilder::describePersistentEffect(
auto listItem = container->addItem(); auto listItem = container->addItem();
listItem->fetchChild<ImageWidget>("statusImage") listItem->fetchChild<ImageWidget>("statusImage")
->setImage(statsConfig.get(effectiveMultiplier->statName).getString("icon")); ->setImage(statsConfig.get(effectiveMultiplier->statName).getString("icon"));
listItem->setLabel("statusLabel", strf("{}%", (effectiveMultiplier->effectiveMultiplier - 1) * 100)); listItem->setLabel("statusLabel", strf("{:.2f}%", (effectiveMultiplier->effectiveMultiplier - 1) * 100));
} }
} }
} }