From 5509104a44556a002b6784429385e0c15bf877b7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 10 Jan 2022 11:22:53 -0500 Subject: [PATCH] Moved thorium into the 'next tier' on Erekir --- .../blocks/drills/large-plasma-bore-glow.png | Bin 11117 -> 3549 bytes .../blocks/drills/large-plasma-bore-top.png | Bin 643 -> 628 bytes .../blocks/drills/large-plasma-bore.png | Bin 3257 -> 3052 bytes core/src/mindustry/content/Blocks.java | 5 ++++- core/src/mindustry/content/Planets.java | 6 ++---- .../maps/planet/AsteroidGenerator.java | 3 +++ .../world/blocks/production/Drill.java | 8 +++++--- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore-glow.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-glow.png index c44e9c7910b0ec1854534b664a2c2d4acc3b7fa2..b17b63b0e1c3d277c2f66c86e9e4a440c2e89f78 100644 GIT binary patch literal 3549 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 literal 11117 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^U1CRc?-lmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNPuSGrLUMny=-5vFK)&CjAMgAAX*5^Po<>UBD(8YrjW#BwydS zo3-_ZNg{~zwE zt`*oJVtMR%^xN~lt*?LnEq-sF;^W7q;q&LW{F3pAW4=E>!++c7ua8xB%E?_+zL+&mBHjKAwB(v-#d-UoCD_e}C8{v~+4^08gTO=f8hz`z2j|PrdQ8_Rrco z>KpHTeqwRt$F?x0Pl=WJ?(ge)F0?D`pS$z?#rnCmTy-zbzy27kGyi7MoSL7FPyDYx zer@>hIQ#MIJ%^U_&$74Ieg3oh+^Xkqj=!qXa@k@dSlXHfqkx}=YR${s7ec`E;F3mR!WSnQHoLYBv#llueUH_ADMNP-V z!q+@0YI}Pkvg@I#_|EgW-z$T){NoO-b(HY=aY{e_UAg?fv!~}8>$*I8tsQnoTVmbJ zw$yX~io`i5em)bukFl=W_VWAs1N;H1%|F|AZaVPpcyhpIH{gKl`y@f<^3k zMh?OA=X}_>R6e>UO;d_<4iJ14;Te$rOmUgPiH0XKVv~6^j|t6T(>T2OXWyy4=1&5e zV%=tYxU~6t_j$p&h`GP5!`&nbmrQh*w0f1X*#Cj?l2&qG!fPVf7OJ^;^9u`|{lnW~yC|yV<^UN${_SYW{bY9*J_&uH13!+M8MC5Jt&>qlJ(-Fm0NH6o0=cSIV%)vD_kA=_ja#-dGpews)2eOcoqo7t;!WGI2;r!-AI7B{Jyr4v#o2GpsC>&iwCeK|>%GpQFIIL&GbEc>h(7MjeI2=0_&#HC^t36x4EyeX`Eg(N z?)*Fj&RX$v#c^xw-|k$#eaqRClXp)mThXv|M^O}O#+u0-Uuv=vfBs8&>>(;4uu0tS zy742smG338r^>lU7RxhU%`$w)-I_CN_qHQKZzavYD8F{%-?rh`+^%<`Qj+RshwnSG zD>jvw7qc!q_fm~z?e~S|8z;6`tzEue@!*Q>uRT&vzWPvp%_$%u82-{`|{Rx>9^x_j1t0L)D@yYv=uWcSG=8?w9o58#84#%?y~(czQz8 zb?X@ArE7}(QrvFGRWE54>n!}35dKU~{C8c(*$KSCEM|h9Gp>t&XmM*kvtxrlZ#vuL zc?QeXpDupp^kccuUQ>yx>pT8x1F;`4^ZZVm9PiD8?bg?>= z<+fbhpT5;h>x+uIT9f!^Uwj)m^`g;*#D#Kajy;-S6)<&1T-@DPzvoEvG%Yn!nzW}X z^Tcv4HSVJ+6J1Z*?)npW>yG+b>rlDnr(^ET*O+E&cGml~w~Udzvgkv>8(lJ+&sc3U zJIS`eBCy26?tC*><;0R3`@Lo}|J)H&@v7j({8|r3)ye7UE7;yMyl8#lxI${H^Xqx5 z&-5%@vsZZY#+ox<1sYY9oqV5fKQ;5Fms@+7iZ-Lqj5QvS-xsu|w)A>DXLK=_m1K0^ z(()@QzDL0;fZ>k++IMO(Q;RMn!qWJ}ML)jXfKhyRM-x$UVB ztbTur^S#lh^sX~=epl>bgO)9B9mzaz3f489ZT-ASdWA~4uIm*-We1B6}urJ@-ooz8XC$Bn94iHQZ zRSvK=+;KA`ddrMCf*U6rbE^H{+jDZ!{k+2GfB9w{5n$)w&q}`Axi#7JQ;zg>hZMFl z$H!+fr*yFC2rCO#`8PZ@dCU9tvYNtGDgL*A6}HagWIb>>YE5zQB?DcXjx`Hj1Xw3W z^Xyr*L)m7!boQj%y=|H{^95N|*D5RPh_t>dUsmtPw9PQ5{N?5~ht`Nk@N9l3EL3$z z&@86Wd~%r=%d+m$lWr^xz5Wa}d?m);tZIMq2tMfTZSw!K=%(QAtyw(+OU_F58da;d z$hMcfKWHNKr&TC{@4${D$CNs*ov19y+aa(ZzB=>M_O}-?n@p)?8_bc~O%+?Fbg?W^oKC<`H_Ft#vejS?r!f7t2$C@R%GMhFe zrRb|H|EJ!;llbXmiHuF|oY%Kh=NSBm)19HY|D&Z*|C3Th{#4bS@e?2B_rJTY+Mm>R z-TdIYYtAAQoNq4p(bQ>CWpno4d1j+WR{X6g`+B*Z15ZWl{&@2FxU^(zL6Ep8Hq8~4ddt-E{G zpJm&*+f$CLW%W#d8s=HZq*3a8;KCAzSlc+-^~<`%!Wx!|YOKzrHy0 z(=~G@t1nqMy+vb!xI?+&_MX|o)3cYB_}e_@I6GTzV^h?>^i4bc#rLVjE-98}$r03x zIVwH-MNeE!QM>@xMx`k;W~X==GPEbzG)1T^KA0*oecQ)(Ps~y;T-9ff$^0s|)}XGh zszu*%<3&$H^?xoZM;kW;I3ARG_3ho1$KDBd&86nQmsxz9W7XW`N%f0Tzj19*a-C2o z{ORGdV$IXv7<#r?-u={P7SKIc@Tha!>!tmn?~`@oA5{xz{dP-Tx_)z5=eLG`OX4;i zh~3fTx!fsvbA}>|`C;W37Mh$9&B~o>qA&e5ORE_?7cORK$y{Q=vHlRlo5d@uj^(h0 zh^W6;*&`>SV0p6pa>4&AU-B29tbKiK{l%{jJDi#}zn-%uy64NJ&EK;aThHt^T|B3S zF)m8r_Q@ZPWoPof{g|M}?sRnamnr?1J}b`p;eMOX{Xn5@$(qIqeVxuuQu7b*=6|dl zv7>MfzmfOphy6X-EgH5vv>tRuMtzHKS{XKf;+?6LQvHDiDSz|wFGwr4}UNE%oMFrG4o1g_PI%0 zgPH0cmA-v(U;)RcfIT8l3cj^Fi5!^u-uQLc@8?~L1+77UCFbA!*}eF8XYGFF`}rqc z^z>TSFG}8YHzq8ZbzW=8nS0IM%bc6}RyU{1* z7cu$Px{I6on&vF&734lx=3H`{&r`9d%T9L78C|Ysg+hbrQFk_6XLWClT^_uF?OL&= znv~t0!!hbV$~$Ga4Y!tQC^Gm-pDp~Wt!CgW_kn1ZR1_m3YNFFseHOM>u2{$J0;C5X$6%t#}lOc`gtd49FBCJ znR|QBQY8-iuUl+(=7v3afA)pFZI*=U1A{qB*%nuQ5DLn;IcY(|%l5r4R$f-hTq!T4 z-urFH{T-`wEH{X)%uw;&mhim5KpAGW#}W1IMu}WHJ6p|WTnn;3_~&9> z*{c5a?<_M+{nkF%v~9-Ad70{`mh4;``0mq;{Xv(a&Zes0HaqRrBe0`Uv|FSuLQx&b}l?Ur$fY4H`Pa2SKu?l?TV_!fwOOy6zaCu9bZ4^^8HWmX8*U@@IU@a-t7rr z-bK_;6^-CpW|(CX#I~I~Soi6*zdq;Q?_ctY|Y^&wv z;uqbWHu=`7DX%gduN*Zm*PF8c_NN~P853KcBs$AE-tnJ%boos2qsD>CE3fK3iJA1k z`0VxRaeQVH-}`JXi9R%n64sHkTG77K=JI^$-t##hbG$a)+P8mK^6o;32OVpiVuWlz z*r?dqcuh!BU2}Q++G2ym+x#ZCzigd-iBWjgR4uoXGlIl$A|8P+{zV5pc=JJHtT zu!GFe_~50BL>;v|EL>LjiMhDSY~^xYA&}J?ChMd3w@HoHv#WdYgQ$WJ$s1oic(i79 z^J)c-x`rJ)Ej4#}bpH3|(oM3pcz1kvb^q@2h5%iovsu#YCU?z*H?ElBwZ5w{ykw#H zUxv2SG|A#gBJQU@mh#KTzgMzZ{dK3k`}SEIB_0TOrq4{gbwv8e<=NW~R?fFL@@bP- zjh{{0CDu;)o$D(89J74B>433wnvtQujFMQf?-~=s)3c>MiWEj%Ejc9~B)59bc8lzz zMyu~n-fuADV)(S3e#IPyI!T;DE*ct(8D3g^5}KE84;!@u+gUim+~Lld4&{^I4# zEzf9s`@qps=iqM*r)3i!oSfi$bLtx& z4B?vTBXu%Gs4daqvWZ3)6Key%{JPf%x8+`WU3w*}^vdf}6J73K!5Z>BHLigRUNZie znZtJYr;VFi+eB$8CmTU`mwtypQHF;1KMP{Smt`)B(OVpG$9-jt+v2!-Ee5_-H)`&` z=iIk0+v7;`i4 zL8-0yvYRd&BaZy~r5m%mj5&V&`sDO#_EVPw`B$uBat&Ol(eR%A!0&zS4E2gEjQhGG zOxk?RdN(S&8<>}ioS$RWIsN?nqf5QlJA_s_S3NxyTJ!CvctrgEuTQuZ@b2S^y}aP1 zR7hy+`^thC@pZ2ce%>=pjN`*%H<6bmT*}JIGiJ{|T6})aq1Ws8w{?r3yMO)t?|uFD z^&g*3)?{eS>0h?$g0fZ8#SHDDLR;}^sfRb|+}Or^{&Q4Qmz1E&WX~t?gWS}Uc6XB zUi$Ef69z(^7E-*z)!*MGmZyt@@!IRlok?)kCGm z|NWORFnthxQFVJtPk(=6S(zC3=i(VNH5DeGToAM}DLGkqdtPmG?^$1w?%xazHFoVs zTPx?-eio|x`S5-@^S=1~uj~z(GA^>s>T^-*%Q5Tz_)$4x#{A&kU;yZb71+ME(sN&k>);AmiZ8z|Ir$Za3@0j2=<3k(U&1ykQ^|KMV94ed1R zP@3zNn35t&xeg?{l{oyt>lqxI{#Xf!RUo07ru|!zLA$-hIjk)-&B;-N3$p z>A281J8fI^~&l+$|KK;RO#S=~^jV3-kmc&xW7d&}#M0D)YrQ!OIo_>DLHZz2qk%w^x z(*}-&Y5)2rO|W55<4lln=<>PR_b*}=KdVb0YXjSp2!{!bUL4+@=fZercpWwn=s!Ba zYiZPj^=ot=zg;VkwYwn3UPbtKdHW=!??e`acKwC#m{!dl)@s zaAd2PSMMOqHz8|RTZBoQi&3ACRrAA#He4xXakWpG;&y-WTK^+f@j>mkec?LqC)Tc? zPh*C)y7g`DYqx~V+$m74pDS>&moq{BfH_OmoCY%w z<`PX8QNL=h`Z))#oASC{aj=ndSCVtrk>lntTJAf+REpPRwwTTJR{z8_6(L8Zi4JOW z-R$Nc{&7R1Pj2qP&d1q1N?wYt(UE_x-XfwL>Y`(|_q$a_^Ld#yzET@ppI?g5Q>at- zV|uW@^6y5*`DfgXW;$5SbyJ({W;M4d(V%HfOyj!DfT>bvma*Rd-h3%RsWHc_`QpPw zA3xuu#5%s^e)A5jULSYh%$E}V56LN;FMrwRnQ-mJ-oslKP8N_^#wt_d@m|=6xrD*+ z??y&@F=wl}PI(y|hYuf?kd-}HVAo$^b4}?)Sy`Dt=Zk<)(XOcG=es)G7Kcd5I4%r0 zaOn}#yxMOfaeFHmlat-68s$}^ZTJ!3a~Uw(VN zU7i}JuVD=M;?7?uGPA^rp)iY!o4Yt7I{N5I;o}=O74hs`s3_9?`^T$KqBZ}X>re1e zS@7D*#Mk+-$wa@U2BxN+Pm{eX9)8K(Q}$9c#pq?;f#Q2=j0sbOR)lt4l%8@@>dc%w z$_cwU8Esn*n5rtDTW@dmA@s;1wo4|TmM`ayh>bk<^7;J3t=!KIEe-EksZEzYv~#n5 zVp*EhO&_+29xS`oEsj~2kfG5HvgPGb@ej}L?`1q}@XkEVKlp})bt_~X)ZWhd@0?o9inM79U76lwcxDZ&*T5gmK*=jZf~*Jj%{t!t0J_T&l6z54gD z5`oOS)+MK>i@W#rJbE*8`iFP^_jcVs9XL}!=t+n18)MTWb-#1I@0uaSx9!I|j_~&r z86Gi|{0(f#ci~kD_I#q@9UB{Y?6m&;!~XaF6`ud>vY4&z+r8ZeN`iM{_P5@gDf#Eg zTzUHssT&PKS{4PK{L@nS({A~cYL3SG{agu?x4heJ>}d33Ws1}jW2tlc^p8F+WvZY1 z;<3f%|D0v>I5?Hgz1ePIx+G5(m<*Xf~bt!A0A_4tYKUl&;B*N4~Nc+lU&lU%i{Ve8eY zc?;Fp1JhZ#4=yimI+Nn(Yp3UToM+-q2HEf>;gdNXXDl#k=$#Pw_Hw1tB(aly;S*b~ zXqFsxzRKXId3+J$MllhWj3@K$Z);x>StYkz+TKYevg^$k*-nMcOIN5m#++km$h49x zIb&W@6KHjfH_`AZhvvyitE`Hz*d2-v3VF7A&x8$A<;`apOmVk%yW(Ip)1lAmyqMTC zP&NDE+HCt*qV?M?ideQ@Wo2;BRGHqXV63wI&Bcv-)T((77;*Y5K5%V}QB=G#Q|-f# zn7&ClyX2-zT#~({(mm60F7F(R;tMv?c?JhRvV6E5EV!smI%KI*$MMHU-t#2y3OI1< zmX=pj zOiJBf#@=B~>4x8eL0^?kK3(_Vn9LG4cVF^l-_F^L%n5T?%-9z=917tSxVcm7jLc4- z*)0M#VNZpYz2S59c4DxbYwn$vKd-KO#(}M#tFL($l)tEvyBjR#;3nVlGIOdhFY`u= zoBwO%f`fx2A}z1^|I%-+m~udV*+mgm(RmC8Zi_d1EDlKzU8^(Ky=2A9pfh^6-w4gU zp2)Y&^ZB-uUuvDNN2Q&+v#?ktg@k3c3&)#DZMoYdd5Sq0_GPTO|WpQ&}3@>9mgOXRjucq?7^hB*2 znvK@ zlvF6c^G?9_8#i7vB+YGEbRm6r3G?kQ+fROKGO|25+hmuJPJ742d6WP6_RU@G)xcdH zyR`VWj!EfE;n1ab95VWj`b<7JXVVJnoXh{+J(xe;T42K9Refmoy4M|Ui=Xft&3Jd` zhSp{FJZ@j0?JjI~)nb|=!uf!s_n6M#_>|+mYB7G- zDiu%4Kd)+0JANboc!mRqRq~`mPd+wsC}i|}ihdj!$QT;9a1~dG(6J{+EH1q)S%2nY zy7`+&3D);{nf`03`l>RWoSMPa?rLUKE0EaKVQ4S7aALHQ?&Q<`aqN1X!BW0y-zv=H zQmdP`D72Sd4y#d+QYiTHko|KG^X@BInqO@Ay}h|*wPW9;xqP{(BH(qzE^hI}{f>QS zr)03^ovJu#aBR+|gEd_rw9V$`H=nuwR$!U&6eo_vke!^DW`1Z@lQ<*8waP_)0z->F zM-+SQ{pRQFb_YxE98jO3b}cOY*VAXdV$S)34&|N-%R*$P|Lr_3Wb#nuX<6a?sqFjN zK8SMu;Pc*c$Kcy0?zOqzhx&~lx)<)S_G4YZ7s7Byv3ef+`L7Qw^m1;uWzJd=wmRai zF3ZjzflBO=uJ7G6{Vqr@c{N!_M8rp3pa0)fmV((&+5F}|aK7ZA_ebS#URc))K7lG` z@rE60_rKr%cJTXyp9d%D_B~EWOx!oy{)6+GiK@L`C5lHxwxqA_QOXdtKO|(dp(T&| zfT)qZ^`zwY_rJ+KyUw!oP^wdUpZmsD$%Y+07oA?0QuYcl)jj~f!tp7%Z4 zneJcu>ilzMujz|8HfS79dgjP^kxA|pm%7BnNtTw9r-M3XaB$}SzREPy?fj&lkCo%i zCN|Gqc4~FP#R!p=C0v!S&d0~a9oku({$ca?`dj+ST8Fllu>0Mg_KNY-N6DaCLupq% zMXq1U-f4>*_NlG8@$UP?qs3CSlU7WTG;%gfdu6*b$Ev`}O3HMCkJ?0OsY6G8NQj9) z|M-Y|x%JugQxCpA`ZC|}*rl`wE6%**7I=2zU%$svw|+*!<@aYOGG0+(Y(FbFLAxOE z+iupRq;OA;%4J9QG~DNEW%qE`?szd#jQz^0mbGgiP3_iKmg@cH?4E92@GH9K+0%*b z+LrrdIQ<$FZk&{0Jhr?m>_VQPU`dgliqNZ)yHcl(Kbd4qV~}yLUKH20FMYEElaBXw zb`N*<$=X66SuS2&Y++^G9IWo2P*k)i-l|Hcl_@5*N$7X7_iS|Me-16DoF;lq9aY{ANmA z$rqWsEeaQe&PZOLq5mQBjBQ)l^v{N2!UhqKw)$`Ue|<~)#6r_8)#YFGQsx}Yk|<{R zW23!z)tYBD(|ukj8ohgX`QlFYWs8L;F$;_Dbu>Txno&}yVTEeX;=4)jjQjqZ9sOIM zcy+CT)vf6s2SKFJdJXNFU2Ar@-TYemXrmmX?B4zN*Q#CU?K8`4S;!wP6Xty(;`w2_ z#(K#E;wmj?`B)_r7YFy4Oy)K+<10ITH&Jl9zGzBb(6ZWQ(G)XJ>0@$wvU53>b=xt> z$|nEm^fs?;&wC`*7@1^uK;gsZlx;gcYkNM3SL3~v{DqA_J6UH@WWqj`b1YfjK5G&Z zTTk9p^xf1t5$tGtYxK>l6|T5{-TN1Q)lvRcD7YmGwp*o z+rB%~7Hx3R@_(>i;K%AO<$YUxeoWdFvPJMo;>?!a&1KT3=S^|=q||R(V0G*J3bqIA zJu4I*%$jyJJ5%D`i6hBhW3NRjxJ}YbT{B1MU5NLMBM*=1_}zKBbmD%e`tEsw^BL|b z1-$lo5F`9*39o5YzL(3R#_VhC>~#j8WUsg0G->2oa3N`V*Db#A-6h9AN~+39|GgU} z-1?x!`HS-|Nvo}DOzgiWatZxV>gl~u$hq>`nwEfze7nxCnyC5a;G{xbMT>(@SO0u= zkdCp~CVOp;wtrg2hU;~+iYvEoRxUMeF@4@NmCsnG@v*Xfds*>1*<(-JRWj$k5>A|W z=fUjaR7DdhwVBF74Z=EIS!S~n-@e>)?i9CiQFYb!Upnt=-d&rw&S1H z%dHhzr{`@>s;XUPV`3F0*7TaKJFNLR=Q`%w+Y)b^+5LI&JW)n)e*9CHn|k`#H3) z{Z>5iy?FA!+J=RjTC!VA6qQr&>viXqWj;T<^Sg0smwB7*A5Aaz)&~o3<{WC*pQg^w zA)58#@6~qsFRRb}z3Tj1Tk#X8Y~dDbQ4_acS5G!_|I3K&YS<&UHQ80^M+Nuq!}FJv zJ8;ZnU!A$|*0~2!*~~{5U1Xo7Y1xpuO6m8tr6=5G$efe^JGEuQb@o`@=Jm#o@*PV| zYT9S>Z>e##*5WE^vHR4*eB1v2v+Y0j``aD8yW9GE@f@K;2mCyAmMKjvk2mCcYtNHWRb0N;7i3D++<(6-gpt8ywpiWg+w}+C zEiqIkbgLm0t9&+@N*0d=(@6 zCgF*i)pjw*8&hv*m`G_%J$2$~@xnV7pFI=%_x1ii+4?^(>I;9K3ca&)cW>5Ow#z1g z>&*?!&AELq|GLUBH}$}xZwrDqZFgNzfAYlcYKuK(0s0?=pWI>HTPXC_>{}+o$p-&p-YjUoP7}Jasku z#*G_C>Q=U-ZRWhqC$}SDy}5y<;l-7IG>zArk{b2o~ zyUV9APq-@2`-A;6i|fiQcH3p8w?@g{zJ2@0t4~v%xy@=npUu6qvsnD--@gn$(l%f1 zU8vFUeCJ)U9In~wdz@n?b~SUG-BmDF(ZBKJzWNWNy%P^Fj@$5ZgTNWFYOR({@mdeR zy*=yfJ?-tgcZv1;Te5T`Hl5kX{L6J|dfCo(?6(Vd=|&#Qt#3~HovqRn=RNIbtkG@1 z2lJO)&(u5|#_*%R z^Hv4UPTPEWQLRmKUeKhc6Cc0bmJz?bB7W*C&N(-@nfHe#U;8j4NB7XV;)gr*a!$J) zHVIsNH9%{6px)HLm0^LauP0vGG*xcxve$tTuLIP#-82YXeKkO9>O?R0?y~O-4&;V~ ztlV_SbG=)F>nimpDzo?N1m3bbZ7ju*)!)m&w{cmYv$AD`{+77)hjV6Z$l+dhyKYZN zfsetb*z2vn=l0yoSP-=~Y5$J?j>H75J*IB!oNuggd-H99S;ZRtU2nM7%usG#ztL&p z0<(8EVN4G$PJF#DytonGu@jP?Q{nq!U%!(51gZh5ceUu`Ai^h z{b~M!9r72fWgqXftGVyE_~JM5RjUpxXx(>t<(KWXU2Zpurd-!-`CDgm=t(rEU*Lmk z#~*s9E^BS|>sq!kL+4kn{3B+Wm~bbPiC_N;$n)NR>}!!8utMw1#MhM@-X?hdDbZ@Z zcyXfh@q2rB_x}HJxBlVde*1%4Utdp*He0rw`)|vpMK8Uch}2BK9kS>BR)!S+x0MG| z9M6A!u*-2@z}nEn+h##8MT9B8gC9y{ue|16@nwdHYv6+&dR|M7*2V6>_cgGsy1IHr zh}Md*Rf+vZPu?1G?K;27X2PA9{(Vd=iK`x4thoAm?M&NsuNTIxPR@SqcfGwbOe=K8 zGS169lMdDYIv#)0zw(uNQiYNHvy&_NZu7M;xHdj#a6`zU0HDu|Ga6 zd@1$sVYvJ^mL1oZJ>p3&-_O-JYr){&DyJKlwGEPR^gV zC;imv#Q}jL74!IAKUN9Uztywfe6uBpb6Uy;6W&#e4i)CSd3*QpqenF#D!x?6%v!cx zN%yiz;d=N?hxzsE8~5)0oWlK}uG4;JU##5(e+!N2+CP51p6!u-sY8k_#Fu*#)A{Dq z+bhCW!zNhr-!BN!vll(^SEycB(LzsZ8RyoRwnc2q*4)fVN-yW{tdN=5!RHzny)~=d zCv;`VvAs!xOM^JSR{dScu+KM5*J}UQC|)aFr<_^7N0Kg1%M`j_ZoB>J_mGt#0c+WK bQ~&dq7H+ETV@YcV&4YQm`njxgN@xNA-`FDw diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore-top.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore-top.png index 7c1cd7d919bd7ccf8ecf7af21668ee971222d0cf..787040b968c9d221f32d8b723cb6c892fee192ae 100644 GIT binary patch delta 590 zcmZo>{lYTAuwKv8#WAE}&fB|=MTZr5S`)WkcJ;sd_(_1RpWoEjU7W^K7^OE%c=F?a z*~=q(SGzeMv~)3mfKP3O`GYLE@3)QXeHhwKJ?a){m>Koa)x~bDbkl#11Copu$_;H{ z^Vjw=Xa#-Lby8?>iu`g_(SYY{j_B{-&%YO}oxz^-qH^i_dX7ehlr^(2@-=>MaFlw_ zS=qs2;AqUUOJSz|3b*njq6G&$3f4X^V%;P2GVI&BmOpo%7IP{X3m@|Mn0;Kp!Lium zmhndA2CiPu$oG~U3m%@>bmT+=Re6X zFfc?YzPa#5>+ppMy-7;XI+k*{hsX4AZ5y!t?3zWuV_m$!avUF@HI6u zS_~7nvVPL5d;2``*C8SEr_37vJ8lLB9C@VvaMyyExE&Lf&dEJjEO~tHRqnb5Z3U2r z-kjdeI5AS^MIo!n7oSBY23)HiWUuP`v1ps}Hm!mqX|jD`V)p-Kw>}qY*pPTxGc)&| zJA<%Ext~gd(!PPli6L_dBSe9 zD(#=^z`zydq`;uMRZ*Z}(JTQA&h#igS<`RM=afqhsMYJ&`97@rzSo_hC`MtmfCbCk z4OTLO4vnrHGEGZr|E8%}EjaYT?}VU(>RJJg1&wYTEDw4ZT)wMRw=$T;DGE3oQ*Qad z_+{RYX_Zmc+qUv4mN2YrSlfE$zkL-)V)~)I+$rg-?=@f5#Y-J*;aTuyrLL%BvZvzP z&E|hrzdghnP<*1^qAJ*SdrQxi&kG};W%8Et?J&N)Mt9AzoNrn4-TRmC-y6doBYJC> za8$nY&3s`!hKaw`gS!2szV1J`h*6d2PPc z|Nj$@UKiNKY!gu*tyaPwvH8yvb(ReuHTH2Zc67vlbmcf8%V=_82D^ZR>e}w_ECG(6 ze>2HPS=VvBof>Sl;6T#NSqy$*5wXSznn{QG%~&^_xtvwIwTD6E>X{9k4kwlK&Qyi= z?=XBF`tkD7zN&YENpcSq*P=KTX1_t#yhQ-l6wk20w`9VUSu6{1-oD!M< D-9`hu diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png index 7fb0859b715539e52c9947f75beeb5f85fc62cd2..9221578a2dd34519700a6d488a45c37ee5406b27 100644 GIT binary patch delta 3047 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 Z=Xr?Tb?r^GXJBAp@O1TaS?83{1OPF0YjXeq delta 3254 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 E0JJULF8}}l diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 130e1a6cba..98e2c5f17b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2298,11 +2298,12 @@ public class Blocks{ //TODO requirements requirements(Category.production, with(Items.graphite, 30, Items.oxide, 30, Items.beryllium, 20, Items.carbide, 30)); consumes.power(0.8f); - drillTime = 100f; + drillTime = 120f; tier = 5; size = 3; range = 6; laserWidth = 0.7f; + itemCapacity = 20; consumes.liquid(Liquids.hydrogen, 0.5f / 60f).boost(); }}; @@ -2317,6 +2318,8 @@ public class Blocks{ drillEffect = new MultiEffect(Fx.mineImpact, Fx.drillSteam, Fx.mineImpactWave.wrap(Pal.redLight, 40f)); shake = 4f; itemCapacity = 40; + //can't mine thorium for balance reasons, needs better drill + blockedItem = Items.thorium; consumes.power(3f); consumes.liquid(Liquids.water, 0.2f); diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 355e962995..9c9911fb15 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -103,10 +103,8 @@ public class Planets{ }); //define launch candidates after all planets initialize - serpulo.launchCandidates.add(gier); - - //TODO WHAT IF THERE'S NO TRANSITION?? - gier.launchCandidates.add(erekir); + //TODO how will it use the nucleus??? + serpulo.launchCandidates.add(erekir); } private static Planet makeAsteroid(String name, Planet parent, Block base, Block tint, float tintThresh, int pieces, float scale, Cons cgen){ diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index 3c1b7b5866..15d683a471 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -147,6 +147,9 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ state.rules.borderDarkness = false; state.rules.environment = Env.space; state.rules.waves = true; + + //TODO ??? + //state.rules.hiddenBuildItems.addAll(Items.plastanium, Items.surgeAlloy); //TODO maybe make this on by default everywhere state.rules.showSpawns = true; //TODO better wavegen, do it by hand even diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 1624cbd611..1a4d543e14 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -37,6 +37,8 @@ public class Drill extends Block{ public float liquidBoostIntensity = 1.6f; /** Speed at which the drill speeds up. */ public float warmupSpeed = 0.015f; + /** Special exemption item that this drill can't mine. */ + public @Nullable Item blockedItem; //return variables for countOre protected @Nullable Item returnItem; @@ -146,7 +148,7 @@ public class Drill extends Block{ Draw.color(); } }else{ - Tile to = tile.getLinkedTilesAs(this, tempTiles).find(t -> t.drop() != null && t.drop().hardness > tier); + Tile to = tile.getLinkedTilesAs(this, tempTiles).find(t -> t.drop() != null && t.drop().hardness > tier && t.drop() != blockedItem); Item item = to == null ? null : to.drop(); if(item != null){ drawPlaceText(Core.bundle.get("bar.drilltierreq"), x, y, valid); @@ -158,7 +160,7 @@ public class Drill extends Block{ public void setStats(){ super.setStats(); - stats.add(Stat.drillTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= tier)); + stats.add(Stat.drillTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= tier && f.itemDrop != blockedItem)); stats.add(Stat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond); if(liquidBoostIntensity != 1){ @@ -207,7 +209,7 @@ public class Drill extends Block{ public boolean canMine(Tile tile){ if(tile == null || tile.block().isStatic()) return false; Item drops = tile.drop(); - return drops != null && drops.hardness <= tier; + return drops != null && drops.hardness <= tier && drops != blockedItem; } public class DrillBuild extends Building{