From a09bd09a0e26f2da284ae0ac6388f83a40b48f00 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 7 Dec 2018 12:11:58 -0500 Subject: [PATCH] Removed tank chaining --- .../mindustry/content/blocks/LiquidBlocks.java | 4 ++-- .../mindustry/graphics/OverlayRenderer.java | 2 +- .../world/blocks/distribution/LiquidTank.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 core/src/io/anuke/mindustry/world/blocks/distribution/LiquidTank.java diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java index 3ca87efef1..e4eb6ff040 100644 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java @@ -50,10 +50,10 @@ public class LiquidBlocks extends BlockList implements ContentList{ }}; liquidRouter = new LiquidRouter("liquid-router"){{ - liquidCapacity = 40f; + liquidCapacity = 20f; }}; - liquidtank = new LiquidRouter("liquid-tank"){{ + liquidtank = new LiquidTank("liquid-tank"){{ size = 3; liquidCapacity = 1500f; health = 500; diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index 43662203ea..3c070132fa 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -203,7 +203,7 @@ public class OverlayRenderer{ if(finion > 0.9f) finion = 1f; //fixes precision errors finion = Mathf.clamp(finion); - if(finion > 0) finion = Mathf.clamp(finion, 0.24f, 1f); + if(finion > 0.001f) finion = Mathf.clamp(finion, 0.24f, 1f); float len = 3; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidTank.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidTank.java new file mode 100644 index 0000000000..84ec99523e --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidTank.java @@ -0,0 +1,16 @@ +package io.anuke.mindustry.world.blocks.distribution; + +import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.world.Tile; + +public class LiquidTank extends LiquidRouter{ + + public LiquidTank(String name){ + super(name); + } + + @Override + public boolean canDumpLiquid(Tile tile, Tile to, Liquid liquid){ + return super.canDumpLiquid(tile, to, liquid) && !(to.block() instanceof LiquidTank); + } +}