diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 9e3c6209..51026329 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -61,13 +61,7 @@ omaloon.update.dialog.fullclean.confirm = Are you sure you want to reset your cu requirement.omaloon-at-wave = Reach Wave {0} in {1} ## Hints -hint.omaloon-pump_positive = To create higher pressure, place \uC353[accent] mechanical pumps[] in series, adding liquid pipes between them.\nTo increase pressure faster, place \uC353[accent] mechanical pumps[] in parallel. -hint.omaloon-pump_negative = To decrease pressure faster, add more \uC353[accent]mechanical pumps[]. -hint.omaloon-drill_positive_pressure = \uC351 [accent]Hammer drills[] require negative pressure to operate. Rotate the \uC353[accent] mechanical pumps[] away from the drills to create negative pressure. -hint.omaloon-press_or_shelter_negative_pressure = Some buildings require positive pressure. Rotate the \uC353[accent] mechanical pumps[] to these blocks to create positive pressure. -hint.omaloon-pump = The pumps only stop when there is a block in front of it or the front block has enough pressure. -hint.omaloon-low_pressure = Buildings will implode when it reaches -50 pressure units. To avoid this, use \uC354 [accent]Liquid Valve[], which will reduce the pressure, preventing it from reaching dangerous levels. -hint.omaloon-valve = One valve can handle up to three pumps. If you have more pumps, place more valves to avoid jamming. +hint.omaloon-pump_chaining = Pumps chained in series can reach a higher pressure gradient between the ends. If they're chained in parallel, they work faster. ## planets planet.omaloon-omaloon.name = Omaloon diff --git a/assets/sprites/blocks/liquids/liquid-gauge-tiles.png b/assets/sprites/blocks/liquids/liquid-gauge-tiles.png index 6f9ad340..1b10b2d8 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 79359a54..d50da916 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/ui/dialogs/EventHints.java b/src/omaloon/ui/dialogs/EventHints.java index b560ed27..a475501c 100644 --- a/src/omaloon/ui/dialogs/EventHints.java +++ b/src/omaloon/ui/dialogs/EventHints.java @@ -6,26 +6,12 @@ import arc.util.*; import mindustry.*; import mindustry.ui.fragments.HintsFragment.*; -import omaloon.content.blocks.*; +import omaloon.world.blocks.liquid.*; public enum EventHints implements Hint { -// drill_positive_pressure( -// () -> false, -// () -> Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlProductionBlocks.hammerDrill).find(b -> ((HasPressure) b).getPressure() > 0f) != null -// ), -// press_or_shelter_negative_pressure( -// () -> false, -// () -> Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlCraftingBlocks.carborundumPress).find(b -> ((HasPressure) b).getPressure() < 0f) != null -// || Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDefenceBlocks.smallShelter).find(b -> ((HasPressure) b).getPressure() < 0f) != null -// ), - pump( + pump_chaining( () -> false, - () -> !Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDistributionBlocks.liquidPump).isEmpty() - ), - valve( - () -> false, - () -> !Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDistributionBlocks.liquidValve).isEmpty(), - pump + () -> Vars.control.input.block instanceof PressureLiquidPump ); final Boolp complete; diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java index 02f803c5..9bbae047 100644 --- a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java +++ b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java @@ -50,9 +50,7 @@ public PressureLiquidPump(String name) { destructible = true; update = true; saveConfig = copyConfig = true; - config(Liquid.class, (PressureLiquidPumpBuild build, Liquid liquid) -> { - build.filter = liquid.id; - }); + config(Liquid.class, (PressureLiquidPumpBuild build, Liquid liquid) -> build.filter = liquid.id); } @Override @@ -153,7 +151,7 @@ public int chainSize() { } @Override public boolean connects(HasPressure to) { - return HasPressure.super.connects(to) && (front() == to || back() == to); + return HasPressure.super.connects(to) && (front() == to || back() == to) && (!(to instanceof PressureLiquidPumpBuild) || to.rotation() == rotation); } @Override