From da6695ceee0f502901b354f48980dca33b7a168b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 5 Jul 2018 13:20:54 -0400
Subject: [PATCH] Decreased flyer speed, damage, moved start wave / Wave time
 increase

---
 core/src/io/anuke/mindustry/Vars.java                      | 2 +-
 core/src/io/anuke/mindustry/content/StatusEffects.java     | 2 +-
 core/src/io/anuke/mindustry/content/UnitTypes.java         | 4 ++--
 core/src/io/anuke/mindustry/content/Weapons.java           | 2 +-
 core/src/io/anuke/mindustry/entities/units/FlyingUnit.java | 1 -
 core/src/io/anuke/mindustry/game/WaveCreator.java          | 6 +++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index dab3a6a2b0..6731aed1dc 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -38,7 +38,7 @@ public class Vars{
 	//respawn time in frames
 	public static final float respawnduration = 60*4;
 	//time between waves in frames (on normal mode)
-	public static final float wavespace = 60*60*1.5f;
+	public static final float wavespace = 60*60*2f;
 	//waves can last no longer than 3 minutes, otherwise the next one spawns
 	public static final float maxwavespace = 60*60*4f;
 
diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java
index f9a7be4494..91e46ce74e 100644
--- a/core/src/io/anuke/mindustry/content/StatusEffects.java
+++ b/core/src/io/anuke/mindustry/content/StatusEffects.java
@@ -125,7 +125,7 @@ public class StatusEffects implements ContentList {
         overdrive = new StatusEffect(6f) {
             {
                 armorMultiplier = 0.95f;
-                speedMultiplier = 1.4f;
+                speedMultiplier = 1.05f;
                 damageMultiplier = 1.4f;
             }
 
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index 656a24274b..8f95a7c3c4 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -42,7 +42,7 @@ public class UnitTypes implements ContentList {
 
         vtol = new UnitType("vtol", Vtol.class, Vtol::new){{
             speed = 0.3f;
-            maxVelocity = 2.1f;
+            maxVelocity = 1.9f;
             drag = 0.01f;
             isFlying = true;
         }};
@@ -50,7 +50,7 @@ public class UnitTypes implements ContentList {
         monsoon = new UnitType("monsoon", Monsoon.class, Monsoon::new){{
             health = 230;
             speed = 0.2f;
-            maxVelocity = 1.5f;
+            maxVelocity = 1.4f;
             drag = 0.01f;
             isFlying = true;
             weapon = Weapons.bomber;
diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java
index 5986b56bb2..e3b2321dfa 100644
--- a/core/src/io/anuke/mindustry/content/Weapons.java
+++ b/core/src/io/anuke/mindustry/content/Weapons.java
@@ -35,7 +35,7 @@ public class Weapons implements ContentList {
 
         chainBlaster = new Weapon("chain-blaster") {{
             length = 1.5f;
-            reload = 20f;
+            reload = 30f;
             roundrobin = true;
             ejectEffect = ShootFx.shellEjectSmall;
             setAmmo(AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletTungsten, AmmoTypes.bulletSilicon, AmmoTypes.bulletThorium);
diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
index b3ca78b506..ebb3eb2287 100644
--- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
@@ -22,7 +22,6 @@ import static io.anuke.mindustry.Vars.world;
 
 public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
     protected static Translator vec = new Translator();
-    protected static float maxAim = 30f;
     protected static float wobblyness = 0.6f;
 
     protected Trail trail = new Trail(8);
diff --git a/core/src/io/anuke/mindustry/game/WaveCreator.java b/core/src/io/anuke/mindustry/game/WaveCreator.java
index 2a8eeaabd6..c1d2adb8e2 100644
--- a/core/src/io/anuke/mindustry/game/WaveCreator.java
+++ b/core/src/io/anuke/mindustry/game/WaveCreator.java
@@ -17,8 +17,8 @@ public class WaveCreator{
 				}},
 
 				new SpawnGroup(UnitTypes.vtol){{
-					begin = 6;
-					end = 8;
+					begin = 12;
+					end = 14;
 				}},
 
 				new SpawnGroup(UnitTypes.scout){{
@@ -100,7 +100,7 @@ public class WaveCreator{
 				}},
 
 				new SpawnGroup(UnitTypes.scout){{
-					begin = 25;
+					begin = 35;
 					spacing = 3;
 					unitAmount = 4;
 					groupAmount = 2;