From ce0e26f0081c64670274d0d0598ad97d4b830a3e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 8 Nov 2021 09:47:00 -0500 Subject: [PATCH] New liquid tanks/routers/contaienrs --- .../reinforced-liquid-container-bottom.png | Bin 0 -> 784 bytes .../reinforced-liquid-container-top.png | Bin 0 -> 233 bytes .../reinforced-liquid-router-bottom.png | Bin 0 -> 308 bytes .../reinforced-liquid-router-liquid.png | Bin 0 -> 111 bytes .../liquid/reinforced-liquid-router-top.png | Bin 0 -> 175 bytes .../liquid/reinforced-liquid-tank-bottom.png | Bin 0 -> 1302 bytes .../liquid/reinforced-liquid-tank-liquid.png | Bin 0 -> 376 bytes .../liquid/reinforced-liquid-tank-top.png | Bin 0 -> 377 bytes core/assets/icons/icons.properties | 4 ++++ core/assets/logicids.dat | Bin 3105 -> 3184 bytes core/src/mindustry/content/Blocks.java | 2 +- 11 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-top.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-liquid.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-top.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-liquid.png create mode 100644 core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-top.png diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9acbf0fbff1369a50eebacb64dd5d73d966bd7d1 GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEqhYxkGdjN4Ox+;!~WVH1_-UD)$fOkVPg7{jfPcOLC*keeUpQ&v-JFtfCV z#X{v@Mg4E#1{THW8hw_`w3m-o8w$8}es^++(~sT5aL|ak>S(lLMA6xqKVHw?9c;+k zWXj&dlHj=`-8)5ez2kySYo@f=%)GxzsiJoMs}@xTE~lNxEFY~)XTDGq{BLEt2ZL_Q zw^`2&n4Lm&58O>>6xn#^YoI{YQDx&+mJ9phqa8a$^q+Q#GH4x+QYbh-`DEw@jt?G3 zIT#%j3(mVTZg6mz<}J*?+oWPA#K6S3R(w}_!!(1v0uwgw5ja%TP|CJIV1i+lLJQM{ zq61HlhIUjcE@8S5)~NB(Rv?JcBUnGmhAGjUVbhUpfgpxIxt^UYTU#qQouu8@s;zu$ z!t)@<-!J9mUZ#xGnX8sFFh-cFb}Y^6XPEYzbJfN}Oc}G~r5cj197{D}(39h1xO&%W zO_wlxgVh5MhA11U2C2`xBww)v5eO!bT;z*PgdbR6eJ?$Y{kHG=+cU>vsP)UtTxQtcbLJ&@xqa4 z#fYQjj4xUny4)2qj2$jbFk%+q2xPb*Bf!NVxSmynG2w*PhL!|DeaWp0C!MjfV`|)$ zZ>MJNRKv#dZmN;&6d6rBuBK_h4;F8lH}jHq+~@UASya|1v@e~huq9?9r^8p@E&DY% zeic@#31qHa>sB^hrtOE)L2ZFA{Av;$9uA8cLpWB?kmUFguFUP++}V`y&Hd=!hK73c zBYT(@D@6S5SpP|%C2$XmqnDGUz@A5{91|+Iobq)aL<%mdopofpfD+S9E{CtLh2rZ2 n8zU54e!UUe&)RbF(SAnW3$n%0ovIZK3=9mOu6{1-oD!M<&eJ-L literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-top.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-container-top.png new file mode 100644 index 0000000000000000000000000000000000000000..8d427355285c55248aed2bae2c2e50fbb3d82ead GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z_8fU z#WAE}&f9Aj`I-!PSOe1j{EuI!uczqJ$rUSZ^IZ1Y-L1{3j0_A63=itJ1aiB&)cp3z z*4?{Lk@3%_pL*6UUl{sw_MPT=IPL2r&#b)oc4iif7RQ3Dhi`qtYxUlXc9$9dQI=?Y#k7iZ!LA1XGX>#1 i;{I1lL6$NwT>r@6sIQ~KV8HtiB;e`l=d#Wzp$Pzsb64U3 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4460a69c039d2cf23223ff3a93c68ccc7e56c242 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}zdcEGhxd0#Gzfmquc@oH>QL=XXKIb@S3OMUlhZm zQsxiyIrMe5GUWbYlxSf5q3>|Lb;awTJ71HR)arQ)#@J81I-$a3so|k36EZp`t+Uut z@oZjzlL>P{hgz^gsBf^B;-tHQz7={(H|48Zq6MGu-PDe8J~C6@R;Z)-_hD-z1_lNO MPgg&ebxsLQ0PfX(`2YX_ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-liquid.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-router-liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..00dfc92f8750e6843601cd270ba3fc5448ab0970 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}W}YsNAr-gYUOmXmpuoZ6 z_$yy3`a(w2gqdu4_2P^hH2J6Y+4r9CW@6zGP*_m!@Kdt3@c4lYZn=gtagtYTXEHD_ OFnGH9xvXV94}z zaSVxQeS7INSAzkM%SD$z|KsJ%xx{KzCVOd~yQ#i+i>a{SPwVtHh6hD6tE=Lx9=t2q zmVAx#WE*U$%~Oe=Yy==+BXRwpY3nF`+`qU daOP>Y?fFVv@xDs)7#J8BJYD@<);T3K0RWHGJZ1m@ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f8e8bcd3848be31c1dd4fe0648cbc745f73cc8b5 GIT binary patch literal 1302 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^SB?s~d7hE&XXd)K$`ih%&@ zgPj6NXJr_}I68$lxXocGY@QgQcrB)TGf&nMkBP_2{_Y76eb+NF%XDtZ&)U0%kMb_@ z^Pj5UU-!SVZ`J(z{i|1H)z7>1EK2TQC}Rf4Mc+6{2DcL#A6_x!wXAuj)0pX${BAYR z!`Iv8SDxM26m41~eCRj-{CW9LU3cV`hln^``6ifbq$u;STJT)2o03b8w56J;lk`5( zh1XYHDR{rJ-#`9{lx=@`^s^Z;9E(3}<=E`z&b!&!WqWGR$yS9{eZ>r^TsSH2G> z3v1^*PwFaUd?w4@l`xNag8Fs4b3z)QUtPE2V{3Y;qmiX_$|2$V@l(#M3bv6f48n?w z%*C2sDdmK{xD{yP6!Jr-MYF-|PpIIc!|4h>*Bf*mZWgHeUGwM9#n8RAYug?$ZHP16 z?i+O|o%xKwg`YaC2a2wlWcx|iu{iKImIgU8ODJYAp5q7#zEr2gaE{}QvGpyP11=7H z=@S`d{Zl#|&ZxlA^In}Y;+x)<@4A8Ei+~HmOCKi23ubd=>r@W$EZClOo7FCj!U{$aM@ z63?wH4|+aCF}O8OW0c`o&zK;Vp?P5Kl6>_L_8i6wefgCQ#!jUNq8MKPxWn)^T8Ha_ z!wS9#<_EI#*%sKUlwWUJ#E=&%yCLMok2Hq8mKV25Y-c?7{==557kDq&Z&{+}p5HLN zeH!nFD28u}D?SKpQGfWrvtoXm*u1uV6_;ui-I!k}zFFGA=kO}Xh3!CGk2lke(-(g; z&lG8RYB%AfX+>#+;Gus3b_Rd${qSNm;l0P*r1t0Hk3$Sgwkmi})>c+{xZU-4(zGZK-|A zZ)F$co(k6A$8l|CNAAQdV^8J{N*UW$vN#-j;%e}Bo=Ve#yUVy54Ar!oUW$hbvYa*( zWjJG)Dd@9bvqvG~`$St#_x_db3BN*fmpttF5Xc~MaCWCwjabui3Gv`FtCPy^3WPii zS1@Rf7Ck6ZXU1f`;VMJS!*rz>Nd_)^?uV-wrhG6KSjVy8>{s~%7hb$($vAAxz`(%Z M>FVdQ&MBb@0D2oR-2eap literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-liquid.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..961a9f82c7af5fb0c1549d6663e187163126aa1c GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z-Z*@ z;uumf=k0CByk-Xh*Msx!{69C>_l8TCLg&o;MxoiKdH!zTy|e>lAOjdQly5AP->_SM z|Cgif`%2bjzm+|C{MzE!@2?)-|2pr#nbv{pSIeI-sQNBim*&&3HSDYYzWM)F?RIyS z5KOrKfq$~n5#~2?{}R1gG8(RY;1^ap!nCBl-oxF)j{Qjc|Ff&A&J`cn@-V#h+7u3h z!XNE#v%BxJ+RkN2WNP6QP;;0;fT7Ctq}=&$&hJ}6^BXz^m9o9^&PWL>?wl6U@J>!J zaqZSg(q9(YA9~60@?kjd4sI{k83un=F*2_D=03yd&niX6Ro`4^nEY9_^Z%qh*-p!! r|DJO9V*0xoPJjBi!9E8O4d1_UdMidnRh{|R3gUaZ`njxgN@xNAEv=mB literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-top.png b/core/assets-raw/sprites/blocks/liquid/reinforced-liquid-tank-top.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7e8849ef20ba5f55f42dd3558fe18b8fc7209f GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z-a90 z;uumf=k3jldCdj_EC&|9`v2dkcIDD7T~0k4cNC}H>+Oq8UL?TCfB*+3ynV;m_vZJ$ z{x$cv>3+3cCYNXON3EDMlYO_=AGK^w&GubZf7FsWU$V^-t(&~ICFJlPuKnse77H0q zosc$R^`ZLbRq5+34`08_EMqBs<>IcJ?ss=z68WIB;bQEp)am;tB!Qajtl!%yr_==8~UGM(y%}AI|TP3$K4N zQ}L*PaR`Tf(nY3KE%F~3-#575Jk%fYg|p+u|Eyyyzt``6j_^7ILqq9b26oXLH^a-h PYeC|ku6{1-oD!M<<>8xz literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index de58dcebb1..94e3ce0d3f 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -427,3 +427,7 @@ 63281=duct-unloader|block-duct-unloader-ui 63280=surge-router|block-surge-router-ui 63279=reinforced-conduit|block-reinforced-conduit-ui +63278=reinforced-liquid-router|block-reinforced-liquid-router-ui +63277=reinforced-liquid-container|block-reinforced-liquid-container-ui +63276=einforced-liquid-tank|block-einforced-liquid-tank-ui +63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 3d666ae3d03be55744aaa0805912fac99f9afdf4..374d1bdd2c0027825e4e68f673d3c191c03e4c2d 100644 GIT binary patch delta 95 zcmZ1|@j-%#VbeyY*PMP5MX8y2Y57ITsVTZSnT4g9DY`}Zr6s9F4APh~$@zIDiJ5t+ TMGRt?k|l|G*_+>Rnlb?ZtVbiR delta 16 Xcmew$u~34EVf{v?*PNSexJ;M;GfxFc diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b9b82dcb76..05b5948c64 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1448,7 +1448,7 @@ public class Blocks implements ContentList{ size = 2; }}; - reinforcedLiquidTank = new LiquidRouter("einforced-liquid-tank"){{ + reinforcedLiquidTank = new LiquidRouter("reinforced-liquid-tank"){{ requirements(Category.liquid, with(Items.tungsten, 30, Items.beryllium, 40)); size = 3; liquidCapacity = 2700f;