From 2e98ecf09ab66fbf862daa8aa751da2313ec8318 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 1 Jul 2022 10:58:17 -0400
Subject: [PATCH] Scathe turret homing

---
 .../turrets/bases/reinforced-block-5.png      | Bin 0 -> 4493 bytes
 core/src/mindustry/content/Blocks.java        |  50 +++++++++++++++++-
 .../world/blocks/defense/turrets/Turret.java  |   5 ++
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png

diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..39103b790ff630f761d27e593548daee2bbb4920
GIT binary patch
literal 4493
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~20Lp)s^Ln;{G&b92j>LB32
z-n)Z=qmZ#JK}GM-BnPh^3pSP|6O@vIJR<a(SPm92O?bwpQx$(Dq3X`NTerT|{84$G
z|8&*6SKq(C{jfk;KYs7O((m{Fs$YEjclUOG+rwv8ykD!UW7*boYfbDH_TUoX2`BwU
zw>`*o3aj<cO+0Csa<$EaKdMB~p!ieMQqG%Sb+@*v9-j~^ZDV_3f?h)ZN$y!{UskPO
z2{IyX>%mLRx+|H!&DmpcwdLN|<yqX`eGAKTFMK)RG^?T5CvE{}^6Z#<lQ-@<{JH9y
zSlidO<4-@`3ow4&>Dkp#d}{kfzD+7T+&fNw|367F(c^&czTOord5q>i&00EI^gy)N
z9-&#Rcb?o{@o?e=l?QLF`Ro4vsQmfh)>iGUhB<$pN2rEychr3O_T|g%gK7_tiHLEA
zGIiA)QhVsey|%@d(femhN6UQsdfOlW{%+azbw_vp)f5}sSA83=L`0Qte!hNULC}F&
zHBIhLvo0t_v-$d-SZ94KDEZ=*w}$_xwS+Q8f8rG5H1!qOG%Il>XJqN|h%B9HyKJA?
zt3F)O5cQL#w`H0d$HlaYET=8+B)of%25&$9CtGNq@CB{;2C55}b2e?4oH*;jT9A>Q
zSI*AaZ=m+jo~i1o@G+Gh6UPl^%8S(k%#%+y6h_QbN%?XhD%e@`;mn4>pDhbpBz*<8
zoISB-r`fa@joX&BE^M)8-26n?<xo!4*&FFUTU4tqta|CFVsmC1f1b?UM+>;Ore!>}
zw%fOHxAx<AJ-s#Fk0kk%)844wlB-y8wWpz_-QB!D*#6YrV7rAmZQDNTlyP!<?o;jP
zX*V=3bG+Tmk$RRVh;@#$U1QpbWr;Z(S;Z#B6i+ggJEn6xCZNAAb)wpXIiDhDM&&dv
zyL87g;&#QF3+lh7I(9XP$J&8}=4Ct)ekRc`{_Dt(MJ=p%#DB8P@+z)QnCSn)a-PPQ
z&X2AfoEFP#bmS&a?LE0&;TrSr%umq?f8tD%7408S^WE&vc4gtR=@S~l*TsFmX6jh%
zJ;P-3{3Z$gH@8o%PtExw7WG)-^nA;IVpl$Gs$x7oOWWY%%A*gBlJ;!Sw^Z`!jdy<i
zbn41Kl8>)D$m*{aD_FIYY4ZF@EvGv^9@_Wh!ve|wB7#3#PW;#!aQJi<>lPh3-WgEI
zdAd$*HB8CN+4m~!pB~DUG0}ekXRz-xqa;11nV&e%%$57na3?NIeSy1OqnnTE%+no_
z#<ov{XIR^wXxkGPruyLeWdDcjYcBPyR4bM=%wDp*hN*Zt`^*WKy*(W4%BFq|;`zjA
zx%j?yp6QI!%D%51z3om&8CSk=WSdy6!@<eHAv`tUiSP-@i2;{mk|H`x7fj?gI_|Ak
zC7`G!-@?k$^3f~el=_6r$_vX38(kxqqXaun%NXxG@lw&*&O=Z@;FwmTuU+FDF;3l2
zsip?Z-5eawHDXVcmbad{Cp&LWP35ew3qx8idfk}hudv+hP`B3n1VP5cj`K}1Pp(YR
zy#LspU;phsVWaIWQ9oOzwTQ>s9aLgEBru<K=Lt*KZ8cYJadH%Ubp(XnNPjb}ApVK4
zi4w&8)fb)ZEQAG~O%j-Cv*CWgp`}k2>vf0bMH)?Lza!P5Y{y*Gd(qqOhr7cJXD63W
zhxU0yWM7k*$?LLDsz=kC?b8H*=E5WHivFHy?<>xPKeJa?NU_yqY|)%QqhQwOy&LvV
zJHzI8Qhh^*q!B~qiRFzJkM{PQ)!kff@a?(TUDg)EM2qvv3!etxn8_;>y+A5ZvQ0ts
zr-^|3o~gI)*z8;uF|{FK>IbD0>J_OH%z|L;TdzD}_Lk%A=D0D*O*>Kh{Dh@>KfTr%
z`84u8x$GeGQFqxB=3F`5&D<-dE>m4-#=pkZPO(^UVpok+hw?r*Z@Yz4k2iT8IFWx;
zhG$1%Np``ivr|`J=lAp9KbL#Uvz=vcPwkYEv#bC2>Speg_xJrTA3OR7Y^(R0;?++#
z7J&-f_xJbKTHSeHQ1R&7T=xBK%lAes74+iNt=u=S<`(Cl$IqW$To%1SZ$jG|SC%D8
z^VuGCi0>)Z{#>D{Y9m~b`IALuiZAyk&O2RhDqoNkrF1*+y>gTE+96z^`>9gml)8(`
zl9RS4BODrI_8yORvVG+y$jSeF8h@fdOK<cpjwh=e>(1*co?Uv<*1~Sz#Cc}PdwRNU
za%SxmcFqw|v9Z}z`A21z$M1->B5a;}gr@C0rtm*XC1qlDBag?!g)-C4#J_g*3W;6N
zp5LGn#%cPA^GSTvp`wY^4Llx+3(fR$^<D`|E2<=f*fDx;5sG>ud}9BUmaVSu7>yKK
z+pg`{vU7#|n&}f7q%yZ0Qt;HCZ+2bc$#)NrW@Q(#<IG>9lJicgXB06O#_i(D5M}es
z5{fGBb*x+6vi4|>V5E%xl{LN5+Vc&jdMh0B4rh!k(0&u_HA8W}L*3dI$@QE{PAQFh
z0w&*bUh|1Fb)HaGW#rt31{I~mWi?DcqlMB=sBdVP==#aYH>)|^Zi0;IipQx_nV2SR
z_}X;Gl+*aBaKw=lPL&JQqFIjFxvJEMGwu{kUU;1=SzGmu;`{?nZerP-CVxB5tX$nt
zFj3`-iS;ShNddR}L%BJ`T@UTt!6B6OwD~B@6Fr`tCIaq%q%Q7TFz@6n)h#E)D~p&H
z?oM#fdUDA@=Hp&Rja=QN=}y{;P8rFI1H8RM>^QhNJdQSHEA;({<7v&hDs@cH)qBlC
zfwea@4oB%4J!uwUWLz0hz<We+{@ED;TceUUdIt(;`*cL*OxYM^y6H)?30(f@lz`N=
zD{m~-I66ycQBSW?=xUW<I}01jpPx(~8#gj_uWh}-!)fXi=)G-gQ^cmN3VNU31aCOO
zE@|3&yk9QvR;`MCu#?zLrjLT0rk~zw2Xe0c<T$P2g!{g^4HHxqogzPS{jfi+?xK<s
zuPw>cRa2m*km6x6y<v7uy`xIM#GCY^!RaRgKzY5x%c8wucFl7~wbe3jl8;6uduYnf
z5f)JL_p0LFaWb5Jp-z)P{?SSMm;4E3*-^k$#qxjt298afKiE%Cp5S{R(~NO_-28VJ
zIA%9g<}l?k>77!0p!Q%<4pW)fgx%Txz5f|s|K75?Mo8%IMx}lkkJQEr|GBltwB*m|
zD%iV)>=XHX{<J~h&jZSAPLYZ7{%dQGD1)S?2+iZ1p(tOm#6gY!&GVJp{VSd}tFp8}
z>QUy^0vGk?{XZ|{_Jn!fh6vS^`8+O%w#cs#(P46XDr_PY)NNsQTH-m&!ia=z(<F|h
zEm&#V@<V5W!B^pn)4pd4Doxhhcq%G*qjw<JQK#!FI?0QDu4*Ov97&(3_F&Q{&g7)2
zpE$wM*43JJu>DHX;-0Ik4$kN}ui$#X^n^Ok(N!nad6K6uQWfDo+vKcmc4|Wy_c526
zDH|HHC;2<*nDHLb{W>E+TZH?p8T%DSJ>DaN@`@@Cq@I4>(9#n1a~i|S3Es?wN2)nF
zSL}V7aaVL*qowK+`KRlP*77cK(&If+^-@pa>^_Y%iVMFqNBvfMn8i9JEnY>yx%zb8
z(l_i|zd0Vd%H`3#_rnh%K_yF2_L({56X%sznu_=TK3!*`#QED_@Z{aEdNZC?IoL4@
z?x|D?n0!m}$`j!gSDl@n2v0bn&Gp;w;aTq0!UY=h8#r_>-3gd{OEBsa=ao}aKq4M;
zkvH<W{QVZLZqSkIy=tU3KjG|D)>7q&XZ|^DEy<raPoxN@X-!W!8Gb3$A%QV7r(5$U
zOYS<K6_Sp|-xZIzt6bq&JT+i4x0vvRv`n!MiKOhFQ{@KdpapMl{ERcbi=!X*%=>7x
zU*29{K4y2>(UAY2pRa%Q<NbYq_0QSGvhw!>uFE|B@Z#CW$s4)1T+o?yr%58o+on6_
z^wiGu7*m_aOT)!Dw;tkI>AB*p=v4kgOiX7Noz(464C~M-nyEec#Ez_rW8UjcgtA&C
z7f%V8t?dlWQ&rj=Cf#b=72LLIJXx5hX8T0g=5cCWuuxX(OeW6M%M(<=wW@4TK^~{^
zN1az9PhN96MJCQS<TQS=d6K65)^espQ7V6`K4o4nn6++dqs1d*1^%B^2kz`KShui6
z?B|3wb(5Ssmns$g+3tMuoM+6Kn8|sXb<xWxNl?A|X@dUbqC7bXaiJ&`t)(BmBA$IT
zn!^82P+;1m4ci<{VzrqIkEA=ueM$|OJ)8aXjI2u$s%xHZ3_8XBoTa5lU3Ee1k!wtu
zpBcDaYS^AA#<yI%qZ2VtVe68MUN=r9KLm9OPXAcP<diMAmHWymW0uU0^9?pnJ};O%
zyUhpGKA8FGpc0c)F5_D6l!=YAz!pVrIG5Wc_lYxDs3=lxwa|s#4q}oM+J5kyaJJ*U
zx3l+RupQ&YWAknl)TwoISX?{sf+;e^K?>~UWgX{oPei<5*1>Uj-_n*j&;ICyFx}ht
z`9XNt!6@d)6B<u4PAUkvgWP#v!uzCq?6ITXCW46q>smf5S+?KVTmIiu^P#=J)3XWu
z8DVTsR-O!SlKCh(AwB2xqOzm1%s*L<iA)r@dF;WTIH7r*7Sn4S7H?7zFUnNt`(gTc
zs((UV9H-z~w&`Cd6sSL#^T}}=hsoSIQXR^5y)I9MXUq?EIvZVWt70=J+D<W=WtN{G
z?-9ZMYMY)2&zK+P)LY}UtwnP_JBv4SYmQ)sm8B`D<lpcm@5hYwte>+zGbZ|<m}21S
z;LYs4$#ucYCs!QaNL}c=t~CFEOtw(f6JbzCM`EIX0%Jyq*puvsk!Ruz%FoW|{CuEp
zX^Y^`79LJ#CQzltV4}rb<hxPrC(E;YQs#znH^NoUOz`jUk`UT()j<2n;y}Tu@GjF+
z>IUUi0nOl6uEz}DCr@XFa&k;mi%<E<qOy?PbVrW_|Jr{QH?<iLUVai*e7)v$cvHfc
z1#Hs=lNVl{&rz+e5HagcR$hqRCu6zSX;V`;eg~~*n=ZJx@#FUteO4CV$<b%ePB`D4
z_9s|D!ZNEs(lB_-ugM4Rad8Cu=9!jz{%l$KG26kQ=*k15q+=Oh)w}nK2^^cXCNnQL
z(In$jwxsla)^GEhPM_YH*0=v?5|dG;nmzj!$vi2E`R#Ju$8YR?oOoaC2+#JN9d-FC
zUyOJzgsAOvlMsKr`GT`uV(#NkA#k?r_9?#3@i?hQs_K;bnp~SWaOK$Ox@>25OQGRD
z&1Vz*K|PU_lkAyHOx-@k&l}QrTuHusMWyYA;j=0JCnWl}vP-6%VqXcCt#*3co{?>&
zm(;GKIA1`re>=P2rl-wY?z77rQo4LcZc4BC7E{UV1<|t}Mp&#<yv59K`{eQVq_X>*
zCx1CEQjAj6xgw?iWd*1|#%TIe#P`Y9eL_zj@0r`Mp^P)LsjYTeL8qLD@2^>^3s118
zGaZUjouZbpF!I*!&6+E`*S(l#D#qPo88!VUzhZjGp@lUc`WrTwah?V#naKL#nr!mQ
zjV`aQJ@fZl-?Fr(z|SF~yJag#QjT*mxX(Fn*V><xFKa!VQDdN`prf0(nlmb6n(Lu8
zyOMQG#k^zR{yDjF>IOCW5Z0EZDp$-LxzAqmm=Rmvv-H@amDzLcEu)3}PO?vCa?<CN
ztjT@txc1tIKRYF^t&x52xOUo{_l>pLLff7+FKf8qe5m(tqK{K=%>p3-Gfwkm5?(8&
z@?T*(1nO6N{CM<p^IdD1C?62tt+!wP-i#;An;SNG?g)G|kv|3`+V)^7{~Zv+&Bcy`
zlSAD3P;)O|&7Tj?f=u2fnlR3pQ&U-0^7#knar1xt;K)q$<D6;p^;B-3w&U7uJ*g)R
z&jd=pU~HFM!pWiI^j^)!cVGG6mA4K}N`4V5ZDPA&f|kOUoTju-dtYUPM;XF%H+*sM
z-qmnnG3T_C>DRYk5t}CCT$cOci-WT`qvB@Hc_-7aeg_MN<#v2oa5Vq<q_h8aF73L;
Qz`(%Z>FVdQ&MBb@0K5MU)&Kwi

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 87214f07e3..8dd6cf323f 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -136,7 +136,7 @@ public class Blocks{
     duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami,
 
     //turrets - erekir
-    breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe,
+    breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, ravage,
 
     //units
     groundFactory, airFactory, navalFactory,
@@ -4278,7 +4278,7 @@ public class Blocks{
                     engineLayer = Layer.effect;
                     engineSize = 3.1f;
                     engineOffset = 10f;
-                    rotateSpeed = 0f;
+                    rotateSpeed = 0.25f;
                     trailLength = 18;
                     missileAccelTime = 50f;
                     lowAltitude = true;
@@ -4409,6 +4409,52 @@ public class Blocks{
             limitRange();
         }};
 
+        //TODO
+        if(false)
+        ravage = new ItemTurret("ravage"){{
+            requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.carbide, 250, Items.phaseFabric, 100));
+
+            ammo(
+            Items.beryllium, new BasicBulletType(7.5f, 85){{
+                width = 12f;
+                hitSize = 7f;
+                height = 20f;
+                shootEffect = new MultiEffect(Fx.shootBigColor, Fx.colorSparkBig);
+                smokeEffect = Fx.shootBigSmoke;
+                ammoMultiplier = 1;
+                pierceCap = 2;
+                pierce = true;
+                pierceBuilding = true;
+                hitColor = backColor = trailColor = Pal.berylShot;
+                frontColor = Color.white;
+                trailWidth = 2.1f;
+                trailLength = 10;
+                hitEffect = despawnEffect = Fx.hitBulletColor;
+                buildingDamageMultiplier = 0.3f;
+            }}
+            );
+
+            coolantMultiplier = 6f;
+
+            shake = 1f;
+            ammoPerShot = 2;
+            drawer = new DrawTurret("reinforced-");
+            shootY = -2;
+            outlineColor = Pal.darkOutline;
+            size = 5;
+            envEnabled |= Env.space;
+            reload = 40f;
+            recoil = 2f;
+            range = 190;
+            shootCone = 3f;
+            scaledHealth = 250;
+            rotateSpeed = 1.5f;
+            researchCostMultiplier = 0.05f;
+
+            coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
+            limitRange();
+        }};
+
         //TODO 2 more turrets.
 
         //endregion
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 0d16454700..2342efbb8a 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -393,6 +393,11 @@ public class Turret extends ReloadTurret{
                         if(Float.isNaN(rotation)) rotation = 0;
                     }
 
+                    if(!isControlled()){
+                        unit.aimX(targetPos.x);
+                        unit.aimY(targetPos.y);
+                    }
+
                     float targetRot = angleTo(targetPos);
 
                     if(shouldTurn()){