From abf813cd25b0384ccda3f8b8cf07192ba2c803f6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 12 Feb 2022 10:47:18 -0500 Subject: [PATCH] Payload mass driver + More payload tech --- .../payload/payload-mass-driver-base.png | Bin 1445 -> 1427 bytes .../payload/payload-mass-driver-top.png | Bin 1745 -> 2280 bytes core/src/mindustry/content/Blocks.java | 9 +++-- .../src/mindustry/content/ErekirTechTree.java | 34 +++++++++++------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png index fb55b6eb6f398d11bda6ace15ef7dbd276f4a1a6..373f195e1ebae04cadcefebfefdaf01d84c47459 100644 GIT binary patch delta 1395 zcmV-(1&sQo3zG|wF@H@-L_t(|ob8>zYZO5g$6pTr1d9j_yC!g8{)@AkWPi-hH}BoN*~}M$<}N$?=KI;VvpYMp zv-0NT?P7g>0GvA9nxeKFPllb?zfHZ_^a8G~W^6l|Ms=^ zJ4K8>+I{)T`hUGK1C-X+2jph>C=~j#%A%GN06^XlB%2T52>>8Z2-3|5aI^tUsq1Q2 z#ZJ#};B3?X9D90xWBs1PNa`4|^3DJy-%Rign5$xx`{s->7ytkrgp}s{#=spT3IISn z1PSIVrHnDC4QR@@O*r`S$Ggmae=Q~?r{?o(?dJ!Y&wsgN0f@)|C08bxDx8Cs5qmTM z05gP~%~#^C0|@|tHiRyiuf$mwG5`Q~5Ml!6tgOViT8(h?=47Ms@WR!X{`=RD=%D8F zYw`w=!a$$6Lj9{{fX|(w?P=1-5AU7Z`-<|2TUJ>Z|84<<+?MMgP@1nqb<|QzS0>iK zmF=DVg@0}1jlGA)?^HT*n4g2x=_tm(mCJX>3*%on3IG6j{Q9T$`>yNr-V^KhF8@fc zf{Mab03=ockXQvkVnqRvG{7m9V!N!-0E+o{ih+OvP|R-&3n3UlG2bi<1nm>CYC*e? zw(t?%Lp32({nK^fv@$@_v)ZmnclM}d0LJ`g_kV1c9>nMr+f6>63~QNin*mfu{xTk9 zrxI1&s+rIOFq=OZj!;9py9fbOC!2o?LeFNt(tU@3HDAdFL3fXn~@ z*bUCjd;r56vrOWCy``^oMoTe2)IZ}JvwSvoiF>|R^@npmp$hS@XPR74Ekv66%T_D| z+sgxc0OlDUv+2dXH(v=0!S&`w)EqIJx_@ZC5>?%*!%}MFg3dNqgNLVd*>Ihj^$qQD zHO`V$qRND#wsb=iwPQo85JD$v-*>qtYBv>pBesk;isvfK*#mVaTp+ZCJ$0kIA_{~% z#k8AIeL)36{6$N4opD`L0gzY)Kw=dDiDjH0;G^+m2uH^!gyH0+et#`$X3=;uynkCm z#?+ddUboV`Bj$Q%Q0(Y7uD+^fTv-25bHsGr5geI7F|?3lc%rUMtbesOz^4#fUl1h( zO5>JQ7RJBUGFDBwmf+AS_H@KGs5bU=^z8YI;8*EKFJXdFOeRR1@1=Bfe8RGb1>0q4 zm#&Vgb)km9dLPgQ2)a5@LSVlU%YPYyEp{phQR@fz>hGtW)@Rb5tm%4o#}oTDzUwF0 z#GV1BE^A3$*)cK3W&$e!R|OAxyZ4;>16IS~S zkt@dP{zBRW@!ioJ>j`rzG!sMv$aOv85C~!cH1k=P9A z%6h`CmC3~d0O-zo!ZrwE0Qk(*36*Kv6eGY*5S$NWu)nTVQ1PSIVRUxpq0TLicGG9qS_z!RBt;9k@OsW6?002ovPDHLkV1mCv Blq&!L delta 1413 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 delta 1730 zcmV;z20i)c5z!5hBYyw^b5ch_0Itp)=>Px*i%CR5RCt{2ojq%uM-a#7u1V!0g+mIv zlN(`|3HU2W;NYlL5eUcvgHV;$r`DA$FgU8+${_*iD+H2KLd~hO3u6~9Ql-(Q(OmZS zc6VlWXJ4Mv{wuv4d%OSNzCXM3jP~{?v-R~g2x)g`dldXYmw!`lj^ECx&y268=Wuy> zm7Gx5qPU)o0RTD#T}iwe;}0Ezj-(!q&0ji%G{tx`w*Sx}#3|O3B>(^&f>bG9H~|23 z2wbIl-~|BCAyCpN`v?GFV{FJqen(^Yv%={QlqImr)rWk~n4Y^#&;4BqeCHt0lbr z{@eM_-+Xrm?%w|@_{BqS3DSz>Y6+nkB595Z!89Kgf`5RS5lm4>Z;szyGd~-p-JR_* z0I*EOsU}ssZJ7|Lva^iY*xZ`A%tyH(*foIxA-nlTUPuV`JU<2kr{b}@hl_*f!3>)a zd;?M-L&eND^5TWyTVzQfaJybn|IC5#?!&`i8V(4>%{TJ01c6%Nav(^?z2IJut%omO z2NVA3^?y{lcT~;%o4j0uQ3*NQ3)FN|I_VGr0PsWj<*$zbz}vvv+n>y!viT^4aFZvN zd=O%0e9==xvpYibP5JhYOgPjAAL@_ae~ZZ?Jo(`%>vJ)A0$A*hVyD|lbM%XY=QEf2 zC>w&SWl#louD1;!X;XVjj51>@{X>14*^HEpRbG7`q z6q6?#g67jd^^G!wki-15(-YR1wXwMsoZhBD(0=rqWv5ayr$#Z&x6{S^Fa13SgrmcW zx_@7}wu(o4`xEveORMJF(u8nyIAQOiN|Xb@y!LSln9F>W1_Yz~QHPLJIENORK4tFu z`dZL{RP#A$aPo+<_l`8AnV7fVb(w6hkZmJ0%r_O&5&~0DwU(d-Ks4z2_J|My^-MZe zk_97U5vBq`qoAbuDC&gW<>ghDnT9EiQ-6Rc4G782oNGP+U8{1N4?wpr$wE+LJ6(Ga z_KMn-EP1w+f{<$~#HAtt80HtN2qTt>RBZ^^3>bp>sG1O} zn9!2>DD8zGSH-_H$9{^EW;Gx*R}*iWI)KXR04l2%fEMozRLN6s0hLt?K$Eke8h>Bf zTR>%X0F~7NR90~SIUZ~)iTz|xQ&n0(3l}qN)i56*BLHd#u_XwU`P_>hG0NHkh5(_a z`2YpFpq3%jHXoqS7|XM;+a51;@*@(`ni_;b|JdC7@sjVF7} z98ENp>x>WrcAZ5981B);d0MfDbAMgZer{}!Gd6^wAI_bpXF~`z=~57UgFHfzc zxTdOcQCkuyBStCaqnf;^tr4mKr-ivzqPQB537=rAsZa$P!8+`Pkv0T-D}O|3hL-G~ z#uX)Uz@@JJxc;wsBH5J|Cr>4|PLcpnLHtbl3LG*bcf24fPaFuT5rVUYEc3~1`rHd~ zvE30DAeATI&BOTY@I88x08fl5Tx)e?x>RkS69%)j~nQeMq6efs+!^8E?iDQa@~ z`jD_C2!d~9ZwZw7rm*b3a{F3>TKIbE1r8ihu|->#Bx*c>;tL!?-G2@j!qCk}aUp~P zdy8IS!s+uV2&-Z~ih^+bUlyE zfZJ?7DiuOBfNuW(N;`oN1)!V1tXK$Q0Ns4QVjzeBbn|IRA+P~-^ZAlMU;*gn%f*H8 YAE4O { + node(reinforcedPayloadConveyor, Seq.with(new OnSector(four)), () -> { + //TODO should only be unlocked in unit sector + node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { - //TODO further limitations - node(payloadLoader, () -> { - node(payloadUnloader, () -> { - node(payloadPropulsionTower, () -> { + node(payloadMassDriver, () -> { + //TODO further limitations + node(payloadLoader, () -> { + node(payloadUnloader, () -> { + node(payloadPropulsionTower, () -> { + }); + }); + }); + + node(smallDeconstructor, () -> { + node(largeConstructor, () -> { + + }); + + node(deconstructor, () -> { + + }); }); }); }); - node(smallDeconstructor, () -> { - node(largeConstructor, () -> { + node(reinforcedPayloadRouter, () -> { - }); - - node(deconstructor, () -> { - - }); }); }); });