diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png new file mode 100644 index 0000000000..5786487c0a Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-container-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-container-top.png new file mode 100644 index 0000000000..2c68c6dd5e Binary files /dev/null and b/core/assets-raw/sprites/blocks/liquid/liquid-container-top.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index ce48474def..d3a010f7be 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -403,3 +403,4 @@ 63306=neoplasm|liquid-neoplasm-ui 63305=dormant-cyst|item-dormant-cyst-ui 63304=scuttler|unit-scuttler-ui +63303=liquid-container|block-liquid-container-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index c789bd76ec..93c61db97d 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 c5e5fddbd9..be18532287 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -73,7 +73,7 @@ public class Blocks implements ContentList{ duct, ductRouter, ductBridge, //liquid - mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit, + mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit, //power combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, @@ -1269,8 +1269,14 @@ public class Blocks implements ContentList{ liquidCapacity = 20f; }}; + liquidContainer = new LiquidRouter("liquid-container"){{ + requirements(Category.liquid, with(Items.titanium, 15, Items.metaglass, 15)); + liquidCapacity = 600f; + size = 2; + }}; + liquidTank = new LiquidRouter("liquid-tank"){{ - requirements(Category.liquid, with(Items.titanium, 25, Items.metaglass, 25)); + requirements(Category.liquid, with(Items.titanium, 30, Items.metaglass, 30)); size = 3; liquidCapacity = 1500f; health = 500;