From 9e9cd213f371a0c3fb559dc70c4e474412acf78b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 19 Aug 2021 21:48:18 -0400
Subject: [PATCH] Liquid container

---
 .../blocks/liquid/liquid-container-bottom.png | Bin 0 -> 728 bytes
 .../blocks/liquid/liquid-container-top.png    | Bin 0 -> 298 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 2896 -> 2914 bytes
 core/src/mindustry/content/Blocks.java        |  10 ++++++++--
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/liquid/liquid-container-bottom.png
 create mode 100644 core/assets-raw/sprites/blocks/liquid/liquid-container-top.png

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 0000000000000000000000000000000000000000..5786487c0a86a9b4baba8d34b8cffb371aa74268
GIT binary patch
literal 728
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS$M=6kw0hE&XXd(+yF*-(J(
zfo*CLv)2O-O-rUl=NMP4JdwNOsFJdz<>ZfhY<FMURnRE1{`voi{ga;leY~r#u6FkA
z+oh?u<>trU{`99R@_WYw!GH1z`5ciC-!pt`njra)(V;uQj{ElMr|mfr^7;P*7&M(y
z8an<hWRN-3!65k8nX!sPnc3wFKWhWWod?wn7nC+Ih&o!mcoFOH>%0f+29^&@E{Yw?
z8qy~CG;pw#30|?Ykv`Dvkk>q|J&*B$;|sZ#6>f8dvlgZvwVR*M-#fb~V*V!`&IPQD
zwp_&zR~9pg-s8HURFFSGEV0qm^YC|pQ}_1@$TeJAqP;uqcvM2-tPcVU|ISg}vt+$E
zqu*6lzD2zE#oSmYwoU)?RpCHu*}*ttU50OLQ_8GtTTM=0nap$`_9-KSb$#};RM!r!
z^NIn{YSUCj7Hl_iZ-1|NK-Wl=!7ityqQl|pB&G&l3#*#kOI2zOEDY6i`<M#KMZPhm
zocUiS`+;deIit42HKrR(4lKM4zl>Vm9=vf-S-N4hdx_*M2H^xIp9W3?MzsSr9J0SO
zYF?ba@NoTM;R756Kh__))wp?^^Nz294}%%JUf0^o%kF#k`ooz^-1%%D{umf>G0Nqw
zFx=TJz`4MZ(@S83sne|$`<&~f7WW+zV|g=mOG|t0(tHPfcA3L}KU=gpob~qpachIA
zgRorPKYoWI$x8|a+M7ie=pDOr<?$<ZeP=<AJNI%JGs=~+US%FGXSCtCGVLa}z{UGQ
z^H?@0<uE4jo@a^>*u-e_(3K&o#fKrk!mxo&k-K5Fx{QOBM%ll-+b{mTwO7vJ$`IJb
zcHk8+>jQypEDK)ovMvzV#x&uIG}i^^8%z$t`5Fynto=7wRnA{fXkl~_o7XA8WU%Og
j4vYDL6Hdkgb&Lml@2;O6S-+Hlfq}u()z4*}Q$iB}j{`2T

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..2c68c6dd5e6926aefa237c193c71ae21f1df30b5
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&!0^P=
z#WAE}&f6Q_e9Z<tt{11jt3RJ87Fwg__2!1y_ny@)F@cwr7#YA|{Usam_j|t|Zd)7s
z?&tgGx;u31%4TfLT*RTr{om@(4GYhf3DyZY^Arw!k}TNK@PK0-<B~suc46GHJBv5^
zvoB-)&JgsD!<)&YQdx&v;c3qUJC^fj_}sh|8JE}y9%AyaRBB<H@JM+E-$Cp4o3mwm
zHlLZ#bX94G4V$)W!Ef0B)uzmbzl?j7B8>JkuW~K;$raM|z>Im7OT<5?Cnp!~yRPxw
t&0|w{z_0rYTv_<N^_8+&z>a2k;A-Z0aE5uX?mcCYfTydU%Q~loCIHJMafAQ>

literal 0
HcmV?d00001

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 c789bd76ecca9f59bd9da7ec1fc6390b4f0e9770..93c61db97df590c39bcdaf30c3ff8283b61e7bfc 100644
GIT binary patch
delta 34
pcmca0_DGD0Vev*L6HY;aoXo<~%oN?^{JfIH%)Hd1&8D2vOaR9I3mX6c

delta 16
XcmaDPc0r7ZVbMk=6VA;ZoKj2xFFyp6

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;