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 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 BAt?X= diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 16c3d3991c236bff2884a1a89db476f8d129a27c..360262bbcc5efc39e64b96411c3389bbb432e857 100644 GIT binary patch literal 2702 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 Vm{j;&0JQ)B002ovPDHLkV1fa`(o_Hd diff --git a/core/assets-raw/sprites/blocks/turrets/lancer-heat.png b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png index e2a5442ebdfa45a7aa45e73e5d9aa4325ce8d4bc..11598161380176aec6da21e44d74de9414943285 100644 GIT binary patch delta 288 zcmV+*0pI@Y0>}c8F@FL{L_t(|obA`a4Z<)Cg<%`935zfX12PATFbiDp1*vJ;D(_Xw z|6Oy4{TfId0RZs${5We!*T(;iXQrhV%ce_T-4TL(!?h!?4&kEQ?2HJ&U4R<_xC?Nb zJ^J7_TUV>Is#+q%0jxD&lp)9h=znd#s6v?jB?wH;aSgs& z>zR31)e@n<2AjzVmb)e@nf1)9wlWeCbypsV?! z3PBRU*5->Mgy8|~ZN7{SVftzC>ezJYs~$Zqd&o~f>qx7wzzA^wJq@ZukOi=%F~><5 m=E(2b@t*(y02u%PQ}_bWxm}SszpEht0000h2a@QD+E^qMG(;p1<=ezR|EkS5YPiH z3<)d239yCnd%^x+2#a>+d9W7|0RZr*s#8^+oHe9tU>?B-(F^QDEm05<|~7vM$!?gHFg=YYer*E4giuElv0e18bR(L92$faNIswE0FI zf;51k<{M=Q-9HA=JI77%_uc!MxmDE?p}z^fZN5>4APZn@^NlJ5o&o>>pj+yr@IE3| z1Ix~txl_~=Av_7*n*aLRsU#C{*U-?_Z_W`Bib)yKmhIn+z7y3fExkKy+LOFIX*j9Yc5)iZzMJ#L-JJCuD z5$#NEEUvmV5yVc>&c;SjHFm5CPDIgw_RIzp*qRte^!z+vCAh0M^^$=B>?NM;2yx{G9Cp zy~X}ueXYG&p)~=7CwZBGw;zk*?4|Z3v?4&lLy7=sOG4uUba+S=0BuNURDcZ+KV}z- zgS~CO4$))4@_*ocv2Si}xL;^mLZbqXpSrPQ$^!y^+3t-bhycO^^_C_F#ZCl(NI-yu zhg~B8knsH3d%ljC7y&GKKYaQ*3MSZq+uy!Q)eu_`YfqYcSZd@JAUqeIOTh8PqOs?M z>;fb_cmmF!{5c!|nF%P@t}GPi&diMp3n2>vpoxd2tbYP@c(4L4U+A%W2MmH5!deOJ z6LL$)D!@MJX#rk%umXU!2_QUZ0XmSzPJ@Czo?C(v>J|T# z00|E{1wcqbCj#sM2s%87fI~-*vFQ@(0qmDvK!0$7@3tq@83-$l0V&}D0kQBv&=Axi zfzTSZb4eImKx%kk;46cWF{tN#fhCuOu>_10{>|3By=E5zmch)>l!RmfO@xOO0nn6$ zBmp_YpP1hoz6#@Y7{$I4BWMWfa`%K%0bY3UR(56Gp70jC5+oo&Lr}*t7CR_H%Ipvo z5Pu2}o&Z*NA-wQl1pomF8iIO@CjiPMLG3lAXyKu}Kt`-QUb(3k+w5L? zhgsZMLIP65LskK-_qq4Ecn#YuTP?N+5Px2y+jtT@0Z6m($c#YFVaX@ z8y;*M0uV&-1lTr&7ih~lG+6}b@Pd_KFAPM07aqJe1Rw~M3DDsM+Hww|wg4}@pe1-= z5D*FvUK=0)L1F^D@B(c)2hR2J~= z_2U)09QGtgc!7(SV0@1u$Aysg5?=5mc;Rnf-8&;~JfcfsD3f5r3tTwi_>93ZF=%hY z3tB>z@K7oMLK5f=G43oMp0Pd1Qhz3ZbMQoG+X+aZSjzr+AxQvu5@I~McY4_M>I&fg zrNksyQo}>C07#V};i0TetOw{IsS4A1|o@ delta 1138 zcmV-&1daQe3Wf=gBYyw^b5ch_0Itp)=>Px(KuJVFRCt{2nlVUQK^VusS4s(}P>8rT zE{c-|g)YS@b&W2q9b9y3(ri`e=1>sKnChmBL(?MEtTvPAAXu7AVwTvYlMjR#NC$ac za`C-;ckjNtckdGL{Xp>Ez1+M1|GxX~-X#DrF)=ZZ7)x}+(SOmAQo}#Lzw(s7Y~?-W zU-oBcxBoe_=@fK29V^-P)_?f4<0-#>bE?#j#l^+I`X@@Q3c!jdH4Z5}rB}QSelIixjz1!Bbw&2H#&i*`uy>^md5C_!Jm4 zOdG%rf605aVSmy98DYju(4GV6#MR9KDuNsUu;}(Gzu&2LjfvI>$fm!tE{7RS-)A|` zP{w!?ELU#1b-OqWrB=&oly{J1T^orxOHw5g2dZHJH5Xs(2@k{5eX9R zrd+v&^K1NbhzZGd9> zzMOsD`+qk5aGjM4lI=WNtje^|5&`t+AD)fD;n^58>owmx?iNpzTk>Bkp6ofvb{^;h z69CW>1=0otjXn_$0Mg^U1N!`98sjqm<2s{zUY+qRk4_p1wFKNE`w;O_usmci|VJ7;us*z%rJ zhFc1?ZiIN^b+UbM=QLUwZS4sofH(SXn)Moh+4p#-(aKm8Bh}Ci36I5{KW}^gyXQaQ z;&KvzA)d^6Ug(qh*>nm3_}gKU6gl-w6Woc~dVlea-EbGFDX^M3W?hy}c&vI>_D9tF zri1K@lJ=J&74ZaB6NH@#K*|8t6mTQ6)TtseNp?w${8*gk{5s_+mn$_-d3<`tWOr}| z@J7Cy00#~d1(gxp)G?1m%@L zDSruGTu%BP$P%oQ(7L-yUppcb8m){oF;W$7>}aG6z=SV9z5|uxP|f%EQhFQ#TZ~*Jb%H23Chc$$&HVQFdHK!19XWmS8la^A*yOZ z-+m&4{cbR7`eH!XZ-;df|2{zFLpt~Qx==MwIRXaBgfNj4|4y*q9q2dlMo8sDgCw31 z*+yt?>dJG-5G0=WCP=^}PEkT*y(JQ86EFuPs0g4Aa4Zuv;iG+u)fnK0SjL4-LJJfWei2wiq07*qoM6N<$ Ef^Byi@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 zcmV+#1m*k62CfK@BYyw^b5ch_0Itp)=>Px&=t)FDRCt{2n@vkwK@^7HNQFX!bm2z2 z5~Q07{lFrKlAoa66@t)>E$J>GLVtk}gzhR-0)Rqz2LJ#nm-ptev9S@YPj_N8(r&l2hhyD!H|Hvchlc|fZ^%!SY=+Q-yLA?@2{dc!n>jY z7@i)Jjm3lz1%H5zd7)Skf&-Av7mam!c*KAZB@d95g-|pn#89bu!2h6I51^DGpi6?v z7!J`Rz?28X)~z1`69BOrw8;ZvsFVm$K`1L9C~XLoJ^KrlItTQ-gVHlWZ+SrXp?VhsXS5Lnw@3(=VGe3RuM)|&& zCt95(XPg4TDgyTRRsrbE3%NkBH80faB;%dUs`2@B2k_tr@kCH z0e?_UbUq;1Ji`?N8^Fu;``U9Z5IFaWQaMK~0K)vU&3D>sI7T@4JX*h=2e=T7>!iF4 zsy_MbPEc0Jy?`*E)rYV7V^c0*6#=@i=R^WUw&nr*NU*61R%&aDTAIEgaLfbOUzvH| z3uJeJ59aO$hrl&I8jaGv1*r!Bz{SM{0Ds{3&`CMn-!f&U*-YN^#B<{_Sgo(a=n>eE1UIcKA1xMWX9J|VkVksqMZH#xD(;d U07`^E%K!iX07*qoM6N<$f(2XY2mk;8 delta 820 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 BM%VxV delta 607 zcmeBV`_3{!xt@WsILO_JVcj{ImkbO{hMq2tAr*7p-r49U5-8L9(fCkygrv?JP0idb zTU7Qn9T47N!-^#`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 -> {