From 941d2d0f3926283ff7213055dbf2d2b306755807 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 1 May 2020 15:08:49 -0700 Subject: [PATCH] Support custom bottom color (#1960) Should work similarly to flameColor on the GenericSmelter. --- core/src/mindustry/world/blocks/liquid/Conduit.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index ce398d8239..a192b30491 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -16,7 +16,9 @@ import mindustry.world.blocks.*; public class Conduit extends LiquidBlock implements Autotiler{ public final int timerFlow = timers++; - + + public Color botColor = Color.valueOf("565656"); + public TextureRegion[] topRegions = new TextureRegion[7]; public TextureRegion[] botRegions = new TextureRegion[7]; @@ -47,7 +49,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ if(bits == null) return; - Draw.colorl(0.34f); + Draw.color(botColor); Draw.alpha(0.5f); Draw.rect(botRegions[bits[0]], req.drawx(), req.drawy(), botRegions[bits[0]].getWidth() * Draw.scl * req.animScale, botRegions[bits[0]].getHeight() * Draw.scl * req.animScale, @@ -91,7 +93,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ public void draw(){ int rotation = rotation() * 90; - Draw.colorl(0.34f); + Draw.color(botColor); Draw.rect(botRegions[blendbits], x, y, rotation); Draw.color(liquids.current().color);