From 36513d6ed6fc6c6500b1eb9768585d952f617401 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 May 2022 16:01:49 -0400 Subject: [PATCH] Tech tree restructuring --- .../blocks/units/mech-refabricator-top.png | Bin 0 -> 1684 bytes .../blocks/units/mech-refabricator.png | Bin 0 -> 1423 bytes .../sprites/blocks/units/refabricator-top.png | Bin 1691 -> 0 bytes .../sprites/blocks/units/refabricator.png | Bin 1433 -> 0 bytes .../blocks/units/ship-refabricator-top.png | Bin 0 -> 1694 bytes .../blocks/units/ship-refabricator.png | Bin 0 -> 1382 bytes .../blocks/units/tank-fabricator-top.png | Bin 1533 -> 1515 bytes .../sprites/blocks/units/tank-fabricator.png | Bin 1592 -> 1571 bytes .../blocks/units/tank-refabricator-top.png | Bin 0 -> 1681 bytes .../blocks/units/tank-refabricator.png | Bin 0 -> 1427 bytes core/assets/icons/icons.properties | 5 + core/assets/logicids.dat | Bin 4408 -> 4496 bytes core/src/mindustry/content/Blocks.java | 142 +++++++++--------- .../src/mindustry/content/ErekirTechTree.java | 86 ++++++----- core/src/mindustry/content/UnitTypes.java | 8 +- gradle.properties | 2 +- 16 files changed, 126 insertions(+), 117 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/units/mech-refabricator-top.png create mode 100644 core/assets-raw/sprites/blocks/units/mech-refabricator.png delete mode 100644 core/assets-raw/sprites/blocks/units/refabricator-top.png delete mode 100644 core/assets-raw/sprites/blocks/units/refabricator.png create mode 100644 core/assets-raw/sprites/blocks/units/ship-refabricator-top.png create mode 100644 core/assets-raw/sprites/blocks/units/ship-refabricator.png create mode 100644 core/assets-raw/sprites/blocks/units/tank-refabricator-top.png create mode 100644 core/assets-raw/sprites/blocks/units/tank-refabricator.png diff --git a/core/assets-raw/sprites/blocks/units/mech-refabricator-top.png b/core/assets-raw/sprites/blocks/units/mech-refabricator-top.png new file mode 100644 index 0000000000000000000000000000000000000000..28e1927ffaf9d3b94aea6bf79ab330ff896291dd GIT binary patch literal 1684 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z~<-a z;uumf=j~kE{8(3kw&(ZQ0)vzTW6h`Ooa&hG5abrJ#MxzGXVArCc`Fy0IJ&&_5DjFq zS6tMivvi}j%Bv|IuYzV6PX1bV=FGV>?{-?|KfUq%-SOXd{?6Nc)260mm%ZJ+#;tO9 z_HQ@zFIiCc=jHRg?z?WE?k=wQ{q2%X;(Dh33F)!h7#Or$Htl)6;i!BVhq-9rH{HL- zxgOTLPOY5%FR4`^`kFKYgIx~C#ndxQ3_lDMdo*r8`!;v?RiAQq^?+#g3qSWQVcNV_ zcuVU0*03DL6;a+EzEfsc1$)2v`RGgC#90gsp9H)l^?93ISHEpMz{K#ut|hF^yD{Nr zYL?;#Mur&22WckOEd3w7m>pRjY>%%OOf}GEIe)V0OQjjZ%AYH4D!81vqB1|3@xrYB zNg^*EE)L%2n1Ao>_xyWrZ=UzQ^lt9m0{iC4cQj{;-g&{*pVb9YtQW>>*Y!Mmn`oDQApaff!ZpX3v`#MgarW`?MO)(M%-uM@_Sch=j-L!o zdM6gE7HI34#($bQ@fkBi4nxW_x9u#wKSQ=oGr0AK{rmgeb=(HZEpeX%Ejf&5@PCNs zb~wv&@KlXRt3mfq22O?sONEHp{Z)l!W>bGM%yf)MT6O$DP0gO>>+9p9)VbHk?_D$R zP3G0z+e1vMUA#TCKOYT`k5;K>UU7BK{iNjeQ4>5kmY%wzQ1kEPRh32C9JIGCi{l8} zz3Qx!i$g}J8av}z_ooV5b{XlioYu_^W3*8$&~{c_@@%mN%R39D)`Z%533YM`H{&MQ zbhk}Av%G#X&m$pc+jGJ`{zuB()fo+bIeav->Z-v96q}zT?gF;$MG6oTmKLID2mO@ye#krThQBg;|g)`ixM&Ia

covFof0`4|r+u_s=cq^MIT)fJ`G(j3{b@Y-6AnP<`+ zPy*|Duuo=)qjRjL;x)ZTeZ1tw|+v!*@0!o5(Pr|8xJo&F0)W^EDB zIi#?h+xH8{xu+gn2aR}&W<7}UTN<#o?xHZ0d9J5~N^64T$=s??M!qd`96c|uE!bwM z60JDNz+;VYx`23m=!HqowY~0avH$z#_v`uI(iK-~)|<9})%H5et`v7E`>Equ_oV_w z_iNUNmf!HMnz(-Dv`?pI_B(NG%{!ib|KwlOtAhGj%PX&)nSMf>=h9o(w-dj+Cfo~q zws_AuxhlmwGgy1~tw}B~Ny@W3AR2IPRqU#J)qz)6hrEBCrILTOz=gjnZI|KGU+pu` zxJNpkn0x6glj9ywvD(x~{gzvTFL?xRY*%CI*=-rf-B@gAE7kP->0Q&p^TIpW|IRue zA+u`9taqQ@&H1p7qi>#_2HQ#*7(~5d1#*(GN&Q!aM zweguPms3Sa$+|_V9G1-40!8)Ojwha4D%oj@IIL}2skk*i|J)0y876C^R(H1vlvQs3 zTFGQO=dx+ytT~0pSDm{YbI-PFmGvSW5M%PsOEz0d%OcqsPH>yd{yA&UlG15$y~=Ve zJ6UI4t?`{V$;$gbbI4Vl6`>1mp1uC$?Apy=l$^erYzbMgbjEs3=I!T%IAUKnm^@xO zv;S3Nz$#<$rVR5dUdA*1pFVWe7Bj8UP73?XSaa%H7Ux2SG&6ZoUPYb*LTB7voj4db zsC*6#6u85vbFn6bg(aN9+f4o`??K)JiZl8@wS3T@|JOA6w4K{L1_lNOPgg&ebxsLQ E00?v$>;M1& literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/mech-refabricator.png b/core/assets-raw/sprites/blocks/units/mech-refabricator.png new file mode 100644 index 0000000000000000000000000000000000000000..63f3cb6fa90fd6a4163ad92696d7b056008f2a35 GIT binary patch literal 1423 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0PGg z;uumf=j~iu9}!29%YVLDv3qm<&6isg z({VLAn_3ygy`s>oqftss+ZcGeb$;mK5n}v_Lxc!2Od{Og(%$Rcm z%evx!xyLdvcwAKfk)W^c=f6rmXIi~Sps>@U|0M+nrp0;01Z}NnVQ|rRAivUaJun51V43dAU1Ra}PsKXTTZ#W1+`4PI`INVa6xXdEm$S^JFGnUfji`xPp^u$IBe6xn?_! zdjoFla7VgV#r*8v$Mg5cLt9OmcUUOde6kCR&8NDP%!V5dhyNun=Z`V@MOyQ37caUsYxWd7cdK~ zZ&Fc6=$YE!U?{Kf$jC&MrE8(4V!&B;iRRx863VKx7YC&BHXJ^1M=^yrL1+m>%Tk7x zsiqBAgiTbYm@+hc37!(v&7<(NDre>MX^Eo7#*dVlcLveoy>KabM{5dS@sS3 zGO1CM7P8Lv@m&%1LSy?Z1I`N8`YX`kVLJ@04jWB%+~6 z@%QT{-D8gFv@*N$EdJ@EyNZpyYA0)yby~Fk&*?7z&BW}p?5Ep8ftY`mzZ?DqhM)a@ zf?cuds!QlzKm>6cSGqie6G0U*|5dBxXCE z_&8_l>b@`YZ0kMGo||yvSHlIS1g=wz3;Vuo+g5(VY~u%}13AYZYBLc~Q zekTrv_ilM=i(<@bzxnb_k+90VeNFp{@g=*YAg-A+H4R(0#RwayznOc~eeT~0%;(S5 z9sYULWJ{Fs5}#vS$!`uH_fNR6y8ia6MNw-dE%wi7oB5kRU@hw_qbbGv6VLqHH)V5G zWo_~bOR3p^TWTL=^f?_WHmlUUWc=4b_jkusQD#QrK4zz`FQ?`j9FzZ4%fQOCw82my zXi50ijhQR#9j7mh+12}-^Y@e8N?yNArUV(R`gvu;o!NE2vYb90zc_>G*bM*9#p`6l zV+CC9vA2j!Ib7otQ<`5M&8m3&Z%g{~pA0QaraNu>y&~s+M`51#?89Q)-JZ^xpv%A@ t_qfRD{t6DoYzBrxwr3gpCN_THU&-^H=W$WTRR#tI22WQ%mvv4FO#rApmBs)7 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/refabricator-top.png b/core/assets-raw/sprites/blocks/units/refabricator-top.png deleted file mode 100644 index f092d8f80e8230f6e9a8774b5b8c126a0797d36b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1691 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z!vK1 z;uumf=k476c_M}a$I{>PYD}nT*sZ3dE3}?LRaZ91!HG%hR?9T52@@DP`=$xSF?N0v z@cqQ#A!2hV@IXuFV|(LoXKqx#32#j~FIT@mx;pp#td|!jPriHbpwyPH4_>@m5|`n= zxAJ>pdf>ZPZ%VlD@1MU?JV&&EKXO|tE5il{kJGz&wf`hG7DUQzT>rvejN|_k(a&0c zjxrrIzvj)r@Gqa^o}n8f!=L#ARY%P3?y6Ofepyw_v9pq?_TF@pge{d$xo_59m{iW7 zRj%Hm=H(;%(l6uZqb+q4yBHWA2?U9r=WRL`dz-0|mEnO>OHgZZcQi5?!}G!K?=#G-)77eXPh!kE6YVX>Xp!n#yRWS z;(}kD%D5}`teEZ3qbLEdY@G#@c)Il8pWMgZfB*C0+OLn6bpK>%(mV0U?}1rN*1jjk zwrANHW-z2YtGdr=`YibAyOw*;>@9X#&t*4IY6<%sXvm>Fga5;KK8Icw$I~?;tp;5` z85kKF3>7kF_gDR?lR8z?a6&=H@M=rh!aRYX-jj|q_~!dE{N#*!m6z4JVC$+VoU zf59&0ZTDoD81yehZ-4)0$;o)j&#Kp39yx5d!PLrm=jhK-MJ%TY2%rR+h1v z$D*avgCDCjU%L5nTB&U7h2%pmlX`r0PfPnoPrB39zwS@U^iJl@&-g-pBjbK^YW1GE z%X#I`^7#4*;SEqHt>#`t$HD}$g zuCb1Mt3G4R^WtBB1e&J*Trq2Ec=unHuX_~UHT?c_Z0qOwd(X1(urMf|zE{_*D@6L= z+ndgXE!X?wchB}$J*n$@Ri|9#^d+r~zGsW8oB}jc&OKXP<(Q$DAb-aFYr};v4{MF& zpYk5GwXVA8sv9eC@y#xUD|QYu-YWFWGH$tP-?r!(M`FHOk_IPB4F9W*B8(sMZ9OJ6 zF3+@UI2e3kcYJu{^@~R>x@9g;dXXe!-s}458gKaNB9n`2rZ1k(JJU)xdXiveo~Kzq zer2(0DIZfI-e@|))k2)358ELrHDZ{f_#?0`v zlBwbHC=RL235S=eMX5Y5QfXZ5-pI@kRU0Kn1+`DS2)ry}h z1f1T?&NqEsR_%HIv+324Si{eO9E#W9My$1-xqsQM$F6TToSXAgC~~Reti3Dle%`~e zCi-;El&klgwOhRX9ryCTj>zY`dY1hM^AzLk>8rlRTzM6_>T99tr0rQ2i=2wpQ!I-I$>&HqVoN1ujE{2;b~KMzuu#` zL-yX&X?zonYV(; zS>{7s&(rKyu{y0f8^f{aYJhHUirv&!@ue{#-*qstOlrNF1DgRnpXchwl1B0il KpUXO@geCw6BMg)P diff --git a/core/assets-raw/sprites/blocks/units/refabricator.png b/core/assets-raw/sprites/blocks/units/refabricator.png deleted file mode 100644 index 101119dbf4694c39709f593e63b3fa5f39bf8fea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1433 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 M)78&qol`;+0O?o-Q~&?~ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/ship-refabricator.png b/core/assets-raw/sprites/blocks/units/ship-refabricator.png new file mode 100644 index 0000000000000000000000000000000000000000..bc9ddfe97fb29fde155b871c58c6896d22107ed6 GIT binary patch literal 1382 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z^dTs z;uumf=k476+0ljq$Iq)dUvqGGRQoqXnT=+C5&JEnigV7RnMq@u8#xp}T|(7*28(q%U5ECd341rGc_mu4ch$@;R4 zDeu%@>$a>oE6C-rdHH(Dre#0ww zc+MZSyIZp%MR9kBdTGtg=?ml6*>Aq&DYZs4f8&nS@5X+SrVZKuii7kbCaRq{GMzDC z8WIWu~76EyWPt1mP5hDX9!oLQNYk z37eRNm@+hc3ZCNC&AZ@9RnF4q(*5&i zO@)G6o1S7Y;)(#`2k!` z-&S=l%S#1&5Kc~IO_&_!ks18%#p^dyi}m%6ule05V)L@PNAHm*Ppx=n(+X3@&$TCS zU3J|PzW(Rtq?*pJj5nA9xU?7-c2|f`Pu}ROGl@atcHt7P1BNE-PU0W`{9mq+z@Tbg zR4jRQ)63$lq6Nn;oV>6tF5-N|?~Y7PW8>gtuH4OP0e%sm?2@8P85#t&AT`gbH54uc`mX%v}AhDC$A&Le;w3+cbHCPZk*)DD%#FbZWH?kGZOzT;`pRA^skQX^j`;;%E43Fb@^`jmeLU;DulC-T>8sR4>ScU2 z6Z(G6vDtO2(3H*b>30SnN7XaSpIrS~wmny1)m{IJ4a&Pud3OG7*?9cHch0N-l+(kRR)GnJZmo2sIx!R&#HWH#5q@{gMop8!PC{xWt~$( F696Y(ghK!T literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/units/tank-fabricator-top.png b/core/assets-raw/sprites/blocks/units/tank-fabricator-top.png index 7b0d16be3cba6a75c1553705b29b1af251c388c4..4e5ee09f664321fe27e83d5532701bb17e8603bd 100644 GIT binary patch delta 1484 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 Um!6McU|?YIboFyt=akR{0F4pO&Hw-a diff --git a/core/assets-raw/sprites/blocks/units/tank-fabricator.png b/core/assets-raw/sprites/blocks/units/tank-fabricator.png index 7997bb60f3230f9891e32eba97923cccda25d807..c056220c41301ffb98f1c57d0604a528ab36c91e 100644 GIT binary patch delta 1540 zcmdnNvzTXsVf|fC7srr_IdA7$XURAUv}LoaTQwy*p41S0!MDx%_RRMS9GH|#nC2%G zCb3s@CO^Eh?{Je)Zj!(Y4(U^Yx^HjRg@lG*{nGP|xpB*_nd|=jfBA0aygD7b`!$tz z_U|2MpS~Xbsr~U-stle}Sw!Za%G$0`*IsO=ImJX{W83r9nxU@DNu3cL z^2<_NQ_lnmZwkF&F!9EFRSU_9bM8;Nn#Z{P$g340vC9>vGH42Yj6S?eWdiSkW6%EV zQ8%4dEFizpq%q~dhNb#54b(phY72L#)q;@8-=E$LzB;`5TAs^~jJ1+kD<467W z83lb$KW%ySLqw{u&{xCsR3P)AY5!vv=BM!fwKHt^<+JU~)+V7??2Ckj{ZMC|9aQFxpKiIF~7m3Mknb0{#sFXk;98rGUp4Q zSKs-P!}kTlEg|`fB4<`*T`^d=S}^`lQRS}xn)M46WuD5+nGxjSn^5k0rEC6gYqws` zkdHeJmrj^*z{nx^&!y*zLc%JKij%w!nl|P%wEnpApZSB&3c>lp!CZZuD$F`ZpV#y& zt!evl=l#(IvnH4%Y>hsUwY@-a{^!4Q4$OMwyRds*R5?yCGg8a(~`J&T8f@N2iNLp61&dmc-@zg5k}&n!E>cdsnVK z(xO&!?JA!s^Ss!bYmaQHdzI_%st{IgYPv-z_*%oiH%_@asanp-`;Khv>s%Cnso_KG z?x~!*dmJ}+b*_pps&n8uwL*XOcjmPYl`|f{SbmQ!qBkRhv3pPb#N%y67b;4YFA;n+ zcb-^Ux#Kid#j?EjU$z+R<=x6*Q||Zvi-|!!--R;_Ph;-Ay!z;q!m^2i=PdVJUVZQ= zL&Gi}&%UpI{#~;f87>Q4`fYaWDuZ6|Dz7Cbxd*%-WE?ml!z(d!8Se)vX)CpLY!SSM zIjXjtd2BwO9{$3!DpXh2_SI{K#y(@K@ZU1y(2+iYVCFr`rF;{!E(;hl?_rPFYO$cZ z>7?{VG4_beCFvK}E{tP}+W&stL8bhQfr1R}`QL(-m3AyvIJA0&=;o{>uc=(C>TbIJ z_F^x-I7eW4Yp74i-%X(csT(=9#DpJZfx|_3y~=Teg;Qs^2yeBl@acGbsou-ycjv7z zwFSUcY+bk+xInNk)_G#>`bGRZnLv*YlLW zo2?cdoVGXOXo%8Qow`qEU%ow&%=4eO+Dv=H41sWKvn$1ucFwUIvx{>vP=xrSk9&ED3p z!TjOZ%~xFxUh8wUC(yZu;po$>H7?l`&GYTM`hE4nn`L}Y6qnXI-#e1zk#lg_qe-dJ z&+2Ct-nts--69^5_41#h>fcHFPX$leMNV&3z4iQv!TO!DOEqqFeivNKVqugTe~DWM4f1P9?A delta 1562 zcmZ3?vx8@XVf`mh7srr_IdA9g&60K$IDXt+PO+7l$vjB;@wEhxiCa89Cfc+dY+G=u zG%Gw)=tFSJj4z()0k0RhW$`rq(4CVt^=qbmT3Y(EZ|8nB9=!CjEd6=??&|H^H}C$Q z`R!+-m29)ga&_-7`Rnu49{o&Saqw8$);+C9lT>GA@Ul)mH#~l|48~ohc4oP+Z%K+UIQX}Si2aP5u6ca(m4jD5i7`A1E#DY%FsqVV|NpziM!VQ5F+ZLZWm+vU53%_7P4pr!ojqkrsvOM6wt7*r2s~v`^!RWK7x~X(-tCqNcr#%~7G zpZlz;cKTV1qZuUuC3QTUyH_YZv3k0Iq3(SB3`yyoO()fi8$LN*J5yD=y|nPjyGb?w zTiYzR%~E)iJH0=M z$(mF$OV9S4Z@az|bHMb^vXl5OXGy8LWO&ujIiF}^b>q*|2?a80yj{MAJCr80D|yYG z|4U|(3(K0%E6t8R=x`8nxb$=9`&tX7f;s*hHQ7R0wlGMYJ1)n*pfli6O_#5shSCC- z3ng|>%O#F`S^Kt+*?*>t0@ z1$yz1GH$ngj1OV>-@1Dmhv^>2%bPe~@6V`l;5f5Je{KDD=B*8tGZz2w-@|`l*2Ms3 zsZ{6lyh{~6zUVu7__&q5=9PC%CfQCJxv&2$3E0bf)xc)zveG)C753~NVhod~mDVkt zVbkF$(lV*7v`%#f2SY%Z!nvK-eij-EGc1tr+p@3MOtisk{wyKAQ0@;RH#jdCS~FTL z%VJ#ftgWnbB|}tjJx}(@{^pqswM9#oa)j=gG{tYRzwh*24A&aPYB}C~2oybFb!7$r zLf_mgEF0z}gg$Q3jSE8`>&(SNz?#o27RXYq~2#&iQR76B6}%tfTMkcFtzOCW>W63MlIqMQw%3uL^};a$ED+`QPoRHHQN?<+V(^ob}}D>+(0ni%(y* zD63amVre~pq4~xP;i?5^^&;J3jo-bgF}smb`Jbs<_wIeQ=lfrHSF)$gUvv44&|Bw4 zvDdEj1xeiB_+9X@goTMyYPYHT4c>bZzdN2vEaF&cwAFRNn|1E@+<9hy$ULZ#m7Acq z;+vX#gom@B|35Vq#R~D(2?3}-W|LD)R=Oku}*JsB~Nb`MBWuNHY`PucmVD~~r zC*9wi(=F~RZtIWey87wc$@l7Wm@dbJi!O^gU3cix&!t&SD;Z`a-d^`z_}YwVlZ6zm zMH*X^D%N(lWKUQ8(x4W`tig8G;^*l{Ok7u4E~>3quM~0Z-ZqX$wGQ`PUMza~#Wmn% k%Woy8>3^pQKa{T&cDkjsU~iip0|Nttr>mdKI;Vst0Ga>jEC2ui diff --git a/core/assets-raw/sprites/blocks/units/tank-refabricator-top.png b/core/assets-raw/sprites/blocks/units/tank-refabricator-top.png new file mode 100644 index 0000000000000000000000000000000000000000..144c7ed37d31aea5d38e10689134d191448e4bf4 GIT binary patch literal 1681 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 literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 7ea4e3288f..c539d3255b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -558,3 +558,8 @@ 63126=refabricator|block-refabricator-ui 63125=prime-refabricator|block-prime-refabricator-ui 63124=latum|unit-latum-ui +63123=reinforced-surge-wall|block-reinforced-surge-wall-ui +63122=reinforced-surge-wall-large|block-reinforced-surge-wall-large-ui +63121=tank-refabricator|block-tank-refabricator-ui +63120=mech-refabricator|block-mech-refabricator-ui +63119=ship-refabricator|block-ship-refabricator-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 3409bc6261b89d9c82be1c8f66852d8e79ff6208..bd65fa5e70e9428a3bc3bcb38b96fadf8978f457 100644 GIT binary patch delta 136 zcmdm?G(nk(;loCzg}h>-MX8y2Y57ITsVTa}rA6tfy5)&EIg>Z=Hib)LmD0^gEJ{yh w5G+Z|%hoMQO-oEF%1lly$uD9M%uP+sKocs?$Sgn=vfOOUx0`YESAJ(k09}wVqW}N^ delta 48 zcmbQByhDkJ;mt;-g}l5xMX70tNky5-i6!|(lXvnqF { node(payloadUnloader, () -> { - node(payloadPropulsionTower, () -> { + //TODO replace. + //node(payloadPropulsionTower, () -> { - }); + //}); }); }); @@ -188,7 +189,7 @@ public class ErekirTechTree{ node(cliffCrusher, () -> { node(siliconArcFurnace, () -> { node(electrolyzer, Seq.with(new OnSector(three)), () -> { - node(oxidationChamber, Seq.with(new Research(refabricator), new OnSector(four)), () -> { + node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(four)), () -> { node(electricHeater, Seq.with(new OnSector(four)), () -> { node(heatRedirector, () -> { @@ -201,14 +202,16 @@ public class ErekirTechTree{ }); node(carbideCrucible, Seq.with(tmpNever), () -> { - node(surgeCrucible, () -> { - node(phaseSynthesizer, () -> { - node(phaseHeater, () -> { + node(phaseSynthesizer, () -> { + node(phaseHeater, () -> { - }); }); }); }); + + node(surgeCrucible, () -> { + + }); }); }); @@ -241,6 +244,12 @@ public class ErekirTechTree{ }); }); + node(reinforcedSurgeWall, () -> { + node(reinforcedSurgeWallLarge, () -> { + + }); + }); + node(carbideWall, () -> { node(carbideWallLarge, () -> { @@ -275,55 +284,55 @@ public class ErekirTechTree{ }); node(tankFabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> { - node(UnitTypes.stell, () -> { - - }); + node(UnitTypes.stell); node(unitRepairTower, Seq.with(new OnSector(two)), () -> { }); node(shipFabricator, Seq.with(new OnSector(two)), () -> { - node(UnitTypes.elude, () -> { - - }); + node(UnitTypes.elude); node(mechFabricator, Seq.with(new OnSector(three)), () -> { - node(UnitTypes.merui, () -> { + node(UnitTypes.merui); - }); - - node(refabricator, Seq.with(new OnSector(three)), () -> { - node(UnitTypes.cleroi); - node(UnitTypes.avert); + node(tankRefabricator, Seq.with(new OnSector(three)), () -> { node(UnitTypes.locus); - //TODO - node(primeRefabricator, () -> { - node(UnitTypes.precept); - node(UnitTypes.anthicus); - node(UnitTypes.obviate); - }); + node(mechRefabricator, Seq.with(new OnSector(three)), () -> { + node(UnitTypes.cleroi); - node(tankAssembler, Seq.with(new OnSector(three), new Research(constructor), new Research(atmosphericConcentrator)), () -> { - - node(UnitTypes.vanquish, () -> { - node(UnitTypes.conquer, Seq.with(tmpNever), () -> { + node(shipRefabricator, Seq.with(new OnSector(four), tmpNever), () -> { + node(UnitTypes.avert); + //TODO + node(primeRefabricator, () -> { + node(UnitTypes.precept); + node(UnitTypes.anthicus); + node(UnitTypes.obviate); }); - }); - node(shipAssembler, Seq.with(new OnSector(four)), () -> { - node(UnitTypes.quell, () -> { - node(UnitTypes.disrupt, Seq.with(tmpNever), () -> { + node(tankAssembler, Seq.with(new OnSector(three), new Research(constructor), new Research(atmosphericConcentrator)), () -> { + node(UnitTypes.vanquish, () -> { + node(UnitTypes.conquer, Seq.with(tmpNever), () -> { + + }); }); - }); - node(mechAssembler, Seq.with(tmpNever), () -> { - node(UnitTypes.tecta, () -> { - node(UnitTypes.collaris, Seq.with(tmpNever), () -> { + node(shipAssembler, Seq.with(new OnSector(four)), () -> { + node(UnitTypes.quell, () -> { + node(UnitTypes.disrupt, Seq.with(tmpNever), () -> { + }); + }); + + node(mechAssembler, Seq.with(tmpNever), () -> { + node(UnitTypes.tecta, () -> { + node(UnitTypes.collaris, Seq.with(tmpNever), () -> { + + }); + }); }); }); }); @@ -387,9 +396,6 @@ public class ErekirTechTree{ }); nodeProduce(Liquids.gallium, () -> { - nodeProduce(Items.scrap, () -> { - - }); }); }); }); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index af9036ae1e..23ac2198b1 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2640,7 +2640,7 @@ public class UnitTypes{ hitSize = 28f; treadPullOffset = 4; speed = 0.63f; - health = 9000; + health = 10000; armor = 20f; itemCapacity = 0; crushDamage = 13f / 5f; @@ -2734,7 +2734,7 @@ public class UnitTypes{ hitSize = 46f; treadPullOffset = 1; speed = 0.48f; - health = 20000; + health = 22000; armor = 25f; crushDamage = 25f / 5f; rotateSpeed = 0.8f; @@ -3701,7 +3701,7 @@ public class UnitTypes{ speed = 1.1f; rotateSpeed = 3.2f; accel = 0.1f; - health = 3000f; + health = 8000f; armor = 5f; hitSize = 36f; payloadCapacity = Mathf.sqr(3f) * tilePayload; @@ -3770,7 +3770,7 @@ public class UnitTypes{ speed = 1f; rotateSpeed = 2f; accel = 0.1f; - health = 10000f; + health = 12000f; armor = 7f; hitSize = 46f; payloadCapacity = Mathf.sqr(6f) * tilePayload; diff --git a/gradle.properties b/gradle.properties index 6a3b68fb5b..87869f1649 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=35479e2ea8 +archash=dfcb21ce56