From 4e1dec2399127420f20c7e9ed5804376082c7bcb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Dec 2021 16:41:03 -0500
Subject: [PATCH] More turret cleanup

---
 .../sprites/blocks/turrets/breach-heat.png    | Bin 0 -> 772 bytes
 .../sprites/blocks/turrets/breach.png         | Bin 2413 -> 1452 bytes
 core/assets/icons/icons.properties            |   3 +--
 core/assets/logicids.dat                      | Bin 3910 -> 3893 bytes
 core/src/mindustry/content/Blocks.java        |   7 ++++---
 .../src/mindustry/content/ErekirTechTree.java |   6 +++---
 core/src/mindustry/content/Fx.java            |  19 +++++++++---------
 7 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/turrets/breach-heat.png

diff --git a/core/assets-raw/sprites/blocks/turrets/breach-heat.png b/core/assets-raw/sprites/blocks/turrets/breach-heat.png
new file mode 100644
index 0000000000000000000000000000000000000000..43e9a698d8b04afcab9ee401ff3b11f9695370d7
GIT binary patch
literal 772
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z_icP
z#WAE}&f7Z|{e&Gw+CS!REEV_3;(4|A{Nvw0qtsa5NhN>iTGePKmDcdC!Z5w`=r)nf
zCuj2hkH2(bn$g`k>veC>W)u_@oVa|&C%cB&B(CfS3=7uHa+l5aQM`F|+qzll&hobd
z`1bH8%${*bD1$v>)z+<DAt?<r4zVY&u3?YJ<6V<;_K}FV!m<zZ{+#-M(BXYUo^JGR
z4Oi9<%{|O%2PWQ~T4qxde^<)=z?pfAC62OmXv#1NCwSSdQ|w<GozLa-W@lG`Ps4IA
z#yOe|#;gU)7|w|tn8{=j%#hCYz=u|Xn=dh`e0ryry<27X7xRRwfcG2k-Y<W>m1i^K
zi3BgM3ryt>4C~%L=iR&Tt?<KpAEKid?|&wHIH%dT;}Vn01Fi@L@dJ}=w(M2Pk*M2X
zs+V(CySgul$!8D$g5|3Fy~GcwKj8h)RMWG*q3uu8$|SCr|Ky6I+v+)M7@uu>c4(e6
zquC4g8O(S8Io@5c-R*|qpYsPK3zD+64w#i*T{7d4?oZ{%GSXl6w*M7g_<gtUVS84)
zNy>9>-`ZY!RpfL3ju{LLrB}BYwtC1tFspan@Vkun|CPLWrj6@nCB^*>h+z1!p2OhM
zL+3`u2Z4fFyYJbSg&b~oVm{C;DD<<YE^T}Glg)FD-ArmUEEsZnFYx|X|8VQwZ#TQs
zmWu8YM?Wn5z_7v4seIQjQHyQA_f0<k`T3L0a|3zgx$f`Tt-q|m;oq5h&OKYb|0`!C
zPFGcywCmAe_|s>gTJLGiGVk{Kyc6%cvOiV+(`e&Y=4KEGUh!kIaNd8DEvosU@n@#%
g2x5SV%b$xU)|*v$$mwlnU|?YIboFyt=akR{0P>_uZ~y=R

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/breach.png b/core/assets-raw/sprites/blocks/turrets/breach.png
index affd6b4599f8a08bd3d049795635b8f847e2b994..c3d6e83a4456174a05ebfc91cb5c48cb2421c10c 100644
GIT binary patch
delta 1435
zcmaDWw1#_vay<iMage(c!@6@aFBuqE(>z@qLn`LHook;LV=i#ap4HCb3KwHYMX2Pf
zpq*if9t~2aRt-_QbGRj%^b?%(iW$uFcuo{dw3@n0A@s?ih6!d?jb^RRPk(mGoSWc$
zZq1SPQE%-EPri5OJ6TyTCLsj@RXw*htYcXE^z`P?iu&4r-+V%@|7~8p`~TmPj|X$D
z>o=@(@CyE%ZQA<KSC27cmi!aZCTj-W-Ymv#Ve1&ayjXfqVF%*{W0#7i2TTpFHQ$&H
z$}~KE@`ABRvti25@cO?C|HXFCz5C+#HGwk>PpbB*wM_ZxI8DHZq2O>ITg#lEj$s04
zo;S?NQYbjPeM&V$y@O;+seyciFav)ibHhe9hUA?r7nJI@--ymQp~~PO-W2|s@i+s6
zEXTaF>~okIUMW<V%SSLXpz4ZYdNH$a+ca+mhx;X4mY!h@c(%pQy?Vw9U&ex}wAUqD
zOj(Q>CT+N2C7a86kfq`Hj2za5)(o#FKbWGkuKq&BqQDb-9<5wG(RQ}{mimG%kFLd6
z9WC>@s@!lpTjg2w^2O0xG?!{I=xS%p?R&?%P{N^~D{A@T>Ma{N8q$syv2FEnFFuvW
z>&UZU`A<jP%NMT+xG?CPd9Ucrk;5=6JH`JQd#2wnAr2je^Y`bh$@^w@I{V9sEf#x^
z{+u4J!?8%9-bCTaR*Su&vikE{*ju(NdB)s&`U2y_eO_nSwak*35B=9Nm0#iGdPHH5
zMSa`px36a<#cEw$C-s@}X~~!F&*|ms<%L?Ny$xbESetUex#7aDSS^O6sXS5X9JaSY
zc^g)xT(EL_adlnZa+T|xOvh_<OKsI-m>nm@uRIz3)kNOFLbE=8a>rwb6^8d8W$~6W
zytn^1_s^T-_y4Wbo8Pox;>NvI)3-hOQLuX3kLn=S1*vs;Q;sM+IU^ps;;NvNX+y%U
zvh&j&E|~m(_ghlHBw@q4?8<-7mQ-Y1Z<{-(Qun+jbLq;qr<bos*3b4kBxQL2SES$-
zj|%~tFR4De|0Z|R&Cs{q#p3nLw=bG^SBPnKN~Zs`S@PAk(^;I({kida&Juwg$J6_{
zgy$Ryd3T{-GLE}3+wN=J%kulOzvus)Q_Ibnuy5Ce76-{#F2^jp=bP`8-?J{e_PJPK
z5<`%;H801U&6z<QOP@XOTWM(D(d3{vdBs=L)C=e1>woP_n(XG`pZcufx!bG~$$CrE
z!aTdF>Wh->N+qo&n^r9Eo8H5+^5^mP=+KiJPruDBYL*CQSa$Jq;~!g=o1PKUOyQSf
z(>Pl)pM`QQoc@!cSaKC>qTH;YuH28R0!f+qdM)Qq+uyt&oNcFYqhqN;&8{CCKK|C<
zzbXIfNyi1BwC4!89sMK2()siB^7ZCHYTkMEu|jY4o(U|g_f}Zq#+zDa(BC9*=J^!k
z=_!j%&we~}cG^92wR_3zmy?wju{9mpBGFQLe)^Q~thxY$y-$|yRolOI((Rfv)0e8+
ziv3_K+_*VfrmT;D`-#-&F}ii#$NoeLUQwCXebc;p_RUf|*6pRsCM*AzQn35!IlXU6
zlE4n_P1ov!*f-P{Y|-+R_gBoAC2!Iikn}Gpef!DYXR8cz=k4;y-KXK8x;wRV#fHhN
zuJ4hRDnG%#vbQ1P-ij2Jj5)5}D^;Eyx0?9OBY@FC_3a*q3r6-H+)mTeT_c<?nAxBB
z6Di10pPR$FaO%&7$;+2A)G1b&%LmM9*(u<q6<3lN-uP3u{`Q1Puj~}AGidcsnf&6?
zF{aNuf6DlNZe)`-)XF_;*(b#A)cbSg{^Ix7S9oeQWp6WM;r$%^e!GEu#-Hw6S3X~V
zcHHyS)hadF<5xh%nf7N!cl*q9trM6}wO+Us(isz?q`}@Oy{SlG&kTMGW`-q-9?!c)
mSp1*y^YZfY+UEV`7K!TnQM%v9*o1+Bfx*+&&t;ucLK6U+dz(Q3

delta 2403
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
O7(8A5T-G@yGywn}Iai_p

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 0346ad6892..919fee1809 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -406,7 +406,6 @@
 63302=dormant-cyst|item-dormant-cyst-ui
 63301=neoplasm|liquid-neoplasm-ui
 63300=scuttler|unit-scuttler-ui
-63299=breach|block-breach-ui
 63297=plasma-bore|block-plasma-bore-ui
 63296=steam-vent|block-steam-vent-ui
 63295=pressure-turbine|block-pressure-turbine-ui
@@ -474,7 +473,6 @@
 63232=wall-ore-tungsten|block-wall-ore-tungsten-ui
 63231=regen-projector|block-regen-projector-ui
 63230=titan|block-titan-ui
-63229=horde|block-horde-ui
 63228=small-deconstructor|block-small-deconstructor-ui
 63227=barrier-projector|block-barrier-projector-ui
 63226=eletric-heater|block-eletric-heater-ui
@@ -492,3 +490,4 @@
 63214=beryllium-wall|block-beryllium-wall-ui
 63213=beryllium-wall-large|block-beryllium-wall-large-ui
 63212=quell|unit-quell-ui
+63211=breach|block-breach-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index e61fa09a6d4fbf24484bd5972c175c0cb6fe0b26..19cccf81734f7c869ae1dc19454d0ae2f04c355c 100644
GIT binary patch
delta 21
dcmX>mw^fdb;qpeNtz4TAaw#xwe!(5b3;<YT2c-Z2

delta 36
scmdlgcTA3n;p#@Ftz7IJX+??2C8e9Ua49pgv1a5KrKE1Y#vRWL0OaQkJpcdz

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index acfd862c1b..a042773325 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -121,7 +121,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, fracture, horde, sublimate, titan,
+    breach, sublimate, titan,
 
     //units
     commandCenter,
@@ -2897,7 +2897,7 @@ public class Blocks{
             Items.beryllium, new BasicBulletType(7f, 90){{
                 width = 12f;
                 height = 20f;
-                shootEffect = Fx.colorSpark;
+                shootEffect = Fx.colorSparkBig;
                 smokeEffect = Fx.shootBigSmoke;
                 ammoMultiplier = 1;
                 pierce = true;
@@ -2911,7 +2911,7 @@ public class Blocks{
             Items.tungsten, new BasicBulletType(7.5f, 160){{
                 width = 13f;
                 height = 19f;
-                shootEffect = Fx.colorSpark;
+                shootEffect = Fx.colorSparkBig;
                 smokeEffect = Fx.shootBigSmoke;
                 ammoMultiplier = 1;
                 reloadMultiplier = 1f;
@@ -2935,6 +2935,7 @@ public class Blocks{
             size = 3;
             envEnabled |= Env.space;
             reloadTime = 40f;
+            recoilAmount = 2f;
             restitution = 0.03f;
             range = 190;
             shootCone = 3f;
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index 34a2d33cdf..9e490643a4 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -168,10 +168,10 @@ public class ErekirTechTree{
                     });
                 });
 
-                node(fracture, () -> {
 
-                    //TODO big tech jump here; incomplete turret
-                    node(sublimate, () -> {
+                //TODO implement
+                node(sublimate, () -> {
+                    node(titan, () -> {
 
                     });
                 });
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index fb2973e277..0ec83205d4 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -1510,6 +1510,15 @@ public class Fx{
         });
     }),
 
+    colorSparkBig = new Effect(25f, e -> {
+        color(Color.white, e.color, e.fin());
+        stroke(e.fout() * 1.3f + 0.5f);
+
+        randLenVectors(e.id, 8, 37f * e.fin(), e.rotation, 10f, (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 6f + 0.5f);
+        });
+    }),
+
     randLifeSpark = new Effect(24f, e -> {
         color(Color.white, e.color, e.fin());
         stroke(e.fout() * 1.5f + 0.5f);
@@ -1524,16 +1533,6 @@ public class Fx{
         }
     }),
 
-    //TODO just make it properly colored...
-    tungstenSpark = new Effect(23f, e -> {
-        color(Color.white, Pal.tungstenShot, e.fin());
-        stroke(e.fout() * 1.1f + 0.5f);
-
-        randLenVectors(e.id, 5, 28f * e.fin(), e.rotation, 10f, (x, y) -> {
-            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 5f + 0.5f);
-        });
-    }),
-
     shootPayloadDriver = new Effect(30f, e -> {
         color(Pal.accent);
         Lines.stroke(0.5f + 0.5f*e.fout());