From fcb4c232e8e71cab8e4d8bf88c95d527cfd408e2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 11 Feb 2022 07:55:57 -0500
Subject: [PATCH] WIP

---
 .../blocks/turrets/disperse/disperse.png      | Bin 934 -> 2024 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 4074 -> 4084 bytes
 core/src/mindustry/content/Blocks.java        |  38 ++++++++++++------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png
index ad400ba0f05cb80e9865c2be0f03d303b9f46448..bf7bbc092ccdeabd745b310f7abc3a9c9ac50c75 100644
GIT binary patch
delta 1998
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
N22WQ%mvv4FO#rRyrKkV^

delta 899
zcmaFCzl?o?K|OPVr;B4q#hkZy1N&|p@VEvppYc^J)@hnR%HhlU%x(he(_FgzpV-#B
zPVP~)yS(Y~#~f(}FlhLbcTw8l@csJl_vd}LmH+<b^W?gQy+`k-@;kmd*eg~)-IAq#
zkvYRg4u?XP1r|&JGK?DU)T@}+S*?39zyEjc|MD+fe|N~%ufHv^J@op?{3la`cWyrU
z&5l>*rkUs_*#oO8E{0fLl{{(cFzu22%05pch8gLv6d#o82jq5dc0G4`3*U!ztgE&i
zow?|FsuzPs$?nMFXH^^vJ|w5jaokbL(3O9@STB~z;p5xNvzp5rj|w(CLUKqSgNV3X
z!>Q{$BK61Q<QR@j;&C{(zBBZ=iX_9C$3hHOx2!*t?e~)5=u!@cBUw?2toe$r3>W;(
z7-n7*Je53=*J1TcT}$uZ_qVw)I><8x#H?aClW}(Dt^eCpxfyN=Haxn-dSJ6_diMX@
zYBCKzlh@jabuwu9PY|DK=*@Cq*6}B+M9$1gVKDOB_G*SoJ#)grqC=tG>5h5~Gu5LD
zbBY)b#IP)|SjnKV%_BQ2c?uW9v)B8ApWgnQePz<VUHPByR9_FgKKq{N_flq#hPB$C
zZwoVRc4lCmf4pejY~~Ly+l86xuYJzn$DzVfXY*{^&l!%5Teq%bw&2xSr>XnqZ+6B@
zrV^x}SYF?FvOuasEiIl+G4925$B4@x{xV!J_*&N>t9ZfS6NeNZ<56DwJso-i*<Tn#
z)cn^gu^8&ivrGH-!^p{C`qjnHUodcQ=3wkT@F;>sPp?GK<D+R$OM`Z!=a;qyQ-{JD
z=@}mW;t$#;q(nI%$bHDUwdKJlZq0vD>)IY%>el!-Yh6qIgV)>||8DJTeek$G=#PwD
zYr|`XqjS}o_u5b2tmnY4(Z?X-&d~K(vc7dsG&@fz!&CdtsG}LYyO<q5miAnEl>Usr
zdH!C#we9bh@f~=a@O96%18-hGc+CFUAtN{ZRq;2eJTBjccs^HirU04kt?C!6B{J-I
zL%!xQt#Nww^XA2A?`s&sC*9w@cHaEl+>?A4sy{yZaW6wGxq~OrgTbxq`saJkAJ=8i
zeR6I7<}86_|I#kJU{yW6x9$s9)ams38}}W!X3Tb-FTr%B+}nGf1&nsNpWpN3-6oDV
pGh@!%1~nf2vF5o9IIA$U{$X!oT+PN2w?-8t;OXk;vd$@?2>{{1o>>3@

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 288ebd3764..c67e06c80b 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -533,3 +533,4 @@
 63170=world-processor|block-world-processor-ui
 63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui
 63168=reinforced-payload-router|block-reinforced-payload-router-ui
+63167=disperse|block-disperse-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 6ba4b4cfc5be36c08a6ceed8805a2cca28525444..0ab389a106f9115501ca6bb1b046c1af9e7d6f9a 100644
GIT binary patch
delta 26
hcmaDQ|3#jO;r2!*MP5#hl+5CS)S}|l%}Tr{m;ijn2=@R0

delta 16
Xcmew&|4N>T;nqebMc&Q2yvLaUHG~C_

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index f7ba80ae5e..3b862cacb1 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -127,7 +127,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, sublimate, titan, afflict,
+    breach, sublimate, titan, disperse, afflict,
 
     //units
     commandCenter,
@@ -3315,33 +3315,45 @@ public class Blocks{
             size = 4;
         }};
 
-        /*
-        afflict = new ContinuousTurret("afflict"){{
+        disperse = new ItemTurret("disperse"){{
             requirements(Category.turret, with(Items.carbide, 250, Items.surgeAlloy, 160, Items.silicon, 300, Items.beryllium, 400));
 
+            ammo(Items.graphite, new BasicBulletType(){{
+                damage = 40;
+                speed = 7f;
+                width = 9f;
+                height = 15f;
+                trailColor = Pal.bulletYellowBack;
+            }});
+
             //TODO bullet.
 
-            shootShake = 4f;
-            recoilAmount = 1f;
-            reloadTime = 60f * 3f;
-            shootLength = 7f;
-            rotateSpeed = 2.5f;
+            //recoilAmount = 1f;
+            reloadTime = 5f;
+            shootLength = 15f;
+            rotateSpeed = 5f;
 
             coolantUsage = 30f / 60f;
             coolantOverride = Liquids.water;
 
-            draw = new DrawTurret("reinforced-");
+            draw = new DrawTurret("reinforced-"){{
 
-            restitution = 0.02f;
+            }};
+
+            shots = 4;
+            alternate = true;
+            spread = 4.6f;
+
+            restitution = 0.1f;
             shootWarmupSpeed = 0.08f;
 
             outlineColor = Pal.darkOutline;
             acceptCoolant = false;
 
-            scaledHealth = 300;
-            range = 390f;
+            scaledHealth = 340;
+            range = 250f;
             size = 4;
-        }};*/
+        }};
 
         //endregion
         //region units