From 0429abbb28015bbd590fad55330fbfdbb06eadd9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 16 Aug 2019 12:31:44 -0400
Subject: [PATCH] Balance

---
 .../io/anuke/mindustry/content/Bullets.java   |  2 +-
 .../io/anuke/mindustry/content/UnitTypes.java | 19 +++++++++++++++----
 .../entities/bullet/MissileBulletType.java    |  2 ++
 .../anuke/mindustry/entities/type/Player.java |  2 +-
 .../world/blocks/production/Drill.java        |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java
index dd8deb3881..c0b2ad732c 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/io/anuke/mindustry/content/Bullets.java
@@ -267,7 +267,7 @@ public class Bullets implements ContentList{
             keepVelocity = false;
             splashDamageRadius = 25f;
             splashDamage = 10f;
-            lifetime = 50f;
+            lifetime = 60f;
             trailColor = Pal.unitBack;
             backColor = Pal.unitBack;
             frontColor = Pal.unitFront;
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index 95fcc9e82a..db601d03af 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -330,9 +330,9 @@ public class UnitTypes implements ContentList{
             baseRotateSpeed = 0.04f;
             weapon = new Weapon("lich-missiles"){{
                 length = 4f;
-                reload = 180f;
+                reload = 160f;
                 width = 22f;
-                shots = 22;
+                shots = 16;
                 shootCone = 100f;
                 shotDelay = 2;
                 inaccuracy = 10f;
@@ -341,7 +341,7 @@ public class UnitTypes implements ContentList{
                 velocityRnd = 0.2f;
                 spacing = 1f;
                 bullet = Bullets.missileRevenant;
-                shootSound = Sounds.missile;
+                shootSound = Sounds.artillery;
             }};
         }};
 
@@ -371,7 +371,18 @@ public class UnitTypes implements ContentList{
                 inaccuracy = 3f;
                 roundrobin = true;
                 ejectEffect = Fx.none;
-                bullet = Bullets.standardDenseBig;
+                bullet = new BasicBulletType(7f, 42, "bullet"){
+                    {
+                        bulletWidth = 15f;
+                        bulletHeight = 21f;
+                        shootEffect = Fx.shootBig;
+                    }
+
+                    @Override
+                    public float range(){
+                        return 165f;
+                    }
+                };
                 shootSound = Sounds.shootBig;
             }};
         }};
diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
index 56a6b5ae7f..94220d1ece 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
@@ -5,6 +5,7 @@ import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.Pal;
 
 public class MissileBulletType extends BasicBulletType{
@@ -18,6 +19,7 @@ public class MissileBulletType extends BasicBulletType{
         backColor = Pal.missileYellowBack;
         frontColor = Pal.missileYellow;
         homingPower = 7f;
+        hitSound = Sounds.explosion;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java
index 6d124c9c42..61b5ff7d65 100644
--- a/core/src/io/anuke/mindustry/entities/type/Player.java
+++ b/core/src/io/anuke/mindustry/entities/type/Player.java
@@ -514,7 +514,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
         }
 
         if(!isDead() && isFlying()){
-            loops.play(Sounds.thruster, this, Mathf.clamp(velocity.len() * 2f) * 0.4f);
+            loops.play(Sounds.thruster, this, Mathf.clamp(velocity.len() * 2f) * 0.3f);
         }
 
         BuildRequest request = buildRequest();
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index 232d704d09..a4f5216322 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -67,7 +67,7 @@ public class Drill extends Block{
         hasItems = true;
 
         idleSound = Sounds.drill;
-        idleSoundVolume = 0.002f;
+        idleSoundVolume = 0.003f;
     }
 
     @Override