From d2728c2bf081c5fd3c2cf5ceb05d7d2cec4cc34a Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 30 Sep 2020 12:45:01 -0400 Subject: [PATCH] Fixed #2774 --- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/world/blocks/liquid/Conduit.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index fa7c993a69..f4dde82156 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1668,7 +1668,7 @@ public class Blocks implements ContentList{ foreshadow = new ItemTurret("foreshadow"){{ float brange = range = 500f; - requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 175, Items.thorium, 350)); + requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 200, Items.silicon, 600)); ammo( Items.surgealloy, new PointBulletType(){{ shootEffect = Fx.instShoot; diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 8824d44d34..964979c031 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -103,7 +103,10 @@ public class Conduit extends LiquidBlock implements Autotiler{ Draw.color(botColor); Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); - Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation); + Draw.color(liquids.current().color); + Draw.alpha(smoothLiquid); + Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); + Draw.color(); Draw.rect(sliced(topRegions[bits], slice), x, y, rotation); }