From bf56200c064b66da66985466215f600c09f99fd9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 4 Apr 2019 15:06:27 -0400 Subject: [PATCH] Power amount message for buffered blocks --- core/assets/bundles/bundle.properties | 1 + core/src/io/anuke/mindustry/world/Block.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 04410a9c4b..c4611ae599 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -378,6 +378,7 @@ blocks.ammo = Ammo bar.drillspeed = Drill Speed: {0}/s bar.efficiency = Efficiency: {0}% bar.powerbalance = Power: {0}/s +bar.poweramount = Power: {0} bar.poweroutput = Power Output: {0} bar.items = Items: {0} bar.liquid = Liquid diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index f3952c7e19..d1b01788c3 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -420,7 +420,7 @@ public class Block extends BlockStorage{ boolean buffered = consumes.getPower().isBuffered; float capacity = consumes.getPower().powerCapacity; - bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.powerbalance", Float.isNaN(entity.power.satisfaction * capacity) ? "" : (int)(entity.power.satisfaction * capacity)) : + bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.satisfaction * capacity) ? "" : (int)(entity.power.satisfaction * capacity)) : Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction)); }