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
zcmV+c0{;E=1E>U$F@NGoL_t(|ob8!UN&_(zhrfsjBZ8o~(Y0qNcnLRN#uIoRFCln_
zuI)w?gwlct&&5n=44FS|lNY4#+jP=tC;5K!`Z~;jVHk&ut2MER$e)EcS7j|#CXMAi
zH9}CIuutBj9fIm)WAYx&5Y#4`D(}$>L1mI{<vki96rW&Md4Eso5ROV7{6Am;D9rI(
z>AREAs(@WYipzuUPhcA%6?xF_0aL`(<UuEZ*JwN>81IX}o1LQnu_E#q3}?~q`)J%N
z@0@$exvr366(AxH(OW~6FnHz@$I3>L3J{Sy;2OA1?2aoTCRO%xVBws5*>`O**(*Rq
zE`#Ab@sXk5b$_3H>eyMx8bG(e2KWRP-P=<`7?NLf$82(kkh=oDyVoV#g)l{a8O@P}
ztUW+Pnr_pdr8D4ywjV&cC#2|;{{V2#t@m5$hU`r+LkMc}Q0`yAhj2>U6Q+icl3xQW
z$S)6tt^<OFu4n~dyeGu+P*@(yUkUn3I0kOI?NlYC<a*zLA1EgeI=95eLhz`|gWgTi
zu@I`rgYIqdFobh9jS)5t?+ZnF(0?!zhHwI0b>ny13mjE>sPkwn4go63L%oNiVF*x3
z9_l_GZ^Cg6dBZRa!!QiPFbu;m48t%C!!QiPFb;=byT-b~VViwO00000NkvXXu0mjf
D<rnS=

delta 462
zcmV;<0Wtol1oZ=uF@LW~L_t(|ob8#rPQx%5g+Fr{5E2pt3ln2!Cf<Z+<V~26*cdah
zFd$Vb2%%zzI>>R;5}-aFIG<D{_5WM;Iljbgz?gqcXw`6x@qN&d5Dr`Pqlp2f_?{Lf
z?5P`!F~0mJR*M65gFrv}`$hROi^*tVz#KRMK8o^Xib;_#0e|3)mC$AJnWvZ(=_VLs
zyakSdqYWvqz#@cjrRtMx2E-U|SdH?6mC%yc6q~1936dF*2|8u9{<kp)o&iD#*ERbE
z0s}@ybDIfY;(KbFpjZO;#rJ2%cl$N*BXxI<;xTv*JOO7}St)d^>?zf)it-#V#e_Up
zg8CdVMVL%HXnzcNY*cp=su_?A**3y?th#v6E`je%kc$V+CfETN={^@WMP#?*zO12|
z0iCGMk5Mjxu2SxwP#Ex#-FFl6^PGoGNxMQd1E!jg$Eu45?Mbi~G-J3i_H;#_1l7;s
z%c5wOt{3UrrRzX^2;r_?uTmSe8|c|$LXTWL=>HPiWJf|1@zCJK$cPC8l;WY?o1sw?
z)Z(G-yTO48EyNpRj4{R-V~jDz7-Nhv#u#IaG3I~p34B?Cy!tE&P5=M^07*qoM6N<$
Eg0F<vAOHXW

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
zcmV;-0yF*p0`LWpFn<E7Nkl<Zc%1E<ze*fI9LGO7Qi|jef{mpSE|4qKN04-Z!%~Uq
z1PSB`0%@)kV<U(U;3Fgik|LmjjZGdRqzl9pGP2Ij&CTxp{s_*u@^<BJKcD;UZ^m&J
zYHDg8bDns8@MLFv12Ebc0`O|Q=W;Crj}Hy-&HOl>w2oQCTz^0cKEy+Usel}Oh_wVW
z0VVJumJ&<^bb$}ClAtc24}6G)1ea0ZA;nd|Xk*CtFF!pm!B0S#00FKNTm&@XL%bxI
z3rN9-cu1&C(E9?sqblI-{<qdRo-6az?eXd4kLp}NO+bLZUfgY+OG!w<fBm-&=t@u#
z5P$QtB;?>jw0|UsFG8fsK4kg#LF-rvd^7L27DTUEv;uPQkgkL{Ie3t-1oKhg@7m$i
zbI0c|4X@-jF2i6-f(JYp_W*#Ul^6G3|GK=$o{#gOd%$F8e3NQ)Qdu7yiLVie31}{S
zXh>Ke9NqmaDM76VNJ?nJOGmW{N=VRz2ZK={mJm0+W`E)as0|NB!(fR74|ot1Fl&~V
zlh74@)@-p$L@S_=1W$NSxCOdOXvP{IlzKoP2_EnOPgUNPTM4;uJDeL0rZ19)Xu*SE
z1-#jO);d=5=kKhf;NQKT`)%(cdJ9NP(1r(v9?(U?_2TZ-^0t5nr6yP+q4_$7wSou5
znP5&rs(&H^v?V+U3OGOc*gDp=CzQfpoykp;MJu3GLTR+&LE#pVl3)Q3N<Cm+30CkR
zC}8jN>Al6uz7k5{C3lsIR=~Uxtl>f77U(O%10EDNOUK*eR<}MRe{Z<@JbBy#9uy}+
zC6zEOR`8&_CfG-UB|I1`iguA;4G%`E!X*+s;6=gsiILR4;nW5R%cn<7|2-a8LMqme
y&Y15H$Vu>cZpdYWL`s6!LsK<1H8nMlIsXBi896vUK}J;o0000<MNUMnLSTY0XGU89

delta 344
zcmV-e0jK`(1^)t&Fn<9#Nkl<Zc%1FlF>1p=5QX8V;4UXfnL8K)ZhQsx?$hTaIl<mR
zClII+2y};(=>@5k#xjbq6dR&>0sUWRY}nc7nPntk(=x}Q@2@9G>LuxL++S*WIlYC~
z5*k2CNnKM)=gUh!0+6Ka^YK}Eo`==6i#Q~uH2&Dn{qFo-R(}+QB!vX=u=)uL4#&Of
zs&$sIegKny|6<(wb0G|!uqI0fOy*wFd<bg`4WMhv{@UdSb=B(W>tpGS_;X<abWM5l
z#Ueup3E-Z~528X?J%H)umu7uB9uXmg>;Y5b5SHGA2-ZE|KiGT#mJyg+f*j)z-T}Yu
z0ns);0t66!;88t$Km<z%TnoXq57<V){rV5AZ$MqOY=UkC;4Z+80Ne$*5rDe@Hv(`M
q;6?!M0ssI200000000000lopLR8>Fq&i<<a0000<MNUMnLSTYGV46q(

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!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|T0LDHLn`LH
zz2+#^WWeKa@QQNbf8&a!J64@%?fT`@Xti1W!)@0Nph6({=ek;A*38p?S=Yw)8)ct;
zdYxH0%Wg|j+RigEa`^>cKDU3!JtFe)?sCK6qvh}2d?oMa9(^kqzln9*8rOHFuT}pu
tuFq-hiz`3Oukh%n;+&%E%n)M>n9LjX!?(=Z6+Rmz;OXk;vd$@?2>@azPA~uf

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
zcmV;}11J2h2>S<+F@Lp5L_t(|ob8*zN*qBDhRY?nE#fnH@giuzK!mLN2I5T+k1^^^
zkU*Xwumn7sWG{h5@ah|wC?tn~3SPYU3?g$2WO4{4ZBJEAb$88l!1+$u-RSiHO?7o|
zGXivUbUbAya$WdfYoi1JSX^EJ0DxB;ds)WP%W+W*@AC8LpnvjS8?-Kf3XkNF(5e6_
zJkqv=)&yw6BW+4(ML<Y+q%8@J3y2Aiv>_qOD)2v%Rlwr%0{r;)E9VgM3BU~y0A!Vr
zMSvR~$t9t60aSP-hlH*P<{m(98Wpg;e_mO~r81|c$8cOUx)*3n0EWMr+^Kv<Nua`i
z|MLa_nw8Lq0Du3^*GZ7VBTY##KZKyl9+|m6th}cQ@A7W5Z#rhv3XsAB(3RjLg$J;&
zgw|Jq--FNWXJ0Q~wm6c1WLX9&2|2<8MD~E~{qu5qZl0Wvb<<#aZvN5h+pA0Qb06-S
z+<58;t^hZnKOYaaHcG0|S+Ud`Rn7>c@n{GVK;2!usDFF#(S(Gh-ss`qC_x&J7Ly)8
zUDQ&78y=~fYFf;iAl29`Bv9ck8)mcszj*=ZBv3zx_zh4SzOHdfBvpW=gdE`k0t9e#
z&O(B9_>e}ZS~oQfhZ@ZDv$vJ^{Oxd)cV4qEsI35Pw~eg?7wfXuRDviVbg7XVoC_s^
z3QrL_=YQ)YJmWsFT4y;>!eWm<B(-8VE=q1XkQLB$_#AMRpjrjiSEr&ctT_YVs5={w
z*j>~8zght);So;4&EyUnG9^5sksu1N2#@#@+}D0si||OD1Xh4$cmzXJ6@j5G!y}Re
zQh*eG=Ke70OODhNQo=9wM&eS+NeKEb5EDG5l7F;~%tgDOK-2<K?s|-bnD9u51oJ~t
zZZ{YrfeWAd&5xpyQ{fZ|ZH5O>3RoG;2A{UZNU#jw@9R#8YX!uFM{ch!;bQ!u@;)Vj
z3V(evO1kqJ38DZgd`MH|B&@Ga!R{I#UW?T9>Lic?RtB>ZnmeB=fx{|1((m^tI1%b5
zxPSNMi2Ma1-CZLgBs|wMLLR*jS_OOwFE-x;fGolP8A*a4UJ8QYXICHZ9z*}`Ab1(X
zKo}lLl@JpiK?yN`bP?U*PtUH&1BT<1yGO4-eSH0J4eGgJ>H!Hih<}j5mA!V^^NHRF
zaZNI$5-39MJQ5ooAaN%cvqz95#FTJKcu@d@t*|7)Eq@nE0vBF7+fNM-VEB-f+Y^pY
z?%43L497+3P63PX=A52gmt1qSpeTy6D4Kn6vZJHpY4I0poV;6TvYrzF0000<MNUMn
GLSTZ1!@-#V

delta 1036
zcmV+n1oQj*2d)T^F@NYuL_t(|ob8)UOItw{hTlkqLW6YSM!FKDn+pBFB8ZZopxqUM
z(2XtWE+9gGfe?i5DpUf6Q0T7u2ZUe<NQ2$98xguHZcDg@tV|a=mwShqJ7>;(+=6*G
z=H`CPyid-|oH>cWL=)X=Rmy1e{p&gai~(S!wv_f|x!#Q4mw%`L+U+)mr^mpJc_0S>
z04kUF=CQG{5v@;mVl>ijx3h<1-E}wTDu;)M01ySlRPYuGv{G9_zdI<i3*iAspMI)r
z=<6VeNC>G?B0w7V0Q3+-D=L8D>G4=)UZ~$4VD9g)qB+95q5&A59+Qp5gb)RQjd`J1
z5P}1c%@>Vzd4G7sfDk1Qkd=i{G$+JRsd>Qvpj!{1lp&x?g31^U(Idc=2gKH`9|98q
zu^Y6>17fI@2v9*ND<3Fr2$Vhh3za$t^t*%7GeK{8K=<Uw7y!N;{mGvg?mIoV)k$*u
zfwwQN|5mG2FZE0>5g^RRRFWiK+B5=aZ1>RE?rG1P%zvNHG#K5wdG^&-;dvc|Rwp61
z;S>SXPo4w8WM0S>0vUiD361TZvf)=xzbWsxfuJ)#eey>6zL+Okog`<R0>LT*_V-o+
z=*<hcK(IA0)aoSToz1H8`Le8sfXTcN2Lji;5C;Mo!2aGU*}RYq1XuGywh%}FROTNN
z*Y_d_=YKN|bg#CY&DW+5a>q6hNC3Fzg>(>#q%;5X=s@|t3Ie4aBLFe+2^E<?>+EWG
zdo~bs=0(~}g+Pe{>q$^IiJf(J)7LH#Oy-4D5U9CBR^)t|GYoVaoloDNr?2N9KS^Ix
z&8sAv-`S+?6|6QCJ|PI1>VP551NMnf?!lDA#($;I8QMJH7y&BjqC#gz2S|54Wt<0z
z0BRDXiwc`aa4`?imq36R0k#<+K+hGZ6(P<HPl*IdJ%CksaH#{x;+O|$kr1>d=mP@R
zJXKz5f+F12;mrRfSid{KH1s8OA8?!_AUoD=XY?Xbo+YQg9613{O>{mW*gV4(0vo`~
z^?&=?b1o1#_li<EM=Sus{Ikt>+G{vQIQKkSzn%xU5RB`jybP*7`Rq<mR>-}8FrU?j
zulZwBE?^Y_y0GU&0!6mw0sBa>sR>qUYl~W%z9DeT1J_@fdEX0UcYzP)?godzH9s1S
z(!K?$2LQmu#RUN1_vJ{NW){r}vTT+|ihudp*;(@Q0LCh?u&@At9|>HAFb^=7!PpQ&
znFl=m&rs2qq^99u8Um&X&(JlayzB<KtAk0Q%>y2{!#W7HwZ%&F<7ey6F4vnCok?Hj
z0nhaS8AA5h2EuZ^nO-ZK^=UqsLi}XL*H2<5nrNb&{sFk*&Hze;Kg$3B002ovP6b4+
GLSTYwUFBy0

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!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z(>+}rLn`LH
zy=m*m6e!X9aB(5yyQX8u;)Kc)vXk?@lMah@*tSgD!7miSpms&4=>q>%36t;le!lCU
zY<d0jG_97;XAC|uYb>1-<fVxq<~@5|{Q29y?4Z2r=wAoF+^wnoCpWLjfw#bRpRQP=
z*a1^JRj-Di$Ba%4*MB^|Zuj%w3I?x!_J-MOqQ6JH`SJAl<V<N+hgTD~EAYrEeBbik
zX~8ZwhL7ieuDi}!!l2nI@Q;<@f%^)v2Ty<A`%-?DiNUO86=OqQ%PYnP11D34#g~~D
zUq1A^S{}&GRb&aj%E(a25yG(Z{hyeN41bPRG_WY7{z>_hP_@{+qG675zN3Uq!_o_`
z>$xAU`?2_?<!Mp-7Kd84A8~hl!skEZugYM&^|62bW_kO5N&X2;f9yW#I=!iA5Lj>|
zvtCxTA%D-;`hD734B?iK8JQX`9KW>_NHZMh4M?(yo&9#<%^d!t`y|7>R&p;8DAi`^
S)tL_re+ExiKbLh*2~7ZO2DsD!

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
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$VM#<mRCt{2nm=yBFdRldBF3DebEPseafPaL)v*%lRtfbGT!E3Ra3t^Pl&VCw
z^YfoZ`P}b~Kv3SZF^LsG2qA<JLI@#*5JCtcgb+gTa6H|H^VJPG$9A<(W@(P6+mCoo
z1nL04<wsH@&<60y=Rg^tmOMZhz$gFkw9EcJssOd+0bo;f^n#?yf4%i4H;MqcBX5bY
z`T(WVel7yl8UUpK=I5>p=mO*ri|{W30O1JD2KacfeXiL6fGtAP0f6}k%?AMD5t<2b
z=q@;Pm*D%M2+af-iAC_yTmT>~0#$(0J3k*Z0scZBAPJBo-}koL;nfEy8F@>D)d#Q;
zTlD54Y^$Hm!dO=PSOn@B5W2Y8zkZrGdT0ZT@{iB&cdw_&1Ec|_BR@t+l?Mp+1g9Gr
zp=odZ+nYi)18U0yWC47X$O8lcV%yrK@&G{qz#pN8JRQ!t!MVIAL4**($2ZN4R0FsN
R05bpp002ovPDHLkV1i1pvxNWv

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
zcmV-m1E2hfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&8c9S!RCt{2nmvmXQ51&XEG}3Cu}C9ULa=ec4^|c=OMb#)CoBOQk=O;og1=xP
zq&DC-!XVhm{)Dh$8<(}wM$(F{$P}rJMYzMv-FxPqd+wcWJWrGPx*zX5=YD1YMNt$*
zQ4~c{6h%=KMNt$*QT`WNsWO_MeOm*-r_<k+>$7Pus*FjNugm9eo^O8J?RJv7Z>7k@
zh`&zqJWo=l*MQ-8f#G;T-uH<gju+yJ+Hc>6GGUVC>@uPvfcxepCiuh~VohKhU`GNa
z>gD4vRC=}vl=$tl*R{`2vb-XkV?s~_%%(j6elam7go-bxI~ufo*<T^J32@(}#007M
za{5pc*apm|z2LSSVnVF=ay}s@uncgCzyD{(Dxl7U;drs0WcfN)e1Getavov=%K)i(
z17$)Tl=$zbC(i3G6FB8~4KN*_p-%i|c8v4+h4WsB36%I}{apZj6F5;2+zI};HFRFT
z%#MrW7!!Qr4K5Sre_wg?w_(qxCC$LDwBf_or^WHThmVS5u6P%=_@e=Dtq`=JNNIwB
ziWY8qKrS8#p9oblrkX<;pTIhr77s*5fD0-rC^3{l)bpHn-be&+CqYzHghWD&cz{0y
z0?Y`Itme3L1x}a)vL2oj37q`^(R!ZKKX8$V2Y8W?WJic1g$YveTyCVu#Du#$oOi_|
z!TJ0G+qjz6l#{}o=m;pc_0S%@4o+V7)K@~30j`cNg$W^f#F`*B;Kjjh@?MMylC);4
zT!P2|BmT+YE%}T@h$PK}gH1mmHNiVh+QXph&6ih#HchStjQBF|K3C6ubAg};pu%1f
z2^>Pj1L2VnvM1Q;@9&UqrZzz$9@zY4mV7NxUIpI0bF*<1q~cerRZ+J__5%Q5xm*GO
ze*RjK)6BX)!6syQ<cRNdI_&%a!6?w}b^*vEK}r+i0pT!s-6k|89!T_kK;56DzUJU-
z0=^E<Q#CJ1R)f;f!AH~LfrQIp%7p&@PHXi3V{m2n4o59YWGeAM;{5>Igz|Za344d5
q;#pg4O7V@+#3wVUK8aBjrNTcJXNv?&3vWCC0000<MNUMnLSTZ;1d?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;