Better rounding.

MEEPofFaith · Feb 17, 2022 · 04c227a · 04c227a
1 parent 27ab691
commit 04c227a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/testing/dialogs/WaveChangeDialog.java b/src/testing/dialogs/WaveChangeDialog.java
@@ -76,7 +76,7 @@ void rebuild(){
 
         all.clear();
 
-        float iconMul = 1.5f;
+        float iconMul = 2f;
         all.table(t -> {
             for(int i = minWave; i <= maxWave; i++){
                 int ii = i;
@@ -104,10 +104,10 @@ void rebuild(){
                                     if(hasShield){
                                         e.add(TUElements.itemImage(
                                             Icon.defense,
-                                            () -> Utils.roundAmount((int)group.getShield(wave)),
+                                            () -> Utils.roundAmount(group.getShield(wave)),
                                             Pal.accentBack,
                                             Pal.accent,
-                                            0.75f,
+                                            1f,
                                             Align.center
                                         )).size(8 * 2 * iconMul).growX();
                                     }

diff --git a/src/testing/util/Utils.java b/src/testing/util/Utils.java
@@ -52,16 +52,16 @@ public static String fixQuotes(String s){
         return s.replaceAll("\"", "\\\\\"");
     }
 
-    public static String roundAmount(int amount){
-        amount = UI.roundAmount(amount);
+    public static String roundAmount(float amount){
+        amount = UI.roundAmount((int)amount);
         if(amount >= 1_000_000_000){
-            return amount / 1_000_000_000 + bundle.get("unit.billions");
+            return Strings.autoFixed(amount / 1_000_000_000, 1) + bundle.get("unit.billions");
         }else if(amount >= 1_000_000){
-            return amount / 1_000_000 + bundle.get("unit.millions");
+            return Strings.autoFixed(amount / 1_000_000, 1) + bundle.get("unit.millions");
         }else if(amount >= 1000){
-            return amount / 1000 + bundle.get("unit.thousands");
+            return Strings.autoFixed(amount / 1000, 1) + bundle.get("unit.thousands");
         }else{
-            return String.valueOf(amount);
+            return String.valueOf((int)amount);
         }
     }
 }