New waves for sectors, quite possibly broken

core/src/mindustry/game/DefaultWaves.java

@@ -1,5 +1,6 @@
 package mindustry.game;
 
+import arc.func.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
@@ -58,6 +59,7 @@ public class DefaultWaves{
                 unitScaling = 1;
                 unitAmount = 4;
                 spacing = 2;
+                shieldScaling = 10f;
             }},
 
             new SpawnGroup(mace){{
@@ -65,6 +67,7 @@ public class DefaultWaves{
                 spacing = 3;
                 unitScaling = 1;
                 end = 40;
+                shieldScaling = 20f;
             }},
 
             new SpawnGroup(mace){{
@@ -86,6 +89,7 @@ public class DefaultWaves{
                 begin = 16;
                 unitScaling = 1;
                 spacing = 2;
+                shieldScaling = 20f;
             }},
 
             new SpawnGroup(dagger){{
@@ -200,7 +204,7 @@ public class DefaultWaves{
     }
 
     //TODO move elsewhere
-    public static Seq<SpawnGroup> generate(){
+    public static Seq<SpawnGroup> generate(float difficulty){
         UnitType[][] species = {
         {dagger, mace, fortress, scepter, reign},
         {nova, pulsar, quasar, vela, corvus},
@@ -216,16 +220,18 @@ public class DefaultWaves{
         Seq<SpawnGroup> out = new Seq<>();
 
         //max reasonable wave, after which everything gets boring
-        int cap = 400;
+        int cap = 200;
 
-        //main sequence
         float shieldStart = 30, shieldsPerWave = 12;
+
+        Intc createProgression = start -> {
+            //main sequence
             UnitType[] curSpecies = Structs.random(species);
             int curTier = 0;
 
-        for(int i = 0; i < cap;){
+            for(int i = start; i < cap;){
                 int f = i;
-            int next = Mathf.random(15, 25);
+                int next = Mathf.random(8, 16);
 
                 float shieldAmount = Math.max((i - shieldStart) * shieldsPerWave, 0);
 
@@ -265,6 +271,16 @@ public class DefaultWaves{
                     curSpecies = Structs.random(species);
                 }
             }
+        };
+
+        createProgression.get(0);
+
+        int step = 5 + Mathf.random(3);
+
+        while(step <= cap){
+            createProgression.get(step);
+            step += (int)(Mathf.random(15, 30) * Mathf.lerp(1f, 0.4f, difficulty));
+        }
 
         int bossWave = Mathf.random(30, 60);
         int bossSpacing = Mathf.random(30, 50);

core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java

@@ -394,13 +394,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
 
             state.rules.attackMode = true;
         }else{
-            state.rules.winWave = 15 * (int)Math.max(difficulty * 5, 1);
+            state.rules.winWave = 15 * (int)Math.max(difficulty * 10, 1);
         }
 
         state.rules.waves = true;
 
         //TODO better waves
-        state.rules.spawns = defaultWaves.get();
+        state.rules.spawns = DefaultWaves.generate(difficulty);
     }
 
     @Override