diff --git a/assets/sprites/blocks/liquids/liquid-gauge-pointer.png b/assets/sprites/blocks/liquids/liquid-gauge-pointer.png index b8df1cbf..8cfa110f 100644 Binary files a/assets/sprites/blocks/liquids/liquid-gauge-pointer.png and b/assets/sprites/blocks/liquids/liquid-gauge-pointer.png differ diff --git a/assets/sprites/blocks/liquids/liquid-gauge-tiles.png b/assets/sprites/blocks/liquids/liquid-gauge-tiles.png index 1b10b2d8..afcea6c3 100644 Binary files a/assets/sprites/blocks/liquids/liquid-gauge-tiles.png and b/assets/sprites/blocks/liquids/liquid-gauge-tiles.png differ diff --git a/assets/sprites/blocks/liquids/liquid-gauge.png b/assets/sprites/blocks/liquids/liquid-gauge.png index d50da916..42ab6a4d 100644 Binary files a/assets/sprites/blocks/liquids/liquid-gauge.png and b/assets/sprites/blocks/liquids/liquid-gauge.png differ diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java index 91944109..003f12dc 100644 --- a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java +++ b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java @@ -17,7 +17,6 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import mindustry.world.meta.*; import omaloon.content.*; import omaloon.utils.*; import omaloon.world.interfaces.*; @@ -121,7 +120,7 @@ public void load() { public void setStats() { super.setStats(); pressureConfig.addStats(stats); - stats.remove(Stat.liquidCapacity); + stats.remove(OlStats.fluidCapacity); stats.add(OlStats.pumpStrength, pumpStrength); stats.add(OlStats.pressureGradient, pressureDifference, OlStats.pressureUnit); } diff --git a/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java b/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java index bbea7edb..dffd66ae 100644 --- a/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java +++ b/src/omaloon/world/blocks/sandbox/PressureLiquidSource.java @@ -1,6 +1,7 @@ package omaloon.world.blocks.sandbox; import arc.*; +import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.style.*; @@ -16,6 +17,7 @@ import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.liquid.*; +import omaloon.ui.elements.*; import omaloon.world.interfaces.*; import omaloon.world.meta.*; import omaloon.world.modules.*; @@ -75,6 +77,15 @@ public void init() { public void setBars() { super.setBars(); pressureConfig.addBars(this); + addBar("pressure", entity -> { + HasPressure build = (HasPressure)entity; + + return new CenterBar( + () -> Core.bundle.get("bar.pressure") + (build.pressure().getPressure(build.pressure().getMain()) < 0 ? "-" : "+") + Strings.autoFixed(Math.abs(build.pressure().getPressure(build.pressure().getMain())), 2), + () -> Color.white, + () -> Mathf.map(build.pressure().getPressure(build.pressure().getMain()), pressureConfig.minPressure, pressureConfig.maxPressure, -1, 1) + ); + }); } public class PressureLiquidSourceBuild extends Building implements HasPressure {