diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-0.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-1.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-2.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-3.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom-4.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-bottom.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-bottom.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-top-0.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-0.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-top-1.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-1.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-top-2.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-2.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-top-3.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-3.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/conduit-top-4.png rename to core/assets-raw/sprites/blocks/liquid/conduits/conduit-top-4.png diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png rename to core/assets-raw/sprites/blocks/liquid/conduits/phase-conduit-end.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-cap.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-0.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-1.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-2.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-3.png diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png rename to core/assets-raw/sprites/blocks/liquid/conduits/plated-conduit-top-4.png diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-0.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-0.png diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-1.png diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-2.png diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-3.png diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png similarity index 100% rename from core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png rename to core/assets-raw/sprites/blocks/liquid/conduits/pulse-conduit-top-4.png diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png new file mode 100644 index 0000000000..c416e449d7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-cap.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png new file mode 100644 index 0000000000..a340e4c59a Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-0.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png new file mode 100644 index 0000000000..ebdfd62c44 Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png new file mode 100644 index 0000000000..bab3db3a41 Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png new file mode 100644 index 0000000000..539aa3f057 Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png new file mode 100644 index 0000000000..391ac88373 Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/conduits/reinforced-conduit-top-4.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 2f97c447d2..de58dcebb1 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -426,3 +426,4 @@ 63282=surge-conveyor|block-surge-conveyor-ui 63281=duct-unloader|block-duct-unloader-ui 63280=surge-router|block-surge-router-ui +63279=reinforced-conduit|block-reinforced-conduit-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index e81d33169c..3d666ae3d0 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 61e4b02533..8f7115b086 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -80,6 +80,8 @@ public class Blocks implements ContentList{ //liquid mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit, + reinforcedConduit, + //power combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, turbineCondenser, @@ -1426,6 +1428,16 @@ public class Blocks implements ContentList{ consumes.power(0.30f); }}; + reinforcedConduit = new ArmoredConduit("reinforced-conduit"){{ + requirements(Category.liquid, with(Items.beryllium, 2, Items.graphite, 1)); + botColor = Pal.darkestMetal; + leaks = true; + liquidCapacity = 20f; + liquidPressure = 1.1f; + health = 250; + }}; + + //endregion //region power diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index a1f8d946be..fc55c3510f 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -28,6 +28,7 @@ public class Pal{ darkMetal = Color.valueOf("6e7080"), darkerMetal = Color.valueOf("565666"), + darkestMetal = Color.valueOf("38393f"), missileYellow = Color.valueOf("ffd2ae"), missileYellowBack = Color.valueOf("e58956"), diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 8e6249e828..32d539f22c 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -98,7 +98,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ public class ConduitBuild extends LiquidBuild implements ChainedBuilding{ public float smoothLiquid; public int blendbits, xscl = 1, yscl = 1, blending; - public boolean capped; + public boolean capped, backCapped = false; @Override public void draw(){ @@ -122,6 +122,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ Draw.reset(); if(capped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg()); + if(backCapped && capRegion.found()) Draw.rect(capRegion, x, y, rotdeg() + 180); } protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){ @@ -143,8 +144,9 @@ public class Conduit extends LiquidBlock implements Autotiler{ yscl = bits[2]; blending = bits[4]; - Building next = front(); + Building next = front(), prev = back(); capped = next == null || next.team != team || !next.block.hasLiquids; + backCapped = blendbits == 0 && (prev == null || prev.team != team || !prev.block.hasLiquids); } @Override