From e83cfe6cabf0198c562395ae846896d1a8d71d10 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 11 Jan 2021 20:30:58 +0100 Subject: [PATCH] Display unit cap modifier for core blocks (#4163) * Display unit cap modifier for core blocks * Move maxUnits stat from crafting to general * Omit string formatting --- core/src/mindustry/world/Block.java | 2 ++ core/src/mindustry/world/meta/Stat.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 76eec40dd1..c7e9d73b33 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -375,6 +375,8 @@ public class Block extends UnlockableContent{ if(hasItems && configurable){ bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity)); } + + if(flags.contains(BlockFlag.unitModifier)) stats.add(Stat.maxUnits, (unitCapModifier < 0 ? "-" : "+") + Math.abs(unitCapModifier)); } public boolean canReplace(Block other){ diff --git a/core/src/mindustry/world/meta/Stat.java b/core/src/mindustry/world/meta/Stat.java index 2f933bb46a..1f9d1d0022 100644 --- a/core/src/mindustry/world/meta/Stat.java +++ b/core/src/mindustry/world/meta/Stat.java @@ -30,6 +30,7 @@ public enum Stat{ lightningDamage, abilities, canBoost, + maxUnits, itemCapacity(StatCat.items), itemsMoved(StatCat.items), @@ -51,7 +52,6 @@ public enum Stat{ productionTime(StatCat.crafting), drillTier(StatCat.crafting), drillSpeed(StatCat.crafting), - maxUnits(StatCat.crafting), linkRange(StatCat.crafting), instructions(StatCat.crafting),