From 8021f0082a0ba45465224164c0552d758d9cbeaf Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Dec 2021 16:24:52 -0500 Subject: [PATCH] Turret removal: Switching to bigger designs --- .../sprites/blocks/turrets/afflict.png | Bin 2676 -> 0 bytes .../sprites/blocks/turrets/diffuse.png | Bin 1828 -> 0 bytes .../turrets/fracture/fracture-glow-heat.png | Bin 7932 -> 0 bytes .../blocks/turrets/fracture/fracture-heat.png | Bin 3606 -> 0 bytes .../blocks/turrets/fracture/fracture.png | Bin 998 -> 0 bytes .../sprites/blocks/turrets/horde.png | Bin 1285 -> 0 bytes core/src/mindustry/content/Blocks.java | 119 ++---------------- 7 files changed, 7 insertions(+), 112 deletions(-) delete mode 100644 core/assets-raw/sprites/blocks/turrets/afflict.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/diffuse.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-glow-heat.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture-heat.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/fracture/fracture.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/horde.png diff --git a/core/assets-raw/sprites/blocks/turrets/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict.png deleted file mode 100644 index 00cab93b53d6d5de2897628dfd6f0b0ff40832ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2676 zcmW+&dpy(YAAj~W?RK=8%XG70qDE84QIgqau|^__OvO#$W&di2R{TR7)5t|5I zq(}&{oeo`u(&@6uq|(t?KVrGmZ+?F~&+~dcpXc>FpXc*=zu%wFNpCNAJ@iU606=dC zo3&fJ1}_cdGVMHaHgO98Xr~=4hF=m)b-^i{yvHyzb)((JSo+V~V{{1)8@+Yz8yWaB za6X+z0|9FNn!KOWr5b+x&iMOuLqUiSGi9~;= zXGFunJ+uE@Z~5ULfAtEnxaS|whk+e`UDNe^ytI_?t4d!jj2CftMW)U75V#ig%^!yl z-?yg7Z}wcgIOVEP9j=7q+T+41;IiTb|DCdjNKyr5b8S&c!V0tWgv3?8C9Shc<&gji z#f;9p1xefm4M#(qoK-o8Vqsg!f-hlhrgm?VR1XsNGGrA{oQBjHU~CC47ulTyt7x8P z;BtZ8NkHYDw8l?jRYd*mPOv!%Pa(|+HtDtvLz3IC&ed{~8(FLGRMGXWMuQwvx+bjK;dEoCf#foh5!k2gc zhP^)KAbH>!-VI6O)g@9YA#v=#d0An<5)Wv+Q_MEtK_$LiogQq<9w32g3O+@bt&J(T zCLB^r1HdS`LWW@8WfI`PkAW9OYUvJ;4S!|U$q}nN4LUZRFt&@9mRtah;g7Z< z%icS}`lBqN4o>#m>yZ2`=_?ph5h2aueC?mu^!2+?lzu)@#;VL3PK&O@MdXd<6+L?fi8n# z+h?rA%?KvI{bm>kA7{nHxsA#iSxWgsEhoeAa<@Cw<- zK({jA#rG4rHGBP@<5-%O`XMj<_5rgJeY~+PiO?<{r)s%p94seHdwo)i^zjWK&9SQT zX?sWBm5&}z_)pcMpg*Kb{ITYxUmW?>ddisDFAYa--n`n!U1Ga7Ja?9^Ax()5yjLyV zRlw;+cZ;aF?1@&Ybk1^|D*OfX)LQqRw;>ZbPG4i1W(lMWY zPNMUnZ8thgaTjN{jgh#t# z_1^0XsSWIEyhKhw<}JxZGvcsk;~PwNS5ju%Q#z_Fs%W4%#sao`LMkUjSo)!|nIx91 zfw!m(zZ-_F>7|Tg^1#D3m0}K08-*Jq|^vXYyvEH1zIu z*6ymJj51^Qo5pTrPL#5&mrQ^T3XK1tl=%RsP+H)X0gP_uk0i^Bte4uoMQkw9_Ml`LY zG_dJf|JUp~C5#N6xI^KIq=wef?o@o?1SfCaXvG|ge~&G?OD zrt8Aeki~l8m0~=~|5%Xoi`Q(}+o-a#qX+9Bt3zral9h7gK4zXg4gd8{{9^yR&rEi2 zW8l6PP}dp2l4a8maj%-tJk0^wWGJ=u_{`(F-_J%3#*Uwi;aafnY&r)>CX>u>51O%= zB5KT222&tL$#`>zFahQRaG8?SW~vthe>W4nzHq)$ diff --git a/core/assets-raw/sprites/blocks/turrets/diffuse.png b/core/assets-raw/sprites/blocks/turrets/diffuse.png deleted file mode 100644 index 3ff2f1dfe59cccc5203fa59fe8453c74143923f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1828 zcmV+<2iy3GP)Px*-bqA3RCt{2ojq9GQRQdpM zXQxZ0BM`2r1ElZ)+-(Zs*^}Y>oO!b|i|ii|1TL4eyZ_(3`Q{K{)v8siR;^mKYSsTx zudZ*Vp4WerADE_TmcQp0FDCrs-nXP<5oau-sijh z4V`EMbt!@o=A|)PydggApqp2*FezB=U(?xcL1E(B@nFUYscqQcL0(J6a=m= z0HDimZ~AkqI{*N?Ns{@f6vF7{0}KKHKsU=`KI+~6X0rtI0R{p9AeYtNR*<)D>7}6n z0LZNsZ!5^!y6UOn007ACb#E(3>tFQNkN^PWI^p%3wF&?Xmpe&UgAg%;Rs}$tyXA@<3j{RZ z0zot10)dMx4nov~e({tfWqLYbW-0Tzho(%wx;v8RdUF2t-@f}u_1C8l-=2*!y>uG0 zC<3&Jb!&x7naAaL?l>hb$5Y3xtt*U#=m~vy1Xu>dypMGK_naNWenE;e7j%8iG__=MXsa-#^>3>EsY7^V4*4MU5wE5JUi;iEvFR z1WRR!5G3=p^bmq%K9yeNV4hYXtF55TX5$_gk;2+q*#bNmNJUSYewrRt^xPj0t_oMW zKWinAvb2WOI$)Zn|MUViX%B13jR5?^O6hZvV68v2%;9O~TAQM#R*)5fHK%D1O3X)< zLa;`r1wxa4fF@6v1Mm=P%tv`4c#1_S{Suh~X!U^Cd{ho0!hDn!g4cX4eSqMOSS#~U z2qDsZlm?;Hd@X%|ppIB;^HJW`MT9&ZJ4v+=*k-6^{>Psm+R9pmYI#tp-7O8$UELkw zY`YUpkOti>?R~Ah$LIg;A3mC-N|}uSi}?U@7)RwYE$x;OB&D5ZJ}IL}k>G9xrRJk3 z2v+k;iZLqf5(w7T43#z&`JN$llnVf5J}QMUxA~~KAV|fo7lIjpWIpQ2)5qP+N417v z>B)N_m;hMJ2Y9$a&x!|+B8H~0zqmOr7{;m z5`ZH6OrP2~!YSn(s*~a(t!+g2#M-f@Ww6VHERGy&-tb2Phm3y}Uhyb$&dR zYt3*prO0O}F(07w_XDEMNA-YEs%`*UnU7iugf0MDn~z!o1QtN#iilJ#2k2_m3PRCn zC;$(kblC=FeoYR)x;s{x=2^n7iCciC%@3ECVI@)|xGz3nOoBoBgf<`bOH3|f)ssW5-K59u2ssM~=K58itez2Zc zvsAs*{6BvG^`R`iE4%iipB~EMk}qBF&+QO%2(PYpQ)nezWB%E8S2R%d&3q{96s87v z78j!~Zx2%2&0-0 z&~Qe~3gQ09x3?o8MC>Qpau2$uQ<55l^!*kPEaq$Gw%!1+`JAxl#}gtUcyfNvjlO4@ zl=u96NCbqEVyD+e-zNZCO~!kEK&J*mO_|?%qi?FOLPkJq2+`+S)VspvI*PL|OYta& zVCkSyLk+!m(hXmhGN%xNr+1t}7}lod diff --git a/core/assets-raw/sprites/blocks/turrets/fracture/fracture-glow-heat.png b/core/assets-raw/sprites/blocks/turrets/fracture/fracture-glow-heat.png deleted file mode 100644 index 8e58dcdf6d9c252962eb4a088e3df988ab4b7e5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7932 zcmXw8Wl&tr5?$OaxGqkR;F93BuvpOG?wa84?(V@|7YOd|Zh-`McMJaZ`|)m#R88IK zo<4KBs!vUX(pPB=R1#DG0DvI_mQ;bxqW^VdMCe#y<**K2&+t^!bXGBPqqKMYVQyt> zM(ONfZ$@e6Zej4Ao<5&0#sB~TDkqrSD5%#VT+w5#$>Z_)gf%RDI| zArgBKlhMmqFmXu=$laOt7Nv8NX>NAu5Zi5vjrXG>{-IoZ;XWE@@+Qs=eMz1V0momDMG?49C=K^2S=Xu!!=}o`xDyvz5irxa_8a-63 z%l5*h6EcnXWW2k?@UZrDp|}wZd~y=;tvB#c|@tVp)OjA}r7+%bi< z;<0{EmwxrryuxFG^ywV-I)f+Hc=)&9)?6zOOTzOTY(M=y;W1}CmbUTTp^ks^n z+xuboNBdV1En`#xb?d01%#rWmzNc;)&Wmc*0VGr6JlPk7eN6cJo z(}lfU>3whGY0s5I-8YU0@;nLM$1Cbp%pYsCLa9srJWxenJnYBKH+jJyTu%-Y8arnRoK?q*k60OSW&GX_PUcWbsy?gtG%1iHtOGXq@IV?}~t zV1*BAHBG@BshhM5c~0}v9YUmzAH{wYDgY8pB4Bwxx%S91_5)?`G4IHn#=fMnw6?7} zvegwO$}y^_?Y2qEBo>E*Q|LQ~GOZ!Svek`?>*7(ChTn^2DytjUgHGfZh%0Zr52lc5 zV!5wBN=T90-JOoOO(+>bb4F_B7%u@;@fi zl;*fTkv1YN0`>jic;52}&>4Ncu9rD1MRbH-GBIdzz}3YIhDT8Y@`H?BzvYG#QkJIc zecHtPQae($+_HzyK`Fly=KVt2jJ|%ThgjL)j&pc@1AtRMH_iD4}xo z%Kv*C=?*+=$Jc0ItsAxYO=m|jp_Hj#f2$;ITN;zpCY4P=pOjMHH?l>-`Ormb)>;>; zZOnOm4A()Ee%dc@BbQbfz;QxQc>l|*xQ1&iQjkA3dTlCtIGfIA&!O60Qd_{JzWnUZ zq-Nln*iRT^Q~Z&wa)%S#v|;tu18QY2_UfP1Vft3VYmV8!u*h!FVt@~LJp?Y+=Eiy1 zKV1bfFp#eWEw=t}$BrK~P&eUEl1_aaGF5un%LLKS%Juu>xxG=)-36F z!b+1Q;-rmn1LnpjJmq)XiY-^`guG*xuGq-I`h{K->-;M!mC?OfRy6~nZ!w&fy=n-J zMzvy|crh6`q;*C))69LRp$%oAp|%9oAdAq{hTq19{+F8$taR%Kl~&aiw^9N;4N z*Lt*Z(T`Op0aH#2e}C3@F1_o9)HbkXXo}bC!&z^j!|xbo()u2C=NMvAG2=S&Mt-X@ zo2-xV^)l&WGbno4cnEwCJ~5295t2%|$_a5ezbvrqGW+v+ z=DbzNv2U*Y!zMr#y^E76il4S(*h#KN_cTCBkvt^pU3nsQpXkV^qW1HYIL@gt!_*9t zg=P{Xiu9r;%gYzaZvyeE8SZpW-EK=PZ04ll2lj{kznz>OF7!0ZRRZTUm%g@Tt$F`^ zPUGEs<(m-_eKI@{+{0$%OQ z*?9ypinP3wMBB@G4tx&MI1J$Gx8k5P_NUs}v(a%wu38VtqI7eSuE+}VZLPtKdv3lj zE$hRyPFeDTT?8~@B$Ie(|%lqlM#a%W_uN}yN>ZdN*x2ZuXXR`}193a6_ zshJk_ttuZz9-6J^Pg~*Qy{%XOZm#Wm)E2wMymz(5PGeVE*DGE`eL1Jx8HH_cZ5bizg6U%$q-8in*r!8zkPp z+*T5KqNKS@2J5@fMUg$3kF{mYB{TkNSh}Yu{yv-Rxn^7t-ZGpbQ@=#iB!vIst+F26 z`qA#JN=`a5(<(J^y@I#Im}@LRYNeCpkFOB%eHl+O#4=)|_1GAr2IJI6>K)--@L+ye zC_BFLH?5J{{6k13R!yK~Vj{s&Z#B$L?8;={z5YncaXVQl?8fDhiSVapMVosnx6N$D zO*8DWryaXGpQWAT-u*7%X7TTgjrXF#(@>{z#@X~>ELr8NOUM*8Q)hh5oeGI>>W@*P z{v0ayWg;4qWwx1a1IBt}#U1`2x_RP)=(0L|+VC@J39j{)k?|4f1-?i`q51}heN40{ z))A{ob2hiz$DfDA5*^$1`_o?QRz2h&1hL~At!{^ZBU8@`t!8erz;{Rn2sU!h`xS2s zc$Qb~Ae)tiQMimnz<+2PNcV?NJ61U@_}*4GCXg+*iB?uvn0}$zpwMf=zxm{zkCB6M7# zvoENa<3(_kk4mBHBzJCl+w@F+D~eizho)-_*0`hJ#G zIk@**5&>t53M@B0^DkAk{^;l{S;?9!(80QczaqxCX-Ke-%5 zjfYaKH^01htXmNQY${s4VBCa7l!v#n5i4Ou%keY5xBWMiu-79|I^49U8J5vVWd-Bl zzagd{_I`6ZNGC3=-N6UC7Yy?q#^*#wrq7|5T$5l{H? zD={cj4pn)URfmsC(+DqikaJ}{`%y@SEAz{MYdY8b7kZsW|c4o z5cJU`DPRbF<&R;KPSIl)WHJw}@|7=T5NLk22LG3_O+5%HN6)=Cvj$XlzWVIGO#p7i!)};xBU*TC)5$NWN{# z`aHeU`h3$f-N?6BV=l^f5<+H4dQ#c{f|rShZ7Z{^(90?2eMXUGJ`W-k3hF$QfJmfUbRH?bzkaVMhZSnZ|;(*r-Z#=@=<5>2RNTpbQ_7HSXo zU16wUDzz$eXmtpX2)Sc{sdAS#V8Af(K(R)8-c2q-qiW4)qntrnyM}dCNOfn_h}L>$ z7RkzS&b#r5B(b`e^P>E{-yI7gsOgshESWT2Ak$(7JcTUUG z^X9n`K?K2G(|G(DS$r!G`iYkJT;pC283pu1zj5JyXqe+ztR01z~Wm)xKYEtB3TIP5UmN z-UY*$H5Eoxdy>1zu%7q`SQY*5hU6Ppg|XfymY$vCHjzhy0@X`C7~G2>takMJ$nq1` z3Xln6orv>0ba$CwyQ9kIs-szbx0FUmJrkK=Al$dXWka_SS9@T;fi0xR{@n#c7X)&mOr`RJ5?rE^+3{-tNm6T!pSDcSn{*Fa*B{1grrH0z@( zt|%+)j)zRAFH^fpqkpjb)%2x8dZ|QK;sl7^SMqOV3?C#nihDp6_%o-qx-^2O4?T6v zPA216BU>3ckDHcO)ruIo9<+5j0&MuOH5Yz}T5Y3-05D*yl{ z*h)e|Nk&5A{~`@4&9ZzFguwlxWP=7e#ow4vU9lZTl(JdEBl)fIBbBHYP^_ zJmX-xZE^Z`CU^rJDZ(f0zJ>vLpRagHmt+PHmsfYJL-ifguU|Zqvqk~AqJrbj{nYD} zIe#0Rr=ACJ)RXbHowk*OSivtNE`Rp;rVzqj1-XoiRBr}wjPqxP97*d7@;@kkkjDR3 z=2*yQ>hyPvbIA&mDgeYH77QT%maG&SLR3w{NUzcWe7MBo_f62{ zY?U?K)f7cwq8-M1L+WnlxxwA}uJRevxoi1;m>qi+frMw}O}Oc72nE|65z>&_t%77O zEK}3iaELS0j-jjD%Kk<2)Kq#wa?UI}LYXajT$}_fBxA@8o53zHwNVp`Lls#Zs=H`dw)|0)y{~OI##Nr(zw3&@eSgYHX#ET zn1-jE>3H~rEliKV$MQ$4ajiD*=JvuyeR7FSU7Hzrb zIcv(IX$2o=D+@jJhTMlG@G<5t*p`~q#JoWw+-FaUcpq)Bt! zJ5TaPZ4BsGt&W!c6{%An3vxn@3>$0|&W_&8#>$rf?qNrV?l7&_!b3&CivmGMsEr~O zMu2F|l0@meSp6SKXlq}SYF`VrTRC)XhZ=tM1?C*AB{A#Y84WRfh=AD%;e7O_2oZ-# zHOtpzq0XKD??{mac`Ikz=jWJ5&Lo*7puiUU{Ah27nGpGTZsm`7>_S2@vc-Xpt?1*w z;=h*Sgi_hANEObCR;vdY5rOHGX1FmbDx{jisd@XN*|8Segtc}W5haWt+;~7S zf%=%3nlg59z!@JO*VNYTTU{lK9HdtJ1}dEG+1sPLeiTd`rNsk@VZ&egyyx_8a{-_? zlvzTR0G3=&oj%}z#`^f^Q3Zh*`}mNboSZ;yhzsXRW5bs%TK{|4@N@9+h_K}q*hI)I zS%ag*gxBL0PLTx-Mg6O1LF3}$($v)*7#l&d!*SkPvWcMa9Py+1ZE4LE{1GHV9U5 zpf|<{!8tW)F7#g(0%a&XA|i1qDfqUwwuW9_qyhp0;L>>_*NBb#XP;Y7q1$Jl7Ki`< z7D+EY2arwr{&Z(^dVX%~>grn7;mjX1I0!myqo}SDbSH9z{q3v=3>Px$2=9i*Ea-KQ z&SuaxFg1mlBjOk9z-lDlyaH-o=^P%4ERg)pW{Q@Rk)1tQZ!ull+8VL8rl-b~QfHbv zZf44vF=8leicJkrDObb02|NOIu(7agwqJDhS8CK;_G5{lw`_h+v&sb1emHdIhw?Ik z5E%;_fcyu_#63r1IXOA^$7{Ov4v(O{y}bxi0@RRj8u;lEL0SS)Wjssj?*oxqsUeQ7 z(a^I)FJ^nOQp5dbA7gBflfp?W6=BI`_IvZzXH3EAC}Yjw>`VUfU+hqX8XI{|PfrbP zY)+Ip73PD@v@U)843XL0j~68=2$|WU4Rmz+fBzsXarTb4T1zzff0*NYt=-x~$T+2IXq!#6L3Wb3CEk z*JTa+S_-%1LIX$~HEno;{YS{A@6FX(u7;W-ivT(4b6NBH1BS*F6%~cE^$E&v7Z-dT z9i8Qs6$$#J-sU#Rvb*Qk_X7jRcUxZ4z300-7ibLf6Fh|wQ_cuz7WsAqaq0kKPz%$! zB0zRuCnww=8(rDX2zVq|AJpiR0t!At6LQ3qvz7(T$;n9*8Y7gmP`0G}ppOeuVofV_ zo{$jD&B+;BUDX}9_ww>eBC0`u6d=2YLT{#-8Ztkxy1KRol5A~j1L7 zzlXAwL0JkWPqthdYr90+NR?JZjdfj9V|>td^PwV zMs%*^x+Z5_Y;4|wb)&;|M^!kiXkq>wGZ-f~W)p>Sgtl#`Fd(1y)tjs zTozU|@l74z4tN6SlDx$)W&|IFbigN-&U*_d9bhEzsX&DDuZ$5A0V)7=5}7A`peUg~ zc|A#zdjK^|UQ!1mz)D6xE>yw~?Z+lOu`r_l=j&M+cM?%Vf0=$tDm_3<`tt1`-7R?C zLe8FffFt1gR-dYWg`59YD>uaC5*zs`c&HTYP9O>+nt;a%)>O6aU~k5YjIO74*rFHB zrPeZo6{iD`0IXTi2gxYljLUR=QT>UVNcf3Q6ZvRqL$;Y(?4y|!>BWLNrV9oy!8N^p9VE!TwNSO#Okh5S4h>uwT@6TDJa$8h|J^DM0y@sBn zhTRvjM-Zk*qg#3`nn`}B{A>rpZmyqVmhT)rj4{st@GD5T;1De9z!05V`apdTdUMg_ zcQiqzicUb;R#(L1htT#jTzZT!O7x)7QPND$hwXZPS!Xi+2TS}zro2YNb~P_~fhHsf zMMD76g=NW_a2=e*;$aclCyEJk&htxS9W9`xfJUNHmp&~wZTmk|lS334ZlM(9J{;OyltLXiHk z=$k!Y(OvX}Co`g!Q@{z3bD_`a84WC17|mPc6OS&16?NhzV!v7lR0RNFmI0*%tu10F; zfe}8FTbpBuL36&SUVf{N35Vr2SQzHj079>4o*chIr3X8w;9dh5Hhm5Hx^eXx1(Vs| z9Vs>3N&-YPSG+Yqlxtef1VXi!BD9k6&oM;h=l&5#OjNt!TKxX3@{V2lER?ud>`g5D z+BmMhVs^eW^fGM{oJQMAtR2D9sW|fj`&qe|PLr(i)+4O-N0=~L2GZaWeHYF9kHhs~ z*5VNVYKQ{IdQn4?d69X2`Z1P+R{}^jT117r8=M`xTy9(inLSY0##i2R8L`x@qugvHhYha;X_zfyFh*q;g6L?qG`UBi3tV1=@xeq z0r-kSL!^d9HtcyfRpUD;x^V%^wB#SEaGZz%OSgXdKhaM~M#-?*VUKGYXs_*4gYRTU zK6Tz7HdCKRRXGzZn&fySj)QSo?&!gUVd@4Zot@(&Q)XT;B%|jufe|4UiM}rTcKTUJ zBV?3#r?Q}sNha2>Dt4K=MZXx!eLv!2?GgcmqoiwLtsE`sXH3p(;U~_-8Cl?|5L7q{f3^OLfE_k4lJDu-Po-YS+ zPZ&_hD`|=?UXHi-i6K|XqA_S#eJDmo2$c(-=E+6GoPtdX^MUeB$Dqvsd*BS`P=c2d zZwTonG>qT)PPhDxfFs?+j`_jAML^I?EhBUKYC~#pL;C>l8A>kIf&CA}OPENK(+y}^jPdfdc*x`VRNXhmc0(gp>ui}3*EwD^Ham=mmnnbO#X?ki*U-bKR z6}uz)d{mkXEhm+kQYgGmp7Jj&=gzp-Ntji#XY&@{P&a|s{+~A~Tm-TVpj9yv64H#K zq9O+mPl&g$$USZbO&^V6J4o-h!tc>=f)f}O4&tJ5{#O3V-8Pm|k;gwl=JgRG?=QF( z78WzSyu1aa^l52ng$FOW_H00v?_a@-`J;jWmNS(7ZYr!6^A%g~`5l>|=dL&dzgPUQ zu&|bv7XPM(2JXw%)$Q$VRX})qZ=&IOuGv{5Q>$MTdY93F2I<_0;M3Dt^Ty>?KT=k1 z?#}TsYUb&E8^pxie7}xz;Eau4vt59$v4s^ag`cL|rhIYV3M)?U_2FV;XRY1s^OrBZ zOEm_{)#~{X7D4~CNc!2k5E#c4lfu=?WcBo;@P+u${oB)pg}tkgyx(4kpP!%qy*zSt zc|QiOtmtr)U|5z|VG0VfQZVzOo2-@&NqGdk*y9$l)`*3!CysA`8S7~hHVW0>Z*TFS zTR-#j_YDprKx%3V;q=<XAsLJYwF0XyHltIR_x5TzF)t3Iotnjj)?L znJt@#@lDZ7t-83nh6V+}z1%Gsd=?TKgu>b7`x^Q4=g*O|5Gb7`hushb{ViZ|U^$VY zb!3bb98|`&>az0lK8u=%pUei~n4G5n;3oOE6DM+cwIfXi1Y!~CSF6+X*)*@rI%xX_ z+V!NFDH0)yL-kwbqImtEV8}_5paog%azlDc?-!`ci|+SW#a!X7mzS5EE#pPdgwxI- z43mOz8myP14-YNvS^L5aMRq}40pPI=8A+)co4h`x6)Vg4zrr2 V+WjvHE$2TyE(7{12@y98{2#w!Jh%V= diff --git a/core/assets-raw/sprites/blocks/turrets/fracture/fracture-heat.png b/core/assets-raw/sprites/blocks/turrets/fracture/fracture-heat.png deleted file mode 100644 index 07c199f4ac7708858b002ca2de4a20a5009e9182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3606 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 UJB)0MAOHXW07*qoM6N<$f{~TIGynhq diff --git a/core/assets-raw/sprites/blocks/turrets/horde.png b/core/assets-raw/sprites/blocks/turrets/horde.png deleted file mode 100644 index ca27e01d2938063d68778e6f51d1d743eeb319e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1285 zcmV+g1^W7lP)Px(zez+vRCt{2ojpz*F%*D3RJi~W2M8rcNR=*-Dmefp6+ab$!h;7JR<1S7+6{?ltQb0Alhbh=sABiU6AOfm$L&11uH`m46udsmGU4 zLj==L!1m5Za{<;7%mUOPAFzyI5}+pefK>$b05!@7EF!1|I5;}5Rz9FTBU1~|f_y+T zf=Ymv{0f`8#0j4Y; z;Euo+fHK?p{$`VF@no*v=0ApWcEl1OCja&3R`fAB@+on1B&8xe&L4`OKSgl>Y58Nz z2|KV zUktqh zNJl^gpv=RkARnMazT zL`c11C=n=AR3CDHnEce<&fWWY@;NmI@v+EO732ew5l8_v<(KTD=G@YjijW*51q9_Jlpa`til{iee&Ip45$r;NQPSA_8jwUp|nEfR#@<_6Yk2kyM1x z&4aijumuRo2SO2Y-}yNaa{n$HijcZ<6K4dL04e!^AA$O{gNZ;rJj9QHxos9#gyH}g z`M~w%=}`KepNdd=l-g`>E9;(R91)5F+|GVvt-zlzpI9!g6pFxguLN64zP@1Ex*(0bUK|*XLb1pi@5usgvwL500000NkvXXu0mjf5~MtU diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b74eb4c83b..acfd862c1b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2,7 +2,6 @@ package mindustry.content; import arc.graphics.*; import arc.math.*; -import arc.math.Interp.*; import arc.struct.*; import mindustry.*; import mindustry.entities.*; @@ -22,9 +21,9 @@ import mindustry.world.blocks.heat.*; import mindustry.world.blocks.legacy.*; import mindustry.world.blocks.liquid.*; import mindustry.world.blocks.logic.*; -import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.PayloadConveyor; import mindustry.world.blocks.payloads.PayloadRouter; +import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.power.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.sandbox.*; @@ -2428,7 +2427,7 @@ public class Blocks{ requirements(Category.effect, with(Items.tungsten, 100, Items.graphite, 50)); size = 3; //TODO should it really be kept the same, at 1000? - itemCapacity = 1000; + itemCapacity = 1200; health = size * size * 120; }}; @@ -2893,9 +2892,9 @@ public class Blocks{ }}; breach = new ItemTurret("breach"){{ - requirements(Category.turret, with(Items.beryllium, 80, Items.silicon, 50)); + requirements(Category.turret, with(Items.beryllium, 200, Items.silicon, 150, Items.graphite, 80)); ammo( - Items.beryllium, new BasicBulletType(7f, 80){{ + Items.beryllium, new BasicBulletType(7f, 90){{ width = 12f; height = 20f; shootEffect = Fx.colorSpark; @@ -2909,7 +2908,7 @@ public class Blocks{ trailLength = 10; hitEffect = despawnEffect = Fx.hitBulletColor; }}, - Items.tungsten, new BasicBulletType(7.5f, 140){{ + Items.tungsten, new BasicBulletType(7.5f, 160){{ width = 13f; height = 19f; shootEffect = Fx.colorSpark; @@ -2929,7 +2928,7 @@ public class Blocks{ //TODO no coolant? - ammoPerShot = 4; + ammoPerShot = 6; draw = new DrawTurret("reinforced-"); shootLength = 0f; outlineColor = Pal.darkOutline; @@ -2939,116 +2938,12 @@ public class Blocks{ restitution = 0.03f; range = 190; shootCone = 3f; - health = 350 * size * size; + health = 360 * size * size; rotateSpeed = 1.6f; limitRange(); }}; - //TODO 3x3, different mechanics - not a fuse clone - fracture = new ItemTurret("fracture"){{ - requirements(Category.turret, with(Items.beryllium, 10, Items.graphite, 30, Items.silicon, 35)); - ammo( - Items.graphite, new ContinuousFlameBulletType(65f){{ - length = 105f; - shootEffect = Fx.randLifeSpark; - width = 4.5f; - colors = new Color[]{Color.valueOf("e8e6ff").a(0.55f), Color.valueOf("819aeb").a(0.7f), Color.valueOf("786bed").a(0.8f), Color.valueOf("c3cdfa"), Color.white}; - smokeEffect = Fx.shootBigSmoke; - continuous = false; - ammoMultiplier = 4; - pierce = true; - knockback = 4f; - status = StatusEffects.slow; - hitColor = Items.tungsten.color; - lifetime = 19f; - despawnEffect = Fx.none; - drawFlare = false; - collidesAir = true; - Interp in = new PowIn(1.6f); - lengthInterp = f -> in.apply(1f - f); - hitEffect = Fx.hitBulletColor; - }} - ); - - draw = new DrawTurret("reinforced-"){{ - parts.addAll(new RegionPart("-glow"){{ - drawRegion = false; - heatColor = Color.valueOf("768a9a"); - useReload = false; - useProgressHeat = true; - }}); - }}; - shootShake = 1f; - shootLength = 4f; - outlineColor = Pal.darkOutline; - size = 2; - envEnabled |= Env.space; - reloadTime = 25f; - restitution = 0.1f; - cooldown = 0.04f; - recoilAmount = 2.5f; - range = 90; - shootCone = 15f; - inaccuracy = 0f; - health = 420 * size * size; - rotateSpeed = 3f; - }}; - - //TODO implementation, better name - horde = new ItemTurret("horde"){{ - requirements(Category.turret, with(Items.tungsten, 35, Items.silicon, 35)); - ammo( - Items.scrap, new MissileBulletType(4.2f, 15){{ - velocityInaccuracy = 0.2f; - shootEffect = Fx.colorSpark; - smokeEffect = Fx.shootBigSmoke; - ammoMultiplier = 1; - hitColor = backColor = trailColor = Color.valueOf("ea8878"); - frontColor = Color.valueOf("feb380"); - trailWidth = 2f; - trailLength = 12; - - splashDamage = 15f; - splashDamageRadius = 30f; - - weaveMag = 5; - weaveScale = 4; - velocityInaccuracy = 0.1f; - ammoMultiplier = 3f; - - //TODO different effect? - hitEffect = despawnEffect = Fx.blastExplosion; - }} - ); - - acceptCoolant = false; - //TODO - consumes.liquid(Liquids.hydrogen, 1.5f / 60f); - shots = 9; - burstSpacing = 2f; - - //TODO this works but looks bad - spread = 0f; - shootLength = 6.5f; - xRand = 13f; - recoilAmount = 0f; - - draw = new DrawTurret("reinforced-"); - outlineColor = Pal.darkOutline; - size = 3; - envEnabled |= Env.space; - reloadTime = 60f * 1.5f; - range = 190; - shootCone = 15f; - inaccuracy = 20f; - health = 400 * size * size; - rotateSpeed = 3f; - - //??? - //limitRange(); - }}; - //TODO bad name sublimate = new ContinuousTurret("sublimate"){{ //TODO requirements