From 526b1add26a9e2d3aec4a79a09eaca88bdae805e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 25 Oct 2020 20:04:14 -0400
Subject: [PATCH] Unused bullet cleanup

---
 core/src/mindustry/content/Bullets.java   | 31 +++--------------------
 core/src/mindustry/content/UnitTypes.java |  4 +--
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index e2d42c0ef0..c8ad4d22f9 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -30,14 +30,14 @@ public class Bullets implements ContentList{
     missileExplosive, missileIncendiary, missileSurge,
 
     //standard
-    standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall,
-    standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig,
+    standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary,
+    standardDenseBig, standardThoriumBig, standardIncendiaryBig,
 
     //liquid
     waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
 
     //environment, misc.
-    damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag;
+    damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig;
 
     @Override
     public void load(){
@@ -327,23 +327,6 @@ public class Bullets implements ContentList{
             lifetime = 60f;
         }};
 
-        standardGlaive = new BasicBulletType(4f, 7.5f, "bullet"){{
-            width = 10f;
-            height = 12f;
-            frontColor = Color.valueOf("feb380");
-            backColor = Color.valueOf("ea8878");
-            status = StatusEffects.burning;
-            lifetime = 60f;
-        }};
-
-        standardMechSmall = new BasicBulletType(4f, 9, "bullet"){{
-            width = 11f;
-            height = 14f;
-            lifetime = 40f;
-            inaccuracy = 5f;
-            despawnEffect = Fx.hitBulletSmall;
-        }};
-
         standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{
             width = 15f;
             height = 21f;
@@ -528,13 +511,5 @@ public class Bullets implements ContentList{
         }};
 
         driverBolt = new MassDriverBolt();
-
-        frag = new BasicBulletType(5f, 8, "bullet"){{
-            width = 8f;
-            height = 9f;
-            shrinkY = 0.5f;
-            lifetime = 50f;
-            drag = 0.04f;
-        }};
     }
 }
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 7f3697a2e9..401f805ea7 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1127,11 +1127,11 @@ public class UnitTypes implements ContentList{
             flying = true;
             drag = 0.06f;
             accel = 0.12f;
-            speed = 1.1f;
+            speed = 2f;
             health = 100;
             engineSize = 1.8f;
             engineOffset = 5.7f;
-            range = 50f;
+            range = 56f;
             isCounted = false;
 
             ammoType = AmmoTypes.powerLow;