From 5bb2df5b89886602c3439c4798cd4992f5cfc454 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Dec 2021 18:34:29 -0500 Subject: [PATCH] Misc turret sprite cleanup --- .../sprites/blocks/turrets/cyclone.png | Bin 1722 -> 2212 bytes .../sprites/blocks/turrets/fuse.png | Bin 1587 -> 2702 bytes .../sprites/blocks/turrets/lancer-heat.png | Bin 364 -> 328 bytes .../sprites/blocks/turrets/lancer.png | Bin 1158 -> 1306 bytes .../sprites/blocks/turrets/salvo.png | Bin 842 -> 1070 bytes .../blocks/turrets/titan/titan-preview.png | Bin 1347 -> 4428 bytes .../sprites/blocks/turrets/titan/titan.png | Bin 631 -> 777 bytes core/src/mindustry/content/Blocks.java | 4 ++-- core/src/mindustry/content/Fx.java | 7 +++++-- 9 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png index a0e34e20e72ab8dd9a1427f8962e94485806f94d..d508628c50d7b851dc5f91a2b6d9d4dba368f693 100644 GIT binary patch delta 2201 zcmdnRyF_q;ay>`3r;B4q1>@Vfwku>pCEA{=El^@f3W_;sbjr2kR%YU!GAFL}U0g~^ zW=V=0FFF{Uz4u5>D9Cez5Yw$C0V+Ea64lLnmjngR_z|z6vEt>HPp5=`OnblY`y69q zYvby)vy}-q=6;@QY5m!5_vX!;H@~^JYQj_{1!Gr-w62CTJ$?u3Cui&DtY0HD&meYx zS!wL&kEOqC{@)3neD&(pms_@O-I_gfvbuj>^!xx@^~FLCJM4Ivz6ovNJAImc$4sXS zb}5JEi>=NIw>4iZD8MD|ITUg&pX?-^2ykg_(z|7dPM!-(MWHQ@no3~tV=P504JJ4zVZ>`3gk|UWZS* zes2H1$FpQ_l;3}Q=gort@P>tt_t*Z}=;_CKlcnVlJ1<9@2!o|+il6|ud=W=OjL}xqU#bh3QhPfIz*C z&<@^K{#;g#6B1E}7BJmvD)3n`SVhA@UHryud^0 zZ#m%^;T-n^IP3l_kYM43A4DIGK z-!huga*wryQ{E(Csb9l2(PQo(B2>O;Ey(^+@8FCs>Pu1@((zc}P|7Dz~K z_;!8Qqu>3GPWen0$FBE=+Wp9@|N8LxexL8h-%J;k58&X9_?;bl@t?sBB6d2n7&ts7wl+lk*wDe`pxP7Wpj8tQ!uUY7 zC&(f8$A%M32UL3e4xGQ;u2$u;sKsweWzzGnwps!5!LPYWV~;ua+G$!Wyng+w%ibD+ z&GEZ8Kgx0Fusg)xyRiSb&FhIxR)3QM7W;ElPx|sz`}eteCY_pQ(R5~;g%51D1!^WG zzer}xUE|L6>Pxp{ubo`%c{`O7p#=}6*H}n1Y<$3TcZI-8!#9N@w<7yRuDld)ma0|Q zHZNB7jE;iXzJp!HR}Z=^d!S``??=*-Y5cKsRxg>x{>n#lm&XiGhu9y6=j@6Lu1j9H za!k?UO4{T(9-(Wv`E!0Vi#0vE*O|FG%NJzF)64z%FoX~HRGA; z!mSK@XKdrN`P{3c*m{A%R)$s6Y@g?ar<`FQ z9e-PWujPHF<#4!t8>2W!_v}ZoWwM%rJnz@7=xXIg3m3UXT0~{Eu34|%>BST_Fv=F2@T60 zI`c6mFiN#}N*CPUuub5~tvde;zlt61vPOVxy)b+8#SjMd;}y(LU1Xon*|C1fy%y&m z3mPk(o?c6^JGz3ULUP_ZCXV|GH4nm6OGFv$Y9cfk4R3K&e7q`O&hz*%dz1N&_w}kZ zKcCC)R%wY#Y-^K!G)*W#+)iLu`_CyYN()v=?PZ$P!q2kqg4pB$788LBCN&Cg1h%xR zh%lNm#aVyWjxBr89KvDMrgyyBDNDZY^nUghzDURBFIxl|T4W|WtnIt8>DUTB=j4{Y zrlg0?^O+hJI6Gd7bI-8!FJo+xw*F`S;&HuaD}OCF!=Y;incfG>8B0^d8Ccc`nd!$y zJd&UI!)x-cKyf=BMFx&L-U)Td$;q9cEo)Bt$uIW&VZg=ca6+x|LngDzjh8)Y4-W@0 zHC*sLba89&<*#3aX0`Dz7G&_SD0}v&WN}Zi`1&=)x+~9KH(bKt(8Pb=;m~q<*~~rj z473>Q9WL0s-uZrE@7;;{-3KT7`7mu2s5+&@x_fTG-2aN3!`*}3R1cIHviLsOCAcN< z@;3n%*+~w&FNOc;IlX#uZ_7c}4Zk zud({!<#qAbZ-y0<7d(_^@qJ*Hf5GkSvtWT8(+})1boo*5Hn%16Q2R_42OlS$n&u5} z_qBhERGHCWcZl8g&zB=AXQb@T=rDvh#r|-(aHnm-H8-Y*!h7mnuLxEjHVtBOP%Yt< zx8h`&d_kq=f2D$(H0Oo%9|snu2Xn?AZWm)(rSV)ZE;2sS(x$U)#j32&ms(ZxW*7Xu zb@kTAo~KWl%gj$6t3T%U`1t)>x1!=>V}0|^U)&npd)#}Yd1#Ka))upe(knmO__A!_ zyzk*TBXy6&Ue1PqjLj|iEysdiv6OIXt1LWSp;#r#(DF?E)~*8)EAK{oImjm}9`ujh zrt0#Zsf~eimdKI;Vst E05)6RCjbBd delta 1707 zcmZ1?xQlm!ayM?}BKAp2PDUT_Q_Aa!xu|7^L`=Sz(q(`rM49 z6XFVsN(;+1C$-+)J9ql?)UvX~f1=yO*748xOP7L_`gfm?=X;j6e0^Q{y}kQ?Rp*sSN%gut`muiBKfQ_f zHZSkjwzjr@vuAZlNlA-U-H|}MEvv3(g*{uo_4l8pW&3lb&ZY^^I=d`1F7`BcgO2Bn ze&5v`3PtP!Q~y-FoNh9I(lY;gfklQ79z0-}%Q!jkqnX_#J+>Qj_z@Kr{u#@WHk&-Ur*J{@bDQ&UU)g1^b)L|4zoq zO;6H(Ut`5O!E7Ioz&W+BVqJr!J&eodO`P(H;UPSpBs zD?cA!^I!d!)eETyyRV2xisaugJaFZ-;ncdzi!qrD9WxWC|v$@G(SxI;|qU zcV_^z&FT*f7RobcZXk3P01^}m62CfZ&drk{_nr5@84PK?Pu6@FoK04RDAz?iFE6n{4eba zN0u^AGPC!tHxABczx!GA%M%vO%5FxpXU~_;T)F+;r$?*~6VLQN;coh@=5gpviSc5t z6Nhi>2VOtf^nr1nMee*g*BU-v-ZnXC>UC{ThK7sx_FbO!kf&kF&#&$`?~2S0pS1qJ z)Z`OQ!5n@JJIw4Soz*_M$k}0g{_*3-Pt`tNp3A^crHHLOV@sO%nG%u z`Qoy(xTr{I>I@HF3H#h?!}+Uz>}XnWFe6{yt@^i8<;0vOuf#ePJ(iU<8yKgoe6n0M zPOx4Nk1wEdpAiAm|%!I^LW)W2)qeOP|^n)CG^vs57JKp(E57kp2s|Y zXWzZ+w?wVIw%}^k#C5K$0TG|;m7nr5cAVYtIo;9jO#hRGY75ps6lw7PtX#Q*Q^S%u zA$i|9nUm?(cV6#kdBEZ@@yzsH^Rzi~7+%)Z2%eq3D^H54ScZ||NV?;$*2~MJ4Y!_* zV7Os+FZG{Pubb-hLWiotVga67l_OzKtV9%Iy0h#UjM-Q?Y(6u385zG*>t=2ER4+Pt zw%X<6ZazxP9M9srnHyOg((5ACjs`7x-4vv_fbqtZKeIUwrqwt#KG5MdZ)RT=y0ZF+Zq zU!U*uC^6is|K%4;Ru$XQc}mxA&Jh2!O8RR3(nPIPGvmh^FO##>x2sKHOgPi8a?`r# z>&{tw(r-;<2sqQP!g%oNn+!jx5RMlT2Mq0l4jou!XZvoC;$~pvNHT5|>J@ii0Mw`$ZQVV9YHU0J2enm@CTuX&v zwxz`?{T21ALqa%OnHy#@q<((cw4;l|QHCLX&V;QI&Bg_%vsPK0&r_M-~KtRYaM zovI;F!mPu^BL0loBB#kfAZME9NB1M1i3&T6s2nY$;inaI=}yqTkc_P{_E3(rNxd}eK^Zs zzxdMOKk|li&7N0Jwby$tbbHrbJ%+-gkI$U(SsJ%~@j1nZ)jPKN=TO>qE1igCa-y-Ebpw= z>wFIVxl!PvrRGEtR+&nmMvZ|-b=jJ9j$Xou8RlxYi WvQgwy*o9} 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 delta 1571 zcmeAZ-OMvVxt{fxr;B4q#hkZu_h-wviyZe)C=fQ-QC8@!u%bhGs^*$gp9lilvW8-LpU`}O<2-tUEv+#Jpa*mxEwE)Y59 zuU~(+@_+ryx97WUpI^Rw-TM9V%(*e=yIUSIc_})0NIiXi>Y~Q}sSlZoGTMSC8AwfM z(mC`=>)_l5izVyd-Q8OvyTHiz_1y1rsyl=yI4LF0x+d1X=$sAkB`kQw!UPyg(V_g?*w+AREG;X^Nmr*CrKM$}hkbM6!j;4)p87Nodr z+xf4XY&{JG9p=6)cs-eY_4fB4zh-@XHh=lauUSGC51Gxs$*=AEc0NvC_WzFB@2?D> z7Oegpq`HFpLCgGKK3aKZyhIc+3PE}S}!FhqhKE_?i zQL1i-Up}W6lTO-p&sB?M>Zg3znc4Xh49>)aPCT@jCGUrL=l zJp7v6esqK|MLTHLxF{(u346Pz_W#kJuNOZ){Q0^-317suOG%4N(p7~bm^2x-Y*#+%lXiLm&nXhH;sXW&K z8D1N>MKomybZRP^*|OOW5JDJ+*iHb|VSKTxH!uxwkFpXJJ_!rl*Rl2>ki zS=7Pmk!HG}CF+NV@1e5je9d6hMJy-Rwux~nG3o|;t$3)sHIjdp@aA)?%x>w7ken++dI}^1 zn|k4sftx<(v*h|ix)0k=?+`MPJN82HV2MwJ@}C0PtjbyZ$r0WL(!$qx>|?fv>8b1R z3;7&t(LKb!{p3`A&de<=Ukwvae^@J_=~(MCqbW3g(NpnZz^k}aG z$Ac|}LegCmKYGBbx!~4oS55PyBOY{ z+^f4;+3R+u@4EWjqfev{y!F0fRV2hYZ4^^HGWXI!4Xz>DKynD3mvDWyLgriTeE*LR$#(0X~|D?z&pYb8&; z^p5aY@Gp0J+(G5MUyO#cgxvn0e;|~{%Al}tpI^W7#=~11Rv%DGFp%kPIH<$K_SwGf Y!i?&}PhxNi4*Kig_QGpB0x;&iP z2RS#ieyl$DFP@{j>{;aoaY06g4=Yv$ht8d2x+MGY|K9Xx{fqg$8P>1crOZ;v;HUFl!#k!sG0z(gZ@z9^ymsBuN}-y1j)NC%n$|Zw)%dgJ zr<-h(NyEZt(y1JG?b$9`ANT$6{qFCXJ43GuE!@w!FLz&Hn*w)2&gWh&mU&DJ3=5)P zE&gDq6vlk|+{~T9SA-R9IPcB+|LfLD72$&G7cN}QKPM>IzMY>($0EX3X@%?%f&r0p}G4u hvN13)%y`Fjg*$4~nJuS985kHCJYD@<);T3K0RTO*k7fV> diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png index 5b01df18e62cdb5aa42ea3079eea03cd2a23adc4..5c9cf079f53c914cb0993b03c6b612d0769b19a0 100644 GIT binary patch delta 1288 zcmZqUoW(Ukxt`^rr;B4q1>@Tph8ZG`B5me3mTa)ttsy3;BP6gz&{Zc##QLHax8Pf! zT%C2hOazbkT|9TpEw`yus@YLMS4T%g=MqQMOt%fe`q`3+m8>1FkHL+=-Jw{@$O=2 z<$vb9W!!u8UqbELy^#w|8C%pVXEtn??|$@V={J=vN)CsdyBIROogOolRCtIocEo2yIW1=Do4;#g@+oGfx|{EMRXP|BF@K$= z#(va~rNP6Yp`|@mnPI|*KR2uQ_05oA)Ty+u`DMwacBA3;{e50n1)}-0{byB2WIYj6 zuo0iDykSzYsbD%c|Bs~%!%R+%>+5txo}W9@%f+q8&9tDied(Hdrjm*c zOnUJzHdeFqG)Wzb;(Q}qo@aLb}Jokzj9dZgcGWAlW{^+x8cz6BopO@YCuWNlp8Sn5#Ih`wK zi#*0~NH~b4<&g8#Oo1&d`<_>MtkQKjRL{(m^lzGiuT;k5`7r$7@lLSp7q@S-k?O01MK6;C zML(VARItflw3=|tuer%?UUZYtE7AW`7&!SYSsgr_)S2Eea9G)NG&sBWZ+t2Ait)|# zIEVUz#`oLQuSjxe_cCfeWMtgC88a&DiR)OH%~BJ@w~QCb$ZK2 zmLB1MXRqzqnfL!C#C8j*C^$L?95)oR)^IxYMnF`co{N7TLs+@uo(~DE42+yoO;z3M z45w6FSdU!$K$+@u6vIf3YptAXv&cJ9V{*b_?ih=QKY9)t8fN4l=8kfj`XNAz z!Aa-^ui-l#`FR^{PXyJgH57kvNx#kMu^{5qze+_b944$rjF6*2U7@GjfA1|o@ delta 1138 zcmbQm)y6qNxt@WsILO_JVcj{ImkbOn4xTQKAr*7p&NB3fc9b~2KirFRML@?6Grg|K zY^{1nHA{Q-*2>0|WL?S$eeoEFj7bgZCw%@=1)0F)= zPi>#Ze@oBU{@-%*OOX;QS?!zOuGRn8@>p|!UGb_b{YQ@;J@8B2Yc1D-F7>A_N)K;1 zTQ|;Mc>9X03LA@KxB3PjgT^vum&NCW{5@2J=2-~`eh8`V7TFneFgWfU+x>W(n~T?# zd@1WV^g~3##7Fu7Z~e*YEs6D)7$g&q`CORC{Nl*fvy56zG7KADeAC*0e`Q&3=QWNK z%l2>5YnSxBpKf_R;8=x_PI%tV(%tqvWlOrvm{Z)^Qk!}z<^~F6vY5QzzN0ixxar7k zXY0NDH7-nIc`3*#^ln+q&eqS_e~LRePnOATdbvJIXwfFdH3mnxuCv}{7j@p^ThBQ8 zQK=v2QjP;^3lDELWccxV_r5u`_kP!#{VkX~m3z`#o2WIXwpC7%j8}#3o~30V!g!1(rYKk$8hNpr;V^dZSYCPpx^`Ba&N5H z`*Lda%;b!F`Cna_8FJR}9RA(E-0KnNPSyV<^&0cuSW0UjzIOI(@B4oSs~Jx*+}<|x z`uEk`3HHL>><`{Eq)t2dw%Izpq~yk@dBJVbTwC*6DjtS!gHX-)-l~I|62BnZ&GV}nCIM8M>2j9l+n`1#?#hRlZy4Xu^gN7NjrRLI$U zbllPUNkFH4MaEHygczIpgDsq=PA@pw+uvazt*pvi(y1Swx3yMrRhHBJI;G~nc?Ma( zk{oX2x0ee2w{v*vZ1w%;t^iYiOD49HEd~>X|NCvYFZ;s$qnpQ5=Vq080yo_<@?M=P zJ|Uno@4K4E0TsVMr{uk=LK(sa>?$ib7WgJCbhc6K;beL9Qs9>hNNM)29dk-tobIkU zzdmwjkmJieeKR&hYZ%^sFw?-!wpol{VJ5S|M2Cp^@ssW5Ki(LvvGDdJTk#OjrbFyI zj-D=wbGE*8J}8!LCx24!o-R(Vw;A0#X3Usz{BZruIa{o+lq~LKU|?YIboFyt=akR{ E0Bv^~@Bjb+ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png index 4904a913a57eb17e063edd033c91126a18f6dc65..77d2e39b935033d72237e98e4d68bb57018bf128 100644 GIT binary patch delta 1050 zcmX@bwvJM1zYHwv`8(+Xi~4S2Ec7kf(rhez|>Ez*L!wDP=nw65_H zx0+tvKGQn=T+N-PO7myW>dx%(KX+!1W#<7G;k#L(r!v0$eQj0G(8HLpbla3~sXOoW z+?&3F;nrKTw&lkU^j0dcGcagP|Nd;_#*Kn&{mYX~F6C|C+@5^5)cmPG@rRv!4j zAew){6vYMJO{XOIE-D|G!hYo1T6rd6hKRI%=al8Jy|6!{`^}qV)3o4vB9x_R#KJJzY zQ%27B3pd_no}YbY{&^FLySpmCT@8C!DccgJuDJc72;&w1dCUh>;!cP%NjAuE_P(9B z>0!A4e$DsW8y6Vc*M4&Qxo?Jg)LfPHIZOw&n7(}vV|;Ozd#A$&Q~fKiR36VgyXxc5 zO>5d4PVNz4XSxm|BoF+%r*(7B1YVZ#&-G5*1Uwi*p2-Vc|E|RG+?cmy{kA!0uP@^( zI&LQ5!LZ|5Yl%SD6661$UpV~S$HlZ%R++)@Bd6$0``2%>%B#%;N}jpi@@aMGWP0rx zVBR^mwCwVAJprF*tsw#{b~=YWshMTWQzAXr|Ni{t>z~Wpd&UQ!U9B?v{>>$CMc0^# z*eP<<&wSOOc$WEFXTZCIQ;r;4dO`A*%>xNWt(S|O(%slS%578Uuy-bbcd~fdHiT9btYkj%Xa;-6M1d`8FPNFG+l0ntH7VV> z`tZzu)rkGp2TZ=GmdF>(QC6_NmYe=XDR7?Z@_jOvjP(J&C3XroYz~VuNgp`<_4ln} zJpqgFT|t)aIt+*YY(86lE8D`&;=4`M{(0;>1bSXC*~7ES?&ll7fUpyL8w}=OZD0R0 zIan`2lyTRF=PpdH+nzE0_SmqJGb}5+J8ITG#ey@;*W+ha-ses!Z{&aWj;;NGsl8P1 zrG2a`*%=NTJ<7^Z|KR&mkJ)KrXE`_JOmpx0dGluEr_T(>v^H$mz|bJi8PjUOZ!rDf z4FRW_>^6VT2V9)KWZA<6DW+wd=P#Hp-t&fS=jvw9g=d-NwjZ|Q*t+$o*XPISug~dS zpDjAqGyWOl`L7I;PTy{@9V*&8GfsQ<*G#(^PJdF4UH4B?o0YL>&OgQ-!Vk|ec(vG{ RW?*1o@O1TaS?83{1ONqF=?DM- delta 820 zcmZ3-af)q%ay_%4r;B4qMcmuzhIzLg1YB#+e_^}yTO_ZBDYUUVRHrL!QP&DvPnD$;;k0p)s%%|GJ ztp{5A&Y5dBG~BG+m%k$gg%X%B;o{F_tPv4$V2u{4Qy!S>D>Tb{9e8hFzdk7T&-2sA zLzwC}v!un>$1Z#I=V{T*Q}h2{(D*ZpDQxlwRzuUS*6%DSLL6@nx-%(p#(%ciWv|NE z($6wQMc`JmKIaFOj)pv;5C$tp!F?(UlN<{8?SvDa{X1MfS>WJ(Pdc`B7v7d$IyuP|a{dC1WQ}$n-#Ika81&987r9E5) zDmuys^js=LFDNx$P_4*SVG#PoG2sfAhOVrqLIvA<&kmN7-q>5h2bL~=YRq`^^E?*z zf4Beh?m99#AXqQ&^vzq(ZybGSx>vP8Z}#_HQhQqD6ZPV>#QRwamWBM|EWE!?aZmW6 z6xDz*rs}8nVx8(Q1aU@cF?y?Jth`en#t{+Rg%*s{wOj15Up6pa_*X) z`wtJM%2~+|pU(PF4Dx~gLGRS#t}HK14?g#L;A0Zbyq-xVmi5N#%P+5lI+e{=-SGBj z&9>EkLV0{uE-YuJUSPVzf>bUBNYo9c(d4@~!}2wc%_l;=Ayu*a1tF_P(aQGa{e zgRMdwHY$7C9+(Po=-TS+X?rk}rHP++z2c53#*rL$Jb&idCO?&zaQ(`6_Vm8D3=9km Mp00i_>zopr00D?{UH||9 diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-preview.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-preview.png index 76e37a9534a8cc188699ec49fc710311478a0f45..6f02447fc85646f230e9192809bb573ca4f19175 100644 GIT binary patch literal 4428 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 diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan.png b/core/assets-raw/sprites/blocks/turrets/titan/titan.png index 0af33e57c2110c5064bf711bef5ada6b5139be13..74f1fdb72f318c03ad9e1877133a9187c6f88bb5 100644 GIT binary patch literal 777 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^S>E_k{)hEy=Vy=~ifIY6Q{ z(LItud%+ydO-vdZnKLHYUSMLKaw1Q2fNtiST|*jwE9_wM?4DWNF)w1*zB(Om%e}hONq}3>q^%MFi3E` z)8Kyarsnda15xkyJz>cF(P1jUBmes0jIGZif*SsP5X_d4u({@JaW<-4L(;*n=74Q_NZT15a41&rk+d^9;NkFN{^1j6@0|pB z>)jHDW$&iXOf+Bau%Mo=!{W~rrbaG-${(6$OuP%)9xk83A<{6bZGMuX2>Xh{ADV1V zg$y|^w-!ig|2=nt!QH6Ag1N&OPDHC5*j9T#=HCxJxwnby<@aTk?JsW^7phzB@?WOm z;o=O2etDZ;>}-j&s%w#Aj<$zk`2i~&w7N=_|wC<@~bux~>`g3300U_3@-uY}l$t^O*$%vVNBy*}Xo$i(fvF zLBQ_P^`?Todl&J@Ut|d2;O-^#`oF11ho~)l)J3&kE5u?y!b5SK1W|ialmjsg- zwR-NWD3|aX_y)gs=FzR=uXw>B;MQQk)H0RpL52C8x|=_@2Qe<$C%CFtUzA7TYiB@V z&B_dh%$ppc$EW)+ZmTuk=F)QNvG=8QuN^L%WX?0c|7ah_{cG{t?3Qz_nXVw`eJ5={ zyTC(#>(1u-e?KgB%VPKK`?v4J_nXzfa<<0R+eSZ`oqOP)@Pj{BA1@O!&&h5$_1OF! z$2JD#p8FQc5llTMb&tC)*dFM3Y~II_D(`9|!os2KAi;PD>PSHa9iazrAHF`4_`c-R z4~wFh>V~ez=A9hZ7^WW2zayB#=q9nh&}{>YMCPAk^`Z-_8w8K%%LrCTN`buy*8Sp> z^P>&rR{M8#$Xu6O@aTuHQj@8}(~r{SE&t{V->WzBOzyeAh2#8v`I7(6VdtMS*SSk{ zCfA&-;H)a&D5ZAjxxakw^Q^t>Jpub=$eP%5ek3N0T9h~aQOO8+HVwqqhsMW*Iz|d63 Ycrkj9j~|2KKTwo=y85}Sb4q9e0Oc71WdHyG diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 99960925d0..a8e6d18c86 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3074,8 +3074,8 @@ public class Blocks{ consumes.liquids(LiquidStack.with(Liquids.hydrogen, 1f / 60f)); - range = 360f; - size = 3; + range = 390f; + size = 4; }}; //endregion diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 80b5bbdd7c..febe24944e 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1732,11 +1732,14 @@ public class Fx{ }), lancerLaserChargeBegin = new Effect(60f, e -> { + float margin = 1f - Mathf.curve(e.fin(), 0.9f); + float fin = Math.min(margin, e.fin()); + color(Pal.lancerLaser); - Fill.circle(e.x, e.y, e.fin() * 3f); + Fill.circle(e.x, e.y, fin * 3f); color(); - Fill.circle(e.x, e.y, e.fin() * 2f); + Fill.circle(e.x, e.y, fin * 2f); }), lightningCharge = new Effect(38f, e -> {