From a121c4d0423a5df38a201eb84c20bb4ec1c26b0d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 21 Jan 2022 00:08:56 -0500
Subject: [PATCH] Fixed square numbers in stats

---
 .../blocks/turrets/afflict/afflict.png        | Bin 1800 -> 1760 bytes
 .../maps/planet/ErekirPlanetGenerator.java    |   2 +-
 core/src/mindustry/type/UnitType.java         |   4 ++--
 .../blocks/payloads/PayloadConveyor.java      |   2 +-
 .../blocks/payloads/PayloadMassDriver.java    |   2 +-
 core/src/mindustry/world/meta/StatValues.java |  17 ++++++++++++++---
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png
index 69f2a1b06593b1ba8433943d54fb35a731c09c8e..bc1d57ddc0f4e1d35795f9866803d77b40de3fa6 100644
GIT binary patch
delta 1731
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
Z`5$Ffq2*${ZhHU#002ovPDHLkV1jI!BCG%a

delta 1771
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
N002ovPDHLkV1nx{L686d

diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
index 0b0c437c71..040dd3704e 100644
--- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -190,7 +190,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
                 if(block == Blocks.air) block = Blocks.yellowStoneWall;
             }
 
-            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 7f, 1f) > 0.41f){
+            if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 6f, 1f) > 0.44f){
                 floor = Blocks.yellowStone;
             }
         });
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 57a9604607..867ec87dfc 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -320,7 +320,7 @@ public class UnitType extends UnlockableContent{
         stats.add(Stat.health, health);
         stats.add(Stat.armor, armor);
         stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond);
-        stats.add(Stat.size, hitSize / tilesize, StatUnit.blocksSquared);
+        stats.add(Stat.size, StatValues.squared(hitSize / tilesize, StatUnit.blocksSquared));
         stats.add(Stat.itemCapacity, itemCapacity);
         stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks);
         stats.add(Stat.commandLimit, commandLimit);
@@ -349,7 +349,7 @@ public class UnitType extends UnlockableContent{
             stats.addPercent(Stat.buildSpeed, buildSpeed);
         }
         if(inst instanceof Payloadc){
-            stats.add(Stat.payloadCapacity, (payloadCapacity / (tilesize * tilesize)), StatUnit.blocksSquared);
+            stats.add(Stat.payloadCapacity, StatValues.squared(Mathf.sqrt(payloadCapacity / (tilesize * tilesize)), StatUnit.blocksSquared));
         }
 
         var reqs = getFirstRequirements();
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
index 1e682f2824..6880b6662a 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
@@ -54,7 +54,7 @@ public class PayloadConveyor extends Block{
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.payloadCapacity, (payloadLimit), StatUnit.blocksSquared);
+        stats.add(Stat.payloadCapacity, StatValues.squared(payloadLimit, StatUnit.blocksSquared));
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
index 1aa6e3100c..02eaa64955 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
@@ -78,7 +78,7 @@ public class PayloadMassDriver extends PayloadBlock{
     public void setStats(){
         super.setStats();
 
-        stats.add(Stat.payloadCapacity, maxPayloadSize, StatUnit.blocksSquared);
+        stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared));
         stats.add(Stat.reload, 60f / (chargeTime + reloadTime), StatUnit.seconds);
     }
 
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 064bd095aa..7f0ad1e1bf 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -34,11 +34,22 @@ public class StatValues{
         return table ->  table.add(!value ? "@no" : "@yes");
     }
 
+    public static String fixValue(float value){
+        int precision = Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2;
+        return Strings.fixed(value, precision);
+    }
+
+    public static StatValue squared(float value, StatUnit unit){
+        return table -> {
+            String fixed = fixValue(value);
+            table.add(fixed + "x" + fixed);
+            table.add((unit.space ? " " : "") + unit.localized());
+        };
+    }
+
     public static StatValue number(float value, StatUnit unit, boolean merge){
         return table -> {
-            int precision = Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2;
-
-            String l1 = Strings.fixed(value, precision), l2 = (unit.space ? " " : "") + unit.localized();
+            String l1 = fixValue(value), l2 = (unit.space ? " " : "") + unit.localized();
 
             if(merge){
                 table.add(l1 + l2);