From f55363a932ca81e1265beb4b2ce3700185c14054 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:03:24 -0700 Subject: [PATCH] Fix janky sublimate ammo display (#8469) --- .../blocks/defense/turrets/ContinuousLiquidTurret.java | 5 ++++- core/src/mindustry/world/meta/StatValues.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java index 1f850b5b74..7c83fc10d6 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java @@ -33,7 +33,10 @@ public class ContinuousLiquidTurret extends ContinuousTurret{ stats.remove(Stat.ammo); //TODO looks bad - stats.add(Stat.ammo, StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true)); + stats.add(Stat.ammo, table -> { + table.row(); + StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true).display(table); + }); stats.add(Stat.ammo, StatValues.ammo(ammoTypes)); } diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 04b162941c..02697f4b9b 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -51,10 +51,10 @@ public class StatValues{ String l1 = (unit.icon == null ? "" : unit.icon + " ") + fixValue(value), l2 = (unit.space ? " " : "") + unit.localized(); if(merge){ - table.add(l1 + l2); + table.add(l1 + l2).left(); }else{ - table.add(l1); - table.add(l2); + table.add(l1).left(); + table.add(l2).left(); } }; }