From fb7633cb07cf18b5e602e63d42b5b8a333503af5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 2 Jul 2020 23:35:36 -0400
Subject: [PATCH] Cyclone hits ground targets again

---
 .../sprites/units/weapons/heal-weapon.png     | Bin 353 -> 357 bytes
 core/src/mindustry/content/Blocks.java        |   9 ++--
 core/src/mindustry/content/Bullets.java       |  51 ++++++++++++++----
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/core/assets-raw/sprites/units/weapons/heal-weapon.png b/core/assets-raw/sprites/units/weapons/heal-weapon.png
index 3a89ba245fba9d7289b6889fbf664c2c3a3dbe15..7ab9309d40dd64223a656a3f053e65cab5b38ed9 100644
GIT binary patch
delta 317
zcmV-D0mA;_0_6gbF@GOPL_t(&f$f(q4#GeXg{K7BWGw=LK=lv=43cmFG{JEJWG~R0
zR97`U27(|E1c9nA3c|KqAnAKs!F+Bv&Fp@CJN*$+6h%?~nE+idE|coL{vq6>m#`R6
ztBX`|nNSyC3y6><-~y-Y?wYP#lL#mYxFl-50fTmgd`VDypnv5!L4gab!i6<vOHdN<
zDM33zz9gtU;6sA`A`1)n*NO#HAkA{;JX2zbD3WIR*XMg!1X9lM@3PJbeA@i=e6hxi
zBxpVG+<X*GSxblrNuYk`nG&4^Zs%j;T#P2;#&s+SNCJIIbQUnih{*2}XrMjdl3)W7
zFvh%+@C`J9J~kwL{M1u{3#^y();`#6H}D>zB;b-@Y+g|mMNt$*QTpWpN~BN*lOZB4
P00000NkvXXu0mjfnU0Al

delta 313
zcmV-90mlC20^tIXF@GCLL_t(&f$f(e4#GeXMW+P0$yx*gf$AYhxBw?W6C4*n_5!_0
zbydSL5TpV@5UBd1O4!W;P5S><Fwb?<%<k*VbXpNbQ55B$NzehaCU4*4AI$;1g~Nmz
zU8K#LoVo#9K!hv-7r2y<&~h7EL_o<vNW$w47_<_KB|+_h4}awZ1un2LYv-CRLCHW&
z30euolA!iL3<>%mGbi}hiUU-jD68N)Q(}q;Qk2!t_q#bI(yZ{aY;Xp?9sX8doohxW
zXg$y!K24XbEkuMQ;6Hh$#9)DYeeP8kED1;ke2Lj&9=wksF<8J_D<b_R&_H`&3<-#U
zwf2>X*g!KdhB8EqpL!}(0e>FscU$-<rcdGy#^Du3Q4~c{6lGkV0e(}k=DB~500000
LNkvXXu0mjf#vz5Z

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 1dc33382b7..6d4ffe8743 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1578,10 +1578,10 @@ public class Blocks implements ContentList{
         cyclone = new ItemTurret("cyclone"){{
             requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
             ammo(
-            Items.metaglass, Bullets.flakGlass,
-            Items.blastCompound, Bullets.flakExplosive,
-            Items.plastanium, Bullets.flakPlastic,
-            Items.surgealloy, Bullets.flakSurge
+            Items.metaglass, Bullets.fragGlass,
+            Items.blastCompound, Bullets.fragExplosive,
+            Items.plastanium, Bullets.fragPlastic,
+            Items.surgealloy, Bullets.fragSurge
             );
             xRand = 4f;
             reloadTime = 6f;
@@ -1592,7 +1592,6 @@ public class Blocks implements ContentList{
             inaccuracy = 10f;
             shootCone = 30f;
             shootSound = Sounds.shootSnap;
-            targetGround = false;
 
             health = 145 * size * size;
         }};
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 94f5e8b4bf..eafb421961 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -20,7 +20,10 @@ public class Bullets implements ContentList{
     artilleryDense, artilleryPlastic, artilleryPlasticFrag, artilleryHoming, artilleryIncendiary, artilleryExplosive,
 
     //flak
-    flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, flakGlassFrag, flakPlasticFrag,
+    flakScrap, flakLead, flakGlass, flakGlassFrag,
+
+    //frag (flak-like but hits ground)
+    fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag,
 
     //missiles
     missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm,
@@ -171,7 +174,17 @@ public class Bullets implements ContentList{
             fragBullets = 5;
         }};
 
-        flakPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
+        fragGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
+            width = 5f;
+            height = 12f;
+            shrinkY = 1f;
+            lifetime = 20f;
+            backColor = Pal.gray;
+            frontColor = Color.white;
+            despawnEffect = Fx.none;
+        }};
+
+        fragPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
             width = 10f;
             height = 12f;
             shrinkY = 1f;
@@ -179,36 +192,56 @@ public class Bullets implements ContentList{
             backColor = Pal.plastaniumBack;
             frontColor = Pal.plastaniumFront;
             despawnEffect = Fx.none;
-            collidesGround = false;
         }};
 
-        flakPlastic = new FlakBulletType(4f, 6){{
-            splashDamageRadius = 50f;
+        fragGlass = new FlakBulletType(4f, 3){{
+            lifetime = 70f;
+            ammoMultiplier = 5f;
+            shootEffect = Fx.shootSmall;
+            reloadMultiplier = 0.8f;
+            width = 6f;
+            height = 8f;
+            hitEffect = Fx.flakExplosion;
+            splashDamage = 18f;
+            splashDamageRadius = 16f;
+            fragBullet = flakGlassFrag;
+            fragBullets = 3;
+            explodeRange = 20f;
+            collidesGround = true;
+        }};
+
+        fragPlastic = new FlakBulletType(4f, 6){{
+            splashDamageRadius = 40f;
             splashDamage = 25f;
-            fragBullet = flakPlasticFrag;
-            fragBullets = 6;
+            fragBullet = fragPlasticFrag;
+            fragBullets = 5;
             hitEffect = Fx.plasticExplosion;
             frontColor = Pal.plastaniumFront;
             backColor = Pal.plastaniumBack;
             shootEffect = Fx.shootBig;
+            collidesGround = true;
+            explodeRange = 20f;
         }};
 
-        flakExplosive = new FlakBulletType(4f, 5){{
+        fragExplosive = new FlakBulletType(4f, 5){{
             shootEffect = Fx.shootBig;
             ammoMultiplier = 4f;
             splashDamage = 15f;
             splashDamageRadius = 34f;
+            collidesGround = true;
 
             status = StatusEffects.blasted;
             statusDuration = 60f;
         }};
 
-        flakSurge = new FlakBulletType(4.5f, 13){{
+        fragSurge = new FlakBulletType(4.5f, 13){{
             splashDamage = 45f;
             splashDamageRadius = 40f;
             lightning = 2;
             lightningLength = 7;
             shootEffect = Fx.shootBig;
+            collidesGround = true;
+            explodeRange = 20f;
         }};
 
         missileExplosive = new MissileBulletType(2.7f, 10, "missile"){{