From 00ae28847eda71f9e383f7a498aa7ad5c222edb5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 May 2023 18:45:15 -0400
Subject: [PATCH] New salvo sprite

---
 .../turrets/salvo/salvo-barrel-heat.png       | Bin 501 -> 552 bytes
 .../blocks/turrets/salvo/salvo-barrel.png     | Bin 383 -> 752 bytes
 .../blocks/turrets/salvo/salvo-heat.png       | Bin 203 -> 0 bytes
 .../blocks/turrets/salvo/salvo-preview.png    | Bin 1070 -> 1019 bytes
 .../blocks/turrets/salvo/salvo-side-l.png     | Bin 0 -> 429 bytes
 .../blocks/turrets/salvo/salvo-side-r.png     | Bin 0 -> 423 bytes
 .../sprites/blocks/turrets/salvo/salvo.png    | Bin 864 -> 0 bytes
 core/src/mindustry/content/Blocks.java        |  17 +++++++++++------
 8 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png
 create mode 100644 core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png
 create mode 100644 core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png
 delete mode 100644 core/assets-raw/sprites/blocks/turrets/salvo/salvo.png

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png
index 3da20590373e9f7df2c98e6f761ec670faeeaeb3..274053f819c982c2d61caa2a858dd28cfaaf166f 100644
GIT binary patch
delta 513
zcmey$yn<zdVf`ad7srr_Id5nBdode|wD0fWP;OeV<KotIjS5clxMRW<a{7uDZR_5;
ziL_j5;y8cQCxd6EeePuOCGT&ST*_4cS@-#u)tQDwiT0k=rW-p>%x|>_Pt^@o>wRi#
z>J%`4ga5t7vQ4j2l0V6v6}X}{OY8kbF2~eKxle7S6h-DIgjd%4zZB^6lKW$yz^HNN
zW6aCllP|1lh;`{Y-Tcl!L0VC?^1^$@;3HR_II1^X&#+OEc;CH$_S{APH!6LS;7Pyu
z?svu=?e}x4PwiYcAxTt0iT`4>^HhV1XTrx%xlQB}m}vb#YKQNeK5a#{&~L>F59d_h
zEYCH(sqNsR*Zk1t<HUvcOY7&?yt)y2Lds$L0k$73Vs~!`J4;N8FFBr5)IMQ1)4tu;
zRd2T%xYkLYo!Gj@*1=^~-sSmAjUO~^lXuvqzU0N^{|p7^)_#wE+4jcQz?mcKQ^33U
z1MLM~w}qFrO_&tVtbIbCzjYmRQ|r16)`UIkM?M8a$eoJk{N-iAmbdF|i0YCjRred@
zHPrd7wjVj>^kK#6=6k*uHwvse(fls=qd`ltS+AfO?|W|7$_w=dLTv?1F{O{oZ*j|n
zR<8J*p~J_hb<%ln`{G2708hDBc5?ZL3VACJ8}MKtzV`Ut$95e|oL%d|z`(%Z>FVdQ
I&MBb@0Oc3%2><{9

delta 462
zcmZ3%@|AglVf}hf7srr_Id5m~_B(7K(Q02TDIg@o%q^Upu6C~_{fY042{$B+HyS8}
zYH=(~YO^{~cv)zHot(w|5Y?~$qrX}1JCb`~M!j#w)q<XnwHGD|@I`-F+{w7~$2>8$
zH!G!k4EOy}3+rYsZFaE#_1pEQQTNG=!~-%GjCNh0QoB4S>ND0q=$(2Y_2bOtGelmh
zNhI%K?Q2}jtGWJwQcJ<oSCeztj!5K3^nPlZdSTLak=e^*I44O?;IvBJ`fs}-`#eS`
zj_ansS(%vK+=^#&#y_ggn!O-`>HE>|>Bq`{n|@R-E$@3|Sixt*m>wCaS+eGh=GC=b
zpJWV<w%CL>{gN?oo#A7XQO{G66H+d;N^%1CO|wIlYj#y!&})3}GohRPtlAAm@t1bu
zX09pQAMabUa2Dg-73cZ`^%~a&y_+8(@nOQ<a^X*(=d}BJ?shU|UN&pO@m1aIZ#_4N
zn<Vcr{8r*RkLBw5ho={1Oj{@Z^48MV4mBJP*Tt<5lHMx);%1Ule~itG|3bG@+?|9!
zUU+cyL<cAHlt&Bi&R!TOeC5%?x4REEa_SzDPVO;0CV@gctN*}R6WO%qmky^N0|Ntt
Mr>mdKI;Vst0I!7CAOHXW

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png
index b21c193a113f1337b759edd87c645d1f708cf845..1ac7d8ff1fac547a239daf9c099dafd68d3fd971 100644
GIT binary patch
delta 716
zcmey*^nrDPK|RwdPZ!6KiaBp*@Ar~%lsRs18PxSeu&H;cpxy-SEAA6Y8V?6`zGUHi
z!pW4mP9#~mga3iD3d<y=1x>xaa!O0MkBAs;I(P2u*>`{cah%)!sqAT<{rul=^N$sZ
zWo2c_70;`v{g9Gg!)$O%g6Tunp65ln%>DelAI|=<n7gGf@<>d*1DD+q=cbhnGBq7r
zS&SJ~KPXNU@?j}y<li`Hf!+fCnvPbM>46UvkA@z|NIvmh-`-aLpufWm2F7(lF)Stz
zo%g8B;PyD!Ug5FA_rh<cJ&Uy-y#2TRn#DZr&sW}leEFpRRg8nLL&N^KJGpbcJv|QA
z|J}~}!Ye>fp#Jk_l_w9Jx74e2=sPVrWtZ~vyW{H!&Kl$Q+r?bgM{Z#%`Y>T#i-l#y
zg!L?+10TG<_3%pZ@#p%y>z|nE9Zv9SVz-g_&d{)Qs`&S~|GV~_nAiV#LG^)@^qR?8
zB|(w$GM(!MJ2*4+YBD?`<Yn&u)zNfZ%kJToamd?!E2o#og%<YaK!s@n=6loXAF-|A
z<##)r(8<DIAs}LqJ#G5r3!-(`ayELqXfNnz@vjKj!Me*U<Cv7(lqv^#PPq>Z{-O7#
zMsx1Wx1J--yG(ylTgJiW1lBz_Ypz*^eR}?W&5{TA_s;vB`(CMv+r#@p8+)tV1=mAg
zAHBQsX<GyPQnd)Bg+Hy@wl=XJotfb0w5nc-X^W~22bYEY&l^_PwyIA#6hHT*?_^i)
z1tCtETOK+-6q_(9fsx<KHX)8P?1O?v!u!uJ_Z~g9Psr<mYWdWzumgL9)__#K&_2j4
zCt~h>{PyFp?RF~l`8$5uRNi5d6H#|koob*P_F=&uwHxkDsx}fjU1bv!c=_E{A5s;v
zdEk2RN9V*V`yO6l<2=3G-RHlpT)30gwf=K6-t(XE{7{j1BDLAYtLeIPuqg=iTmEO9
YBWY=2=jay7z`(%Z>FVdQ&MBb@05E4pTL1t6

delta 344
zcmeys`k!fnK|Q0Tr;B4q#hka-46_b92(&(2{y<ONW2UtPQ(g`0*LRnnt5_bq=cq2Q
zLXe}ReacJLl~a!yb!`xlUR25WH$FY*#?9w5Q&kc!8y#Qxe!aTqE7g|;cjB`uE%&xw
z7m{-D@{A4kdVbp5o@v68H=jR7R?cg`x~1DfWvR)(8|VMN`x6^hFVd>g%JOl;FHUa0
z<9lDNDxJ2Wj$v~B|D-#=iWPb0Zcy`P_jwj~sfHt)n|DF>seiYgvX@?c_40M{%ibTw
ziHs$_m7k9)IdgD6n0K0gkyC_i!^@}B(`v2c1QlD}Fa|#sn0Bv)<C^UQ`x`Y3(*$Qk
zH_1E}xW~BvE#pNqdnOiv+6RHQ)ebD)>@nO2xANa`JMi}x|C)S<*sVEDc`Og~4)ikI
sVcj9vu$#f0sX+XJ8^b#$1_WT-$G9>i)c)(af2%=)p00i_>zopr06<`xNB{r;

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png
deleted file mode 100644
index 48482e269780d74a7e595a238699db44ec93921e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z|iXH
z;uumf=j}B|u_gl^hl5v?3;!EeEZwo{JZsl4pGK?A>K|^qb})d!KiAa~vu2+D%epqU
z-zfX+)9cL2S$12J(srJSk;^am^11y(?h%oXcb6LmA1#0H<|}zW_vl-}_)V<a*0{ba
yeXaVRaeYo}UtIZNeuYOr73UOPX9k<fP{3r~s2{#%)~@i`AOTNTKbLh*2~7ZECr&T`

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png
index 77d2e39b935033d72237e98e4d68bb57018bf128..936f70877019b30746c1ad223aa07733e4035ff2 100644
GIT binary patch
delta 984
zcmZ3-@tb{uVf|K57srr_Id5kl^pbHDXgjUCQ}>Z^#Yd%#0}d@~ez86B73ep7<vYP)
zp27wen^`IPjjkVFNzc$wX>Z_)+w+4*shB&Zh(k5kKh(Fh{A|gApME#*zWDOrx3o0h
zn5m?s#3og(DE3D}_F@)>h?qDAhK6wI>d0f4P8SC9y#Mt1#e(`zanf7#8o2tOOt`R$
zLDS~aww7xw8Hbc}y)s-KJSvvxa`tj}aQ1IeR6MQq!G2=sfk&U1{`~l+{aoM^=K)>;
zhLoujTpOh2PO2^}WellMX>VD_`Ap6sPfB#d-uk%6<4cW}FFRfkW3o#;!-t`5|I9lp
zYur2+9IF5SnT=uA)C(O9_5aUZ_ndG@+1Jy+zGcBFxtTld*X&u&`TkSh=6tKP%Ulx<
zF<+SaK)IED!}^wM;f?p3&%a5J*N@v~F{wT!l1-D-@({Djw}!WWKNnTy&70F-dO4vg
z@88AOw^w_AES7&a>rTZhj&%&?3+(0jx0!jZx){0figf5XjwK&6ID{PT#_m~BU;W`?
zOUu%GFCO04aFps7n=I!LdnKqzT5jd+tf(`y6t3RTQ3-gcE1kB5VSgp#3zY!-_8+_f
z()-pGdZ~mqENzi_$jHP}P<+m*sr1JLw-r(5ro8P^XFhM<KK1*bw*`~S<2LKBSj&*R
zy>~5(`0GvALz*-cN>)ykn!~Ny$mK6+^}PPIip^uY4N>Wq0f&<M?NzoWS?GD?SxpeV
zQ1U~jVCsS>)@$L*7wNCDWPY&1T6)5b*vo(SM=@$X6!bfE_6eV~k*dw2i3(gBIQoAG
z-ML;D(fz?=E=yQLY6XjPuxR5#-NVY0Sb`cv>Yn{Gc<J4DML6h?{#Un0L8m-9e(4Da
z+bo?_zoqw#>+bmuSD1p{RrR#Y_~6mO^4U2s&s;*Ok$e8Hv;B)E20s+x%xz;2;EIqu
z!#020F^>&A_us$v>&Rw3(&C=CUhiSjpM{_7R2#YKYmK~ieU{=}#GqN@5&T4D&3eCs
z@1*48y03hBr80pjjBT^<EbIANjfb^tF1`P*ZXx(eZAbn0ryYM-74OC>E2`LBH+GWS
z%OAyB!>Mm}pSeNj;D1TaCiyt7riba_^6%xG|G!hHkUZibA?G<&Kv>R^)3Clo@a{wZ
z^XpDBw>_S`+kL%#ZOz{T-d8&lUomo;chpZfICXE?&Ci|pI0}7@mI!G$y|WRLmQyHH
zm)Pt+LFLGl0<VfdhUT>!R1WIai+eGN$64L>=jBiMF=5JW;XeO&H$H6SIqv$>kFop1
xvpMr(r^gg;S)kFiNn=)R!KTHFA7_3P&z`d<I%Cs3VFm^U22WQ%mvv4FO#p_&!I=O6

delta 1036
zcmey(zK&ypVf_nF7srr_Id5nCdPh5owB7e;b!sko=(bB}$!xB_2b4M{&0la=wCO^x
z?n^xdr}{>LmUmhqOsxSg*8O5{N#O8kzPm+QaF<q|_m0*zKH^r>tJ`N<r=P32(^P5x
z>{;EJJ^ts;%(3h|;39lCEA&*xm%p#A7<w2JmTsH!Ep_L;o_o{lS1{aqYu2{>_<`O^
z1$G7ot?A#NZQQs~aIJrNlF6mK?VH<^@0OZB*J^KXXAodL67oTeYfDhH(|&7>&D;+e
zJ?7V~%6aixp~Hh?Wss7C)OUt20#4dm4G&*_j7W`JabGs!-TU>6ED!Bo#3(UOZgTI@
z76I0V-pYj$0!_>l&WiVzR@PS>X%JB5pD?vGz(oB>z{<)4{})8_FPNgZz`N;`1m8vF
z15?<KTw5#8B+Rf;ddo@Xq!m**0vt88<u!6Srr7@Go@&MZWq0!>W5@hThwo30OEBz{
z`FnD{#5-%-?N>dEem8E{U-v(3b*TPVAALcEGsi<Fsl?qfVamw)e&NQu%=5F))XzU}
zB5`+D<+rP04=ZI`!qgSFKNMlS;y;i1U`pHxQ6|X-8P49f^EN#U_usGietY8rWBb}q
zZa??UP>-6cl0Jv&pcd1&?_rED&T{W`*kG!E<(10gxo1~>{JCjOd&9{+0_;rJL4@Ri
zfA_R*?wP>L68_m~n}7#H$TNAN>)(|)p4S`mmaN}4=j`=md_~921UwjaJZmix=vrd@
z|MLrnpZmC&mdYwK7=GjwooWC2O;&lenLx=i*IPcV4xLP|Jp;@;=a!aTzOE<W^Q<*Q
zV8u@7uqQRMjCo3==lb8DzkL03d3(?J;Ipe$X5YWL<gMr$GZ8yQj+w6-6wfk$>kN2z
zaLSQm^-C{E-m-Zh!Kn3ekyE-GyGOZg>Kyh?hAg2a-CVOh3Jm!#Om}FIVB99D;Ba1a
zg{a~=9{)}jFWZLDih`BQCmzjU&zLB%MePMM({-EBxU43nJ69i``L7zW-}->b7u6E^
zf;q|x*4J{=zbFOHQ(eAK#*#6>x5Q52hRtD7Cg}sGzt;c0Rjemq@x3d^(p`t)(4Wm`
z%Wq{{xLJI+iP}GpeTP8L>m_@5R@wc0;};NiVsC@N{HyKje<la(C5STa+VI?k$#vT^
z#@`+rR&s`AWp_u-+NW4>hWUE@%*y-RDdmm)&)%`MA279->b<m&btOB)ful!R86JFp
z>M=V_>@4S|oN4Y|^*?XkjQsSO;h5Hj4I3C5<T+zn4fqYFAG{&pG?U%t@A-g>)0ZrJ
zm>|WpjPv{j)5Uw<u<cyk?78qPv)uN>RvcTm9`*YCIQ{iGz3a0@=X%CJV?6(rLDK2l
z4Yor?duPUJ&;FWeH^b>q%CYPINoun)7R~v`xZ~kD2Co+T(+ms@44$rjtS;-E5}E*N
CUFBy0

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ef96282827b7b9b9c9e46db0bed23097f78a89e
GIT binary patch
literal 429
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z?kmo
z;uumf=j}~fKc+y5)`yD=8Q(P>I~FHYmXMvC@11m5ti!ft+75o92nMw)I!zb&uS%GF
zzxVT9|76SSpQmZHd_H6FiCJUmlprrn1TpW~>*CMf_GJg<RY(6i_~mX*?LWDBO%A*T
zw)=F&8pRHn+NpXq1U+VSVz~a}@pZeO|5h+~^|Lq3UK9O2;?0kz$0uh>vpT$*xLtuq
zPT~8O_f89Tu`zr+|8w1S))EHIR)K%43=iB_h&_1v^WK;8t4s`LEvpzC@>*UoHW)aW
zGAzE#wD|I&-_`O?rVP1?Ea6uf845W<7<Rt@6LXQ_&(Vqo7KPM5DSr~G7MoWz%u&vF
zl(1=7dck!)_rrBR7QeJSEo$H5P|Nls?v79R{Ac`C8H~3+_OIV8Z{IJ;KY{6w-6vhA
zHx&&63yx&g%ZfJS@A+E4Pg{#2-10FaQ^SShw{|{eWMVkb8<1oZJNxazn>qYP_eq9%
bt>j)HP^!(+t23X0fq}u()z4*}Q$iB}YzDa0

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..21cda3b07b408369483945454dce2054f6bee802
GIT binary patch
literal 423
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z?kUi
z;uumf=j|-}yh8>uZuUyY<}4~+YGhQ{x~ll<Mxj?>oL>cE8YiwUP<j7y$|{#_pFhuc
z`+4VmuS3AS&4!(#4jhUt0!|3xLxIiRw$E32EsvLN^-s&}TYkI0!jI(@!~Uo4LCP1{
zKAe2+Ah}?gjf2Di_5UBXoc?FGiec+h#)ROKFHK8M)$jePX5PiHQ#rqL!!L%Vm+SPH
zu1Ya1`Ty+sI_?)tPXxL@=rb`q<T%Urqhe$2x|<9Qx=xoF8-8+}WoLLKIE%C3g`P#p
z^asBea-3z6=yd&XF@`}wmnpR2lC{0O3FAK}IR(xM%J;u-yZ!JgyM|<?cgt1w4Fb_$
zo+;(5o`3dGMA)AQmRFJjyLQ~%UpLFVDucP_Q~&w*<?EN9U|zzwOxfPeV=6nxH<snn
zk_$8Q|K6VMWXha%nmL8BX37a>7RIF8x0ZflaAY_jzp%|l_T0{cJNKwNwg?<LZhp2W
Wgn0)$gE0dG1B0ilpUXO@geCw=u(O2#

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo.png
deleted file mode 100644
index 7fb14de983128854c2bdbab43475f0fc3e4a79ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 864
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z%1qI
z;uumf=j|-pZs9<Yw);AI5iA=$l*61h6dvRc6I1c7JCvlZ!zexR2J4}w{RxUo%pRB>
zQn+#QU(1F>>FHZ9x?Sp8dqQMokL!-ZXYN)%n^*mAZmy00<e$6b-&;SgOJi^i6hTG*
z#G_Uk&6-~u&3s__<@-}#Z_d<T)#EvB{psiV^YZI%zb%`zD}U*UBOUwwKH2yOExX?E
zu%hu{h2y>No$`I+kGgK<-)}QYob>dK(ITaW-_KOlejJfb@=cIVaA#6|_4KiRNYysZ
zDL>wBzP|Om|E4`kbCR6`Sk5f7WvDYWRBP$dUv4e6rS@jL;ttM&`%8|nto%{*D?s=L
z+nHs1A8eCJa$57F$WBph15ZKc{{QL6v=*Fed04S=Udm6au$ubUON!)@m`*dStYA)c
zlAZG7{c`nlul0m2o>uT0$j)Er_b0Wi=kw3j&v6}`Q+}lXjb*42wg?os!})KAX-VAv
zGkx8UC4_4p@#+abtB<ezygl*!a@Dg3)@^xs`1<mrANRKRcO|c@5a0G=F=PH(fh`L>
zGMgH^#PX^f^yE0^bA%c#o8>Gy|A5sjF@6`f25v1a4Z|spS3b`vyXV1DpzatF(&FOO
zQ_*10!gPjX!kTA0idp?;FmIBZC(JqLFT=&Ed6(@ACU&q_Oq`J7-l5dW8T2tGZ^?-x
zExWDflpj?-`123b?H#kOO__XX&I=BW?O!j*?d9`}`*tPVX$s@IKD|~>#mXbI6wDqR
zJ(&9`u7`8dmbBF|O(z(X|DAlG`?JTTL*;C9v#-5^=|OA1TZb3CK07_U$;@{hYtIj(
z_jcjuYl|Bfa4a|!C&Ve^bd>qwM1f7}H(tGeKOt|KnWK{2jX$Z=YIFnQSnusE-drfW
z<WczQ(7^3(-<TN^cE&I<)cuQ^c=^mOyMt;e6;C?emsq{|!*EdJ!rL;&6UvTW!jBjq
z8dTg>Gf|cE_)_a|cm9%n&mLqm?c+NiY^v`W)_m#WLHEm#8e2{$o@)8`&oBGSzvP0{
z?|kmMUMX519UlE<xZU!pvV*g_eet8n=p3()y%&$D8?UtM3=~;<$X+bHo5h<u--dyK
Ofx*+&&t;ucLK6VZ1d?q4

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 1e3de17595..144da59e69 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -3486,11 +3486,16 @@ public class Blocks{
             );
 
             drawer = new DrawTurret(){{
-                parts.add(new RegionPart("-barrel"){{
-                    progress = PartProgress.recoil.delay(0.5f); //Since recoil is 1-0, cut from the start instead of the end.
-                    under = true;
-                    turretHeatLayer = Layer.turret - 0.0001f;
-                    moveY = -1.5f;
+                parts.add(new RegionPart("-side"){{
+                    progress = PartProgress.warmup;
+                    moveX = 0.6f;
+                    moveRot = -15f;
+                    mirror = true;
+                    layerOffset = 0.001f;
+                    moves.add(new PartMove(PartProgress.recoil, 0.5f, -0.5f, -8f));
+                }}, new RegionPart("-barrel"){{
+                    progress = PartProgress.recoil;
+                    moveY = -2.5f;
                 }});
             }};
 
@@ -3499,7 +3504,7 @@ public class Blocks{
             reload = 31f;
             consumeAmmoOnce = false;
             ammoEjectBack = 3f;
-            recoil = 2f;
+            recoil = 0f;
             shake = 1f;
             shoot.shots = 4;
             shoot.shotDelay = 3f;