diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png index f964e3a070..4d6438c432 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png index 6b645244d7..46f5432483 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png index b10df885e9..40189f33c0 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png index e37f7a3533..bb72269c7c 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png index d133259b0f..f1c3d4fa22 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png index 68bf34a1f0..6e7321360b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png index ee1ac001e8..2abf35998c 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png index be533536a7..cb31db8fd3 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png differ diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index ce398d8239..f07c735b4b 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -1,6 +1,7 @@ package mindustry.world.blocks.liquid; import arc.*; +import arc.graphics.*; import arc.func.*; import arc.graphics.g2d.*; import arc.math.*; @@ -16,7 +17,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 +50,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 +94,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); diff --git a/servers.json b/servers.json index 18eff48b70..2d108bbab0 100644 --- a/servers.json +++ b/servers.json @@ -40,5 +40,8 @@ }, { "address": "aamindustry.play.ai" + }, + { + "address": "mindustry.kr" } ]