From 6dcf889ffe615b8f53df7c433dbba20e5f3f298e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 17 Mar 2019 14:04:55 -0400 Subject: [PATCH] Map tweaks --- .../assets/maps/nuclearProductionComplex.mmap | Bin 11298 -> 14498 bytes .../world/blocks/power/ThermalGenerator.java | 2 +- .../world/blocks/production/Cultivator.java | 4 ++-- .../world/blocks/production/SolidPump.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index d6385bf8a6c0c3a2f9ecb3fa0f6a3aa77819c293..0fe201394994b767854c475d0bfcfbfc933493af 100644 GIT binary patch delta 14019 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 L{a=3P{JCENcMnRW delta 10794 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 XTkf6v?<{)Z new Bar(() -> - Core.bundle.format("blocks.efficiency", + Core.bundle.formatDouble("blocks.efficiency", ((((CultivatorEntity)entity).boost + 1f) * ((CultivatorEntity)entity).warmup)*100f,1), () -> Pal.ammo, () -> ((CultivatorEntity)entity).warmup)); @@ -61,7 +61,7 @@ public class Cultivator extends GenericCrafter{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - drawPlaceText(Core.bundle.format("blocks.efficiency", (1+sumAttribute(Attribute.spores, x, y))*100, 1), x, y, valid); + drawPlaceText(Core.bundle.formatDouble("blocks.efficiency", (1+sumAttribute(Attribute.spores, x, y))*100, 1), x, y, valid); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index f91501c1cf..6bdecaf130 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -42,7 +42,7 @@ public class SolidPump extends Pump{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ if(attribute != null){ - drawPlaceText(Core.bundle.format("blocks.efficiency", (sumAttribute(attribute, x, y) + 1f)*100, 1), x, y, valid); + drawPlaceText(Core.bundle.formatDouble("blocks.efficiency", (sumAttribute(attribute, x, y) + 1f)*100, 1), x, y, valid); } } @@ -50,7 +50,7 @@ public class SolidPump extends Pump{ public void setBars(){ super.setBars(); bars.add("efficiency", entity -> new Bar(() -> - Core.bundle.format("blocks.efficiency", + Core.bundle.formatDouble("blocks.efficiency", ((((SolidPumpEntity)entity).boost + 1f) * ((SolidPumpEntity)entity).warmup) * 100, 1), () -> Pal.ammo, () -> ((SolidPumpEntity)entity).warmup));