From 5dc1e290e8bf2d1ed224b141d1277a463984bdb6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 14 Dec 2025 19:36:42 -0500 Subject: [PATCH] Scepter secondary sounds --- .../sounds/shoot/shootScepterSecondary.ogg | Bin 0 -> 17182 bytes core/src/mindustry/content/Fx.java | 35 +++++++++++++++ core/src/mindustry/content/UnitTypes.java | 41 +++--------------- gradle.properties | 2 +- 4 files changed, 42 insertions(+), 36 deletions(-) create mode 100644 core/assets/sounds/shoot/shootScepterSecondary.ogg diff --git a/core/assets/sounds/shoot/shootScepterSecondary.ogg b/core/assets/sounds/shoot/shootScepterSecondary.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2619ad645406bc0a227f0cedf05b685f6ecd82d2 GIT binary patch literal 17182 zcmeIZcT|&4*C_gg-lZfo0qIgg34{(BdT*guX+fGuZwk^0Rl0Nm=}o$Tfb`yxu1IeJ zq7+dqH|XzuzxRCitaI*KXWjqKtjT1az4y$1W|x^glZp2I`+5Kt@K16!NFlhclC$Jx zftWx(4?S!gJ+A>+fG_C!8~FA6_wVcP7LfLJ%YUcqme&+^jnPq*_c28OLrTK_+Z7x` zVeIJUz_0CbpV`IH#_$gVW>sb(K_NjwF+n&p7ZPRXZR_ZIpIOn>$I;`V>jRXl7x#6~ zw=f@+tL;NOl!uIlwU4ccD8Hy6KTJ^Yx}(3{gK+sr5HbVh1)Kdo&XY~Wu7Gu#dW060J}7h%GS9aX0ZiTkv- z6Fl-I9JRztnek(E*CYsg&N*#eOBzd@T_?CX2uMwEuVsW#VTk}EuL~PAOC&9(h+^;< zVkyn>AmS;@4hG|afndxq0p%pHY8`mAj$wS7UHc1Emr7(> zSW!=3(*TpaEsT6n3qIZpK7l3~5oRrcCM^+WixC!IBdlp7|H+quAHH7aKSO5*0r_ka z>6_eztn`H&5{1~|kyTiL-L*)V36oj5lV7No*gMrYW;Z)jHa{4xhmO{h{2>8A7?SIh z@0eBc|H}3z>8SsGMmP-d00@jM2i+M4-Psk9?1LUq{67*N0x&v7Aff#paAi;UprFpS|b1J6!OPjFau%9 zwNG~nCJ;`v{v(!P%)n?12;@ora>5Xx3$~cErm{}QCCIY2^UJ~6v)$49*|%HEGqV3^ z&}D*d6QfJ+k<9-5%&9ET300D;;=eV2%541V@)-<_Za0T)fX*62=QxvvU%q6FX=^f- zwNus##?+!yvu`)G>i_NUAG0X8%$ewxSjV)8Ue0!ICA7fQzS-p*j}u1APM{ zp9dz-yjNaDSS)&fSP1;E5Py#*^1mC_zdZ-QI8FE;pG>uhgAL|{X~_}(Rq($&#~nPF z#4w!1u3pcsIRhR40@pr;Pg5!C!Zr0E7Sj;#S!$G?sKu-ZYSsWX=Yv{mMwz_|G->|F zVg9*l9Ayu7OvZSQq6hnbcup6LK_25x^-#^z zzhjh{#t76)k>)=Y003QyBMrA?wlw5$VxY9B+tx#WJ%3-h?BL^dVWBNn|ea-61&Db)z@+YM7EMo<0N_-Z>9 zS-$20B+GUgK4#h@01D^;vOy4oCN_gQHpcU=lj2?mW*{auQHu4y=eN(Mot_!s+s zR$>^zb#XBHpKdUWru9M7@PBw=xO53CBH);nu;vh22hgzMW90WvdB9fU^PvF6}CMVK<^cqxa#?;a`vhZjBYxTC z({UJ51DM%?u66PBZT~{97)<IrUYwwwT9`g&FXjj@F|Yc*Igi7llZQGvCFoC=E_63N3|OeDv{k%p92DK0_^ zsqq!3BXL>MlGVzYi;zfeTp*ZH9P=?Ih={Dh0lr|OJ=;{9F^OGvIW^c$jwdBcF)b#% zDF@qL$2h6UFif1Rr8b;_f!!{)!_eiVASE#{GEBhXg&`?QMau2vcw*v@Tnq^aK>U?< zjEj~arT!mrLx8TeYjx$_#)w-rxx_#3HYRR$N-p{f$&#M@NBaJG|H#!`e-91mM!=1Ux$szu$mLYHBNG2d^9KcE+60sTvqKS$v;L>%PV}Fz!PSxpTh7bn5Rk(O>6 zQ!R&v5fm4_HFbeePfFky6s4NRa5ryY6oi3chGJ??%u<|c8q3#Ao9)7a(V8;`W-F}L zgn?m(;tW-5#lY(NX`SO0xw6f!vCh>Z+}ob&b#tb+RZW~P;*zgnRZa7(sYsy#upXwC z6)rgNmDaWjwriR~*>lOH$A=+y#@GUzU3~d~DaLRJQE~BnbE%#axBx;%96)f;%HF0k zptgQNNW&ETM=`CKJtW5T2Cgma+OCjAw4N9Y2aUPr2w7~4%nV%kMuc>Il>F#;jN z@c4sJ!)#f>a)f^osmU0+;(rhrMwtHpL0}kRy7}7zQ@IYo)2?Z+D}T!J>l)_qZ}}Hd zjA4WU{smn#!aV-d-ycS)NS?osnCTb$diG=E;p@{9u93!41`BB*{`f3rhenQH*Enxl z8Rs#gs#-0tM8A_?w5W>D(qycTVwN3IRm%+};KnPDh~p{FNJ*C)%|Mda@WQ;}V9FBP z`f`J`m?=9H0I(^9s0hG_kPs3;9HEkk1rQOFF!m}U5d17Jy7JvL#Bb+{0)Q-fj653M z&kQS|=i({B4(`W|d<+atEvme33FgN(pX#^3mm`oP4>e{$fC$CK*CTJQo`m1b$=B0A zKw$U)02#1`nZA|)R@TDI&ApRLfRKWYg&QUzOYsMN6SxEb6=X0P?XV**DSZbar=X;w zrlF;SnchHuRzd^-A|Uv?;k8a_9=JXfxn35#VgWGS9T5p3UNPau*AtVi z<5M5rj?d1_98Rn+&2K@zMVsIHAtW0*iV})#w=r%y**6ka8m1c7NdNlQgPjF$taatN zvXa4V`=$VagR3j$)U=sQzTmm-&&DLQ?9|h}Om)QJjFSMY_p*4`|`M|90UzH zifPnIcGHYA#1Aj_r(z)?o}!M^dSI}4L|rGXjI@67z+8pFPZlpQm=X}9+OvdVb(q4| zQsR^;3c-rg^qO3K)RisVXqDtpMBJUEVbPQj{HG#k(fk*!j$fh&j}z4JIW$HdZ@SFi zESk^nQj1V5Rm6c5CSwf_*axxz^qK4}M7=07yEn#<|5iE>Z>ss4G+Wj74C`201<*0DAgjsLK?Drx zy~#h?7=Haexo_;q0kvI8c%Y$ymIZ+K`yq*25E23@%IJ$%^BYY|X2a_c%eK^7mih;- z6)pPm`^YJZ`f;lmzcQu09N4JZ!5rkFR$mJ{y)B_=Y{%+BO8?O8QNFqNg}cI>k`1If zJVQ{fR!J4x)eyX}aO;f)aO#sQ6+o5GR}9}bP#`ifGO29C<=%(k4E})({^F>gnw)+Hd=#j7n47KToo zsd~io2TCWjDi#{~m83HHo};d32+ixgrgucbrefF=9# zQ8Tq1eI)NWYs?vKEln28%fz97hzc*ov5oYt-rbtfv>bhX6Yk(jJi#E=WY&5{^Ur4L zCeMO(FXhjUgYYOjvyUI14=g{LvlSJ zgE~TroIf2;8Xz6O_Ll?k^OBm#V+{ub?YNsKDPr`=$>dfP6fV=TvwLbcaqxg39*7Md zZ!_m5PX7!SN*M10?HV@t`G^|JaOyr+?6l8Yjb%5IFo`(AQw=ewyQMe(=gcOZ4Y~)_ z?Y}M+tsw!Fa)(4J z%B=N;Q!xgxbvZM+Y*r$yV?E!^ysQ}Ki{&t#2Bgih3E!Ys+0FCj%(E5yA9_;6cs;P9 zLx)th2J*a!S0B_MQ2nN_Kx#z(&Vu%Ko-6*HVY(U@VfycTOz*s?A5(X{d~R<-ERG6q z!CSyuj`iN^8WDDF2vcK(uvQBH6x$|!sALlb;lO`zgv&ucGjsLBy8^%kew7!stfLul zXllz9%CPfpX7H1@Y1!AL<(^NoJE!)!4c?|6w0UP}@ydVN{8PtdS(-tcc!%WXH`kl!jS9CbuV{+Y#LF09y{WU~I^X_c zU(jy1zflglk%rCqy@Z`H$9 zxuseg=8q01h8K(b-gI5D12DiE^vrXsrvQ!)l86L%2dYt{@GP} z;qyK%$ZcKGL)1Z!9c{Q!$z*kWB zoa!5s*Zlb}m*GSiJ3BDy`x=`PK_M-CK!miYo$MJ)fBsU@pv*LD&FC$GDyKjlFk!xU zdS1$7QDtxuO~C8@#^f~1cuFIMnL>~YTl8Y9RdUQZvX>;0#ZJromJg#}inSMKNO1lK zVO*22lp6;})(3AlHwggtuFbE3>dBdP>58pv8(Kd)MMd$5?H}=f%bVlznygk>Lu>_P&$BxC~P$xm@MBAT8a<6i*2CkU^z=VWCPU2azK@k4vF)(D|iIDag1~DvZ;T}Q)#FZL*nAX+Xs{ZyLZo|L7OAy>I5|FtkAPZnm<#MMQ ze3Xl3+{F4Zp$)=`#69N*?wH`TW52^PiVAOR;0gx43;m@#K6G_<-c;d&>mF-x^Nx&n z?yIkMKl_J_YVHbO(L?Anw;`3vB{31tw>&;%AKZ#K&W~PBB8~tnq6+5RupC3_r5qbk zoQZ1qD40vY(LhV;+wIn&HnaD#z$Yn&rz5>32NQTT(5JF7y-B>DEd%;JA<6z!kgY8e zv18Y)FFu9~`r}oIe&5#Rlbp=mUBvPC3q73|!mfK0Y}JXn4JOp0fX?O*7=9wq7mRZf zhTwRg>HCHjNJp~yhO^Yh(o zzdNdf;}NvXc1}?nFDHX0STk-rXA#ZsYwJdS+j(D0*0rIj6FN#6J>0bet0!N>CnSH? zJ!R+%qEj3-z94s~eMR^TNQ8M+gMT@K{jg|(8|2HvluGg8d8I~a!nnp771R4WHsAO z+RVjnOQ^o6pvtvBJ{aC38TKi)t70X0J?n8#dFNwFu<6I_FNQuC{q%F-K$|AAzu%gF z_f6rzPj~Busw2mp@89YgXzWJ6MU8oXnJBSd`9g726P0SIuQv&sl>P15ViU5xc^ubvLO6cI%-D;dHl@ff=CK+G@jjbD-a_hvhVJiXW)l-oPypa7VG zAV>BtLP4xM2#;CxIJXX4tDtt2f{07C!c@c%EPF!aB}(NnXVb z%{%khb}7h-(?acdNgQ#BbdnZD%9v$gKqf!~bYTS6Vfug@bBoFt!lyy;tr_KWWA5OcBIx9hpXdom=_DPB1=)Asg7-o$8N z^km-AsIk4|ry~5apA9!RPF8EX=?02GJ5R%DljiphKS4&Xl5n$>Ey-zxyX4skp|#_; z5G{OuNPYHv{n zXAYQpbP}}^LV?Xl`bGLZtn=~Qd&L!rAAV#*$%b2vcnV>qTY;L{w2$K^yIN7|@>g8- zNuQ}b%hf4hEPbxsIM^yx(NVi*X!_`Spwr~-M(AQ6?ivjib`W(_YuCW5;CuOApE=_K zoP~8OgFogt3_QFH5TQvpHxS^c6LRvmH?{XU;7$^b@ru7Bmw0;RC%Io?qprgJr$Gjv@ zrmkDqJ*@O77q29$KtJAiU;)`Z&fD0`n@8l;u^kUT-F+iEHF1Aap1S`vb$~E; z@T8S2nw0nf3&KNpDEN7E%L5pmS|!Pi8%uQP^nDjaSDwEo3BmFIb&_!XE7&h1+!CIt z-m%${>E7}2sVM<|C?8Z<5-!dsz%L*nBRf6JFTf)%Cdw};1Q!;TxMQMlmf*UAJBrzE zS)nM_q}r;9uXkSCEBx`OIBQbpvQcCACmTl3AF<5-{QRm(Ek_kkE7NC$>-q7O&_>jv zN9mi#pX`#pVN-kmAA%Hp>a3cO>6Kd1&fy6 z7py40r%^Lb0!d-@>^dXqcTw9SCC&An9L_>5o87q|X8Vg%ng4M7_FPs?(HYENUW&4Q zxd&_zJAU?XG{F95uyMl$uEJC4Ch{TK+ZCC^SCDe*+iX-|*#;g#*Jf5UVAh6!^$6N5@z-tL_Yz~;MBI^t4N)^dUS{eRZt}e)IgsF#RFwW@g@@?P!kV zAm(&(P@Moer;mP3TTfnL&JaOoV#~vsnAXC=G{J-xYSSrY2K+KhK&2~!lMC;AYo^<+j=oYDVxy?H5 zyfrJBuJRjXsLDscnt4&Jq8#a+d-@8Wz^61*E zAnbXvmn=>#YCU;-6>0ED_~QBpnsWH+*KLo5cST2<8W+plA{_Mw{ovB&+1mfxK8yHwM0CdVtq^q89WRw+;yhd1nPg#pICVN6T`r)%rJ}a>(DDX&m{L2-KD#= z@7B^x_9U)u2JViZjlCC9JZ&?v_31k$-$jtnsjd=sEm2SHm58H`vfE#EdGYD2yey7s zjQ%l1&o6qzYUuFSx>#czLpY(~Iq=K4=m4@tc_KwSWRuj$Qq=Pe5?}X!<1C9-#OqM@t{VT| zybQhg+Eb_gBjAzQV*BMHLq%-v%jVHFXh*4vfFO0&K9PBFrm^%L%{ANr3v=(~aH`y@ z{4^2miFc=|E>At$l^Smg$GBhQl4nLsxoguT>VzKpy>lTqCZo+^_pRwaw??Inyokht zYYIQY0tBR5b}G0o$&o=Tj}sHU!aRYQ>?@`LIk8J6y z-Zt)L%|gAUwGat5B>|PVY8lY2v`B)JzBO~n*dAUSRBRCw%lV<9%Z?l=)J;6ud$04i^kSfKWZ{;$`m4@>{V#JA3&X|CpTL<{kDb6!7NpJ4mhcDb2z_hs4A#5L;E8 zWS$Z_;KGQ#MT)sbR#x!cRSb@A*qC`(s8!3V_LDcqB_$Of$v-;e(P-ia!%Qm`hX6U0 z=H!D(MpK~)Dai*v&b!qM41}K+Ry{XsqgM=U-N@7&be8n-rO~__u&lP6*pfC9p)cFd z$-m6%xwPS}hokR&W3Nmi?H8o^UzBu}gF$MqHFzAr_cB=s;%h%sqHPk)?=GnY&2 z``PXXk>k~dtGdaPuT2XT^yt^w;DE<&%c7yW4smCAcuNt(2}~?a$B~NxEI6p5RET+S zglR>=A|9A^dY0_0<3wARnwBu06g3XAS>4(Be2By4~0#;UVABXYG>wB_^X-)|Z>?*SxC{j)0X zLqkZ2piWVYl0;pzpM{SaNJ+vh>UE2~UThC{T{#%i{9f1|JqOsSy=kOchy*`_jn6Ek zdv6f?`AY`f_6_Ei^GV2?U^UDpw1_)rrzzAbUvef=p#E&bEJ{SM`8lJn0r`cGJYsi~ zR1wSesSmN7(;Q^>)6zm4K_!ZuqynU)EN=*B&n z8a*RH-}ZPv)){d8?f2<$`J>Md>07j*)ZLtPqLdpGE55B4ivmHZPi@i4tFQZqXFJ;Kw=H z?xc?PIxjQ3G`U<#U6G2y7)N|-^4Dg$CB4j|zz>LO1KR^!th^hsLaKQ2_i+=m-iV3u zk+Uc~TjaE$dH%g4Zv!e@b>)vVQG6GJ`vuF`ty z%0$JqQ?_k_1W3dzxuSKuMWkd|n3h7NQAl%oUw#IpIQQ9JjkESrcLeZ=qiPrtuko*q47 zx)i@_{`>Ck;zvl&l8sb4e_`-zunxmOP1VUvx`;q#i6m>Y!ctW$pI!d1a zeSDv%La7ETVyAPv{^uPXKV*V_4Sg8v)D99qG`Rca<@mRF$gi zW}FoiVTu(IP;?<80W|DN&O*OcoAxCO6roHnI0A{EF^oNH9GQqL-M!dEB z=z$R(&QM#xEB(}-%i~T`tNg*2vO&DvyG?)u?uS5};NZ3d5&}TfsHl%46LYDUqU(g7 z*YpCCxKJQPR};DL@%d`r&Rdsza3iCS?FP*rjZIFYI9(6!3|G+{l3c7m{-mzmzML8B z$jX|;U2RH+hIqF_M*`3k%`b7dz`Vg40i?X0*)~ea4BiF9{&%SoN!%H42 z;~GnpaarUEdELhPw#>ucr>!hBK&`}1rLe=!$o!7T?s&&i)Vb8$)}uK?h~8L$H|dSv zB*D%I1)!u$3%R`bjy8N~&RqsKf3L}V0GCy@nZDQ!;|b?qfk19K=CI9}PCnRZ(?UY2LO5Z%1*4^pRnp9lI>>l`eo z*+UGGPi@?4M~t1mQ| zwcSy!aYHh$@@*pnyN#|`YlGSh${a{XETgn$usmKdVd<*#Kr=hT@S{CJ%z@i(ei2fqD#-r0=s}Nd&X9()V!;v>aR~YLH_#N_rF5`ou1EVI<+l0Lm@`GPCuD35 zzsBwbXW?Sz9E0N!Q=GF`2LLIT44{4i0;F(Cndaac=pPhF#k zP|eGVoPxr%r00dXXOM{4-M)1SQK8LyNs=;?(lRcNVI;?|$U%7{I)!aX&wGpwZ4AT} zpd0niZC6hrQIaGIzMJNXBZ3p*auYi{wD<8r zi6!3i3J#N+s8<gq9$<4DB zGZ(VkxrIGY@Vbr&*1-71n>UXZ3GDsR;|Ir~GN089{>zOiA;D*OoWBKf5O zR6hUeXpo@DKQV|2(%d@Mvp-CdycFw$T!)5>wCeWKya$Fi-76^6?fn1^S=F^TC^Tn& zAhqJx=8>faRW6ob(Hj6Wf^~_u-9!Z5bBIjk{r4}!5qP(pZ!o%%418kl9s++hwP8Dn z+UZjrANcBtk&kyQen1+?W;nl9C|;Py_Lep_W~R{f#-AdtkYjN`((q}L7c zN0je%+kac{H@L!wg(PKO-#Eg5GwCvZA^53!ZzgHx>=?%wb0^gf2uU=oni`@7O1pJ2 zGdGZ*W26FvL)LT9KP4!Qmj6=J1mv%NK%fp7O4jTd{L4C^uE-1q62 zk~yx>XbWqA*jP(+C4$oU4v@a*9PIIO_C+R0eZemg;?W^eZrM8#S9H8?G@*l$S@aXF-QVxx1tPVc+`Ib^8#a(Rg8-*2MNHQcv z62O>6Tfg3lspFF`6mZa2tbfC3u<_h}j34{7lz}1~;M2}{`L3ZM{-ck5OKG(br{$y8 zEAS)LfEUzcY^ai8+z40zO>v9{2^Sedh)Wm>RH>HABLt>aFQnit$WaK{OKh-LvWE>J)T`NI|7%oBat*LpI=sMnnc%1rfQU?|+K2rXdVHr<{tYT>b z-*9}qT0pX^F5>x(J^nHoLlLzPH~14F&a+ zd-bveNIb#arMkLPmgWG4BT{Ma1MBfTJgN&ps zNK6ssI0U2s;a5<4^2o+x!DLbiQJl`x3B_26-rre zV|X(Wwgs<KSr|Y3?_-v2m)8m_V3yBH}gsN6wmbXeP>>B2Xpoz9nDS*q1y>P)3;F zc0P5*L4JJMGpeZ12OMSfGSk%xYHH5deGr++3$$kkj?iga;f2dnfdh_2lXruP0Lto> zv!Y9iVwhoamuw`6AEg};EeCdj0m}yZq0SkA4u{aqJ4XG??Gc240c+*@DFn!WFdmwz zy2jXwh4W7T1T9~hnZ-}d!c@O*vlE!tHkW0mLXvVQNGcmfK8#!h%~m;uF*-n+2WGgw z;P?b%M_A2-Qii$I;nkzq%r=`N!brMtngypvHV8-5rs8V1bc!R6e+9*<>k;G=w-3F! z9Algi&SfF7@kr*pjg?QNmj39*p5#aE39UTp^jhr6aZL~A-8;wrLn$DR=zW1`q7g_6f zm8O}H`eFWKUN;COZ$-=OP@mT%EDHk0r(iE?`YN^5x;<9)%^}ps6T>9DJ$+NA+=!yd zS{BzR3Zgqk8m`0k_-w4WkfHR{ z=w9mul8TDu!401Wj3-w{pNnzuR}K44lHUR@SvGbek0)Z#Z^Frd2O{ARm9TE^LT%0*xdDAgq%ot!+TlLo)-I zJzm0V@iXjh@5Z+5;)!q64ck)Gr{CH#HTv+I1ZR5CI#yV$5k#7l0B1b|gn%5z^P(Od zOMo*^nQn)pVh^f~W(c(<43qCdC&>xfshDgbBJx82x*osl4i-}|+5jOs5RT&yi+X^yJ(mCdBlC)JDNqingc4cv@% z3{A)mnYC1umD2SH6wr1jHcN#uWi|@c^yvwsZW+`0I%69VIx}(y?@8Sx1mWbeL8%VJ zZbT7{eE2sI9sm?d?=lSXtX$_0HQ4R-=+Ln=cw2Shj)~H`MB3Y8A}`#q5z53ay&sRU zG;nDlAIN(+GC|T;^(k=IlOe(FI{KRzy;|@ZmvJ@B-w_JcN{luFDBQM?;IO!N`v}*r zcvJTQA&?S4+D$TJnvyH8PtaF^gl<3;u&5(Z;RZ5*&J+)t{?1_~(o1AOmk9zE*=*%vqFjZ8KmKPZ)3_&-?(@{?g4zNUOh1VYG z$X8%P;}}Oal-edy`2bcNHv(N`_yANMaV*=2MM4;5$agqnM*aC-6XRBlDWL`e|7PJ{ z60;#qIH=RWt0wBghZes>fP)jdcdD|?=Mx{Zrb zw}YC}cD3xAOT_^shH)T1C`gc1tt(tGQ*BF0XK^Z8GgMsOhAs@*Vgr!tSVq_x>Xz`! z7BrfA9nNryrUGmLD9GR)Q*h?bg}_?}#);0D7ktU+KJ$pN{Il^TceJzLakZEM3P#yA zailFnb7P#Y&UiKOOY@-X?`NBRRRaju^im(H(H{B;i1>SO@U~h6)>MTK7s;3xIgt+S z`jD%dAyUhFy(>KRdyHIJ%yK$fRn(3SJc&)c?`6<7Z$V6+pjm;==Q5xuN}d pp}=*MKCdE_2t$U*tgQv0B}{vsAfql%02?6te*hqfeHH)! literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 3b75ab1437..5caaa4b53b 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -164,6 +164,27 @@ public class Fx{ Lines.circle(e.x, e.y, e.fin() * 6f); }), + hitScepterSecondary = new Effect(8, e -> { + rand.setSeed(e.id); + + for(int i : Mathf.signs){ + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.2f); + Drawf.tri(e.x, e.y, e.fout() * 0.2f + 2f, 5f + 30f * e.fout(), e.rotation + 155f * i); + } + + for(int s = 0; s < rand.random(1, 5); s++){ + float stroke = rand.random(0.5f * e.fin(), e.fin()); + float angle = rand.random(e.rotation - 20f, e.rotation + 20f); + Tmp.v1.trns(angle, rand.random(2f, 40f) * e.fin()); + alpha(e.fout() * rand.random(0.4f, 2f)); + + color(Pal.surge, Color.white, e.fin() * 0.8f); + Lines.stroke(stroke * 1.5f * e.fin() + 0.2f); + Lines.lineAngle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, angle,rand.random(3f, 9f) + 1.5f * e.fin()); + } + + }).layer(Layer.bullet - 1f), + lightning = new Effect(10f, 500f, e -> { if(!(e.data instanceof Seq)) return; Seq lines = e.data(); @@ -1846,6 +1867,20 @@ public class Fx{ Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); }), + shootScepterSecondary = new Effect(4, e -> { + float w = 1.2f + 7 * e.fout(); + + for(int i : Mathf.signs){ + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.5f); + Drawf.tri(e.x, e.y, w, 10f + e.fout() * 2f, e.rotation + i * 90f); + } + + color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 0.5f); + Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); + Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); + + }).layer(Layer.effect + 1f), + shootTitan = new Effect(10, e -> { color(Pal.lightOrange, e.color, e.fin()); float w = 1.3f + 10 * e.fout(); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d8c92a7947..8094474f20 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -14,7 +14,6 @@ import mindustry.entities.abilities.*; import mindustry.entities.bullet.*; import mindustry.entities.effect.*; import mindustry.entities.part.*; -import mindustry.entities.part.DrawPart.PartProgress; import mindustry.entities.pattern.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -220,40 +219,8 @@ public class UnitTypes{ trailColor = Pal.bulletYellowBack; trailEffect = Fx.bulletSparkSmokeTrailSmall; trailSpread = 12f; - shootEffect = new Effect(4, e -> { - float w = 1.2f + 7 * e.fout(); - - for(int i : Mathf.signs){ - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.5f); - Drawf.tri(e.x, e.y, w, 10f + e.fout() * 2f, e.rotation + i * 90f); - } - - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 0.5f); - Drawf.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); - Drawf.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); - - }).layer(Layer.effect + 1f); - - hitEffect = new Effect(8, e -> { - Fx.rand.setSeed(e.id); - - for(int i : Mathf.signs){ - color(Pal.bulletYellow, Pal.bulletYellowBack, e.fout() * 1.2f); - Drawf.tri(e.x, e.y, e.fout() * 0.2f + 2f, 5f + 30f * e.fout(), e.rotation + 155f * i); - } - - for(int s = 0; s < Fx.rand.random(1, 5); s++){ - float rand = Fx.rand.random(0.5f * e.fin(), e.fin()); - float angle = Fx.rand.random(e.rotation - 20f, e.rotation + 20f); - Tmp.v1.trns(angle, Fx.rand.random(2f, 40f) * e.fin()); - alpha(e.fout() * Fx.rand.random(0.4f, 2f)); - - color(Pal.surge, Color.white, e.fin() * 0.8f); - Lines.stroke(rand * 1.5f * e.fin() + 0.2f); - Lines.lineAngle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, angle, Fx.rand.random(3f, 9f) + 1.5f * e.fin()); - } - - }).layer(Layer.bullet - 1f); + shootEffect = Fx.shootScepterSecondary; + hitEffect = Fx.hitScepterSecondary; }}; weapons.add( @@ -307,6 +274,8 @@ public class UnitTypes{ rotate = true; ejectEffect = Fx.casing1; bullet = smallBullet; + shootSound = Sounds.shootScepterSecondary; + rotateSpeed = 3f; }}, new Weapon("scepter-mount"){{ reload = 15f; @@ -315,6 +284,8 @@ public class UnitTypes{ rotate = true; ejectEffect = Fx.casing1; bullet = smallBullet; + shootSound = Sounds.shootScepterSecondary; + rotateSpeed = 3f; }} ); }}; diff --git a/gradle.properties b/gradle.properties index ec30b14b41..56c98db055 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=bba30e2f12 +archash=46c0956944