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!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VA|*D;uumf
z=k1+~e!`9-?H}_umWumi@x0o5{_*dhQEDvjq>?{$t!gxrN^5vmVVGWebeqWLlQVh$
z$6vZI&FJo&^}4rbGYSd{PF%j?lU+k>5?A&Eh6U?pxyxqzDBirfZQZPNXZhO!e0%s4
zX3sbzl))acYU|dnkd%fQhu9NX*RV(A@vg}^`$$AwVcCaye@^{B=<vQFPd9qEhAV4_
z<{sv>0~7B~EwibKzboZ_;LN<m5=U7&G-a5C6TIx!DfX|8&gb%Zv$HF}r(wAl;~dQf
zW7dLY4Ch1+%w)0%W=Q9H;6p3H&6k)|KD|@R-mS9xi+Ms-!26AN@0Y*c%CnjAM1mLB
z1*UQbhIMbB^X^^vR`}t)57E(!_dk<8oYQRFaf!+00apZr_<>0_TlOmDNYrgG)yp}n
zUEP<&<g<r=!E)98Ug8JTAMk!?s_9wZ(DtWkWfIrRe{x09ZS|ZrjL)_`J2cOk(d-5L
z4CcH49PcjJ?smiQ&-nwA1xeXj2h2*ZE}3yi_own>8R;*3+y4qL{Jz`wusy5YB;`4`
zZ*4EVD)PC1#|#FB(yLnxTRr3+nAN*(_+7^P|4Lpw)5dkPlH&dbL@@kV&tY)sp>reS
zgFwNo-S=$ELJqe(F&}6a6#7|Hm$p6p$>zDnZYDJv77RJP7kK}xf4KGTx0~H*OGS5y
zqaPN2VAx>jRKDw%sKvJ5`zD|N{2Zt}kVl^D{+`|X%L*L+ovG*Cv(@{*az^5GRb@%L
z9u0;+eFm!ap4Ke$Zm-Wf@xCkjQ{_L6HhyJp27%xeKQ;^J{Wsa7njac}X1WeAk)eT!
b%b$xU)|*v$$mwkcCTj*yS3j3^P6<r_@}x^}

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
zcmV;M1!Vf|608f5BYyw^b5ch_0Itp)=>Px)W=TXrRCt{2oj-0|HxR}@1wKI33ISAj
zRT=71xmICFfEqPAfLbk_3mAegU_)+m05@(7$Z(N5mAW8R<idcEHadYeg+t}}i5$+5
zL(Z(kuUhRsamnvT4#|0c78n{D8X6iJ8hVV{u&w~5<;$~Gcz=EV_DodQ{ez>s|NV6F
z!EHN#u&zK#Q}b&zh2c#u0ce^Z<Q0ND04<Gb0k&4I0QBgk-XORE&@)7Mg5UyxMSS)G
z!5o0)<mdr{DS(vuSAYGX{#}cm-RS$)5X=DNdcG!vl=(rH5KI7Y!;S`oocTdk5X|R*
zoN6F&&9{_$0DnLkgmo|<SQ7vbSp$Hv1^{EZ1kfUWx7b@~$Rz+k7lK#w0mlFU9SEMy
z2b=={>L7SGA6NqbKpBK}FdtYG01sIMfU#Tx=$VeTmP-IY-*mL4%mGm5v`$BRn5azw
zaC&CzbhI@DGXRpX&^jG$3Bd$_$Czvdp*sNUli-vru7A*YqEX1a;;E~VJ)0l2e{i(o
z)?a$Xc1+bHfZJ;%=3A$uTeK;qDgZ4jYMqYm1)&%~j|y6+qkFWm2!LkAat5_bM{~+<
z4M7Z`r};rG)6v!tL;x(z?;%SFYyg^TWKZS?X-@hQ2rK~4-<+&&_BP9F^vJY0y~X*L
zS1bsk5Pviv<h3}x6&)|0ga?GQq~-&K%g_PgzDmpoDmG#R!v88YAE-=4#2~yle}>EL
z>zZO+D%GwU^8w{_^o#Rncds83gqH1612C;*&_jUGx?L&&VwDV9X9zvoRSkfuWY9W7
z=+&-nrzF=20>^wUbv-9s13{8ssmWXQG#@ZHDSuy+h~q%0G2h~94RrwTKmMKk?8o2!
zsV<*_ppmh?dY883_;9PX_<K?Xpk;n;l*Az9%okm#)e%B9fMB|I&zC^ZH2?1V84xsJ
zu&!%){^q23XxE0FoOvzJDFbz>hUL@OS$~^O!WuE(`dJawNYGHT(k15K>}`_SRqcy&
z7k{U>qMqFn0;^<cPnMb=dp(x~LeBiy>zt$zxW{LY3KN{fRPNA^8D0y4Yd-Z}>3829
z`=9xoeG3U-zPiwaKp9;ML25qdv)p&yJ9gIda}bgMQcF7x2%NKNQV6By=Z>i{KZt@r
zE|aMBHD%DxUw`_(Vv|NlPi5wS=SG@z8Gku7ac(}9C!%6Lbs0Muf~cpCmy86d`NxM_
zRmri-?Q3#_7*hbI(er`)Jp|cFSQ`RY(_Ll>glXng3Za+z0CO3t1z{eVQi^TyB@kk1
zZ!Uz-%RkxQQ)@mT*odVde7g9s@%t~ovTxPNL7?(0oDfFE{2T;{`OBxTH&P}`Zhu`8
z?JnjJrhiKyq(%*8elU-M5X|S4GnZteHO=wN&6eIbCf;KQ(_<r|27<)27=(Gxmy}m(
zeo!#I<fgqQzpawne9V`nB|R4S263^oTO4+d54Xr==Ugp*i^lv}5!57}i`h4Oo7r_f
z1-EsklOy{YAU^p?myVQT5V$L{)_+n5uzzs0DoGztA!wQ(G=)%N{$gjh$&Kc!F>Ri@
zNNv6-Kqb3niKwuXs@J?78h6MCsf~bG-l$|GXq-h$sU+sdI+5l`Pys+C?YuzHGCxQQ
zLYHSnSVPb@Kgj%95deQ}Yz3i}`GAwBr2u{*csCzVoP@a$N-AD-VON3qEq~jPlIlJn
z*8nPyl#}Sv#sc%X`5aC2fd(5fDs9a<juHn#jrpm+bMM!vNh*SCwl)L}^HcA)Fdu0A
zi`vxl*XGAb%GG)%9mmw=%d=H0^8rUcY0ia^1ImTa(o~6DR3az`fg7@N5WJWVI0FEr
pAxP(o6a-J^4-E|s4LxrC3lv(8_;tTbGc*7I002ovPDHLkV1k=_n?V2o

delta 2403
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
V{5WU+%fkQw002ovPDHLkV1gbwSE2v_

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());