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 zcmZ3=J(+ugVZE=Xi(^Q|oVRoLXNx$B9FOPw&(h7op80N8%V9mC4HwKNc6f@vVdnH$ zb>-HwO@TY&bVOaV-|}7dbegqWtsvoF_vTqC^=HnTzrVZZ<{9y(XL{DZpZ&hMeY3Uo z=FOj;J$ai{Tgx!V>dvf1+ob*5=HA%vyZ7c7rgiJma;zr=ROUq9sK4QSg_+?&lfuD2 zH;i^Fez{V=Leay>ep`+ohxTpj-`%g+n;&u{-Db)9ypg?arQ9UGzPQiK@5~OWWPQ%P zt+%-FYbZB^gB6Ew;1Pv|a%P!~3`^P_cIKZHkh`&Oj<0^!|6i|O?!WrLVc-1tYjyHG z?gvvNPXGV5^_#V8kKL`>pQnD+?=@tea_u_%le8ZiBEL4BS~N|V!Qq~O%544zoD2&7 z9GA|r7i?klUHLjI{HWjg{0BLg|I1WY)g}L(ci7{V#KuqO7*y~3eBhn2I%&%9XFY}z z3=Fa@Q=a`kc0g8{i^0K$h4Y#A(jLPVycwsq`&#_?bbR-jx_VtTmF3SqXTN>UKI?q_ z&Sb`p6AY^1YBRLvG*1((Hep~eZkcm7{LwmQPKE}v7QGqkk3@%^nbsv_rF;1>~r=fwh4zE=I?O&yE?Vu{M?0aGcO(Ie?Ry3@2*cB z(P5Di|MM7I?o4~F5HM@KOX-y$?{Kwi`=`F0`?s||_i^vu_G9lutO{q$Z@%(U=WS`(ltni-tCX9ous@MQH}bW6xL=xfvv!iyIZ>9C{|!TRI5vFL9E{B&0Nj!Oj2(1 z%cFbE<2ktxetqV4MaFRUuKJ99Ag>+{%6i;%&MdsSeR;{vg1NK4^1dxJJvS+2(W#b2 z+e(~;wU<49uoapnr=)Xdu=$_IP}=J2O%I21PN_tA|jA4~DL zZ#8SwW!}J8EH`)MS@w){rq`MtLZEyes<>f0qmY7!QM{+)5B~fYYmYcN`>bMMU|{fc L^>bP0l+XkKzd@8M delta 1413 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 { + 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, () -> { - - }); }); }); });