From 8269d842ced8e67ed45c227c397d136d9da62793 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 16 Mar 2019 10:13:49 -0400
Subject: [PATCH] Removed redundant zone waves / Fixed wave dialog float issue

---
 core/assets/maps/groundZero.mmap              | Bin 12272 -> 12294 bytes
 .../src/io/anuke/mindustry/content/Zones.java | 380 +-----------------
 .../mindustry/editor/WaveInfoDialog.java      |   6 +-
 .../editor/generation/FilterOption.java       |   4 +-
 4 files changed, 9 insertions(+), 381 deletions(-)

diff --git a/core/assets/maps/groundZero.mmap b/core/assets/maps/groundZero.mmap
index c08ee03ac7ec2458c7e6074a048e837ebef7b28c..24bca59ae2be28662f8c80bcfa4db1518bfc36e2 100644
GIT binary patch
delta 8798
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

delta 8780
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
Rv&thE&+7lPFYr6d2LR!xXT|^k

diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 066242bdaf..9d94ce230e 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -1,9 +1,7 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.maps.generators.MapGenerator;
 import io.anuke.mindustry.maps.generators.MapGenerator.Decoration;
 import io.anuke.mindustry.type.Item;
@@ -29,39 +27,6 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 2;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.dagger){{
-                        unitScaling = 1.5f;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 5;
-                        unitScaling = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 15;
-                        unitScaling = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 20;
-                        unitScaling = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 25;
-                        unitScaling = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 30;
-                        unitScaling = 2;
-                    }},
-
-
-                    bossGroup(UnitTypes.fortress)
-                );
             }};
         }};
 
@@ -76,49 +41,13 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 1f;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.crawler){{
-                        unitScaling = 2f;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 5;
-                        unitAmount = 2;
-                        spacing = 2;
-                        unitScaling = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 3;
-                        unitScaling = 2f;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 15;
-                        unitScaling = 1;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 20;
-                        unitScaling = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 25;
-                        unitScaling = 1;
-                        unitAmount = 2;
-                    }},
-
-                    bossGroup(UnitTypes.revenant)
-                );
             }};
         }};
 
         frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 1)
             .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
             loadout = Loadouts.basicFoundation;
-            baseLaunchCost = ItemStack.with(Items.copper, 100);
+            baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 400);
             conditionWave = 10;
             zoneRequirements = new Zone[]{craters};
@@ -128,67 +57,12 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 1.5f;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.titan){{
-                        unitScaling = 3;
-                        end = 9;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        unitScaling = 2;
-                        begin = 2;
-                        end = 9;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        unitScaling = 2;
-                        begin = 5;
-                        end = 9;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        unitScaling = 0.5f;
-                        begin = 10;
-                        spacing = 10;
-                        unitAmount = 5;
-                    }},
-
-                    new SpawnGroup(UnitTypes.titan){{
-                        begin = 11;
-                        unitAmount = 2;
-                        unitScaling = 2;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 12;
-                        unitAmount = 2;
-                        unitScaling = 2;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        unitScaling = 0.5f;
-                        begin = 35;
-                        spacing = 10;
-                        unitAmount = 6;
-                    }},
-
-                    //boss
-                    new SpawnGroup(UnitTypes.revenant){{
-                        begin = configureWave;
-                        effect = StatusEffects.boss;
-                        unitScaling = never;
-                    }},
-
-                    bossGroup(UnitTypes.eruptor)
-                );
             }};
         }};
 
         ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores", 1).dist(3f, true)){{
             loadout = Loadouts.basicFoundation;
-            baseLaunchCost = ItemStack.with(Items.copper, 200, Items.graphite, 50);
+            baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 400);
             conditionWave = 20;
             launchPeriod = 20;
@@ -200,66 +74,6 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 80;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.wraith){{
-                        unitScaling = 2;
-                        spacing = 2;
-                        end = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 1;
-                        spacing = 2;
-                        unitScaling = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.wraith){{
-                        begin = 10;
-                        unitScaling = 0.5f;
-                        unitAmount = 6;
-                        spacing = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 5;
-                        unitScaling = 1;
-                        spacing = 5;
-                        unitAmount = 1;
-                        effect = StatusEffects.overdrive;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 22;
-                        unitScaling = 1;
-                        spacing = 20;
-                        unitScaling = 0.5f;
-                        unitAmount = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 11;
-                        spacing = 2;
-                        unitScaling = 2;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 12;
-                        spacing = 2;
-                        unitScaling = 2;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 12;
-                        spacing = 3;
-                        unitScaling = 3;
-                        unitAmount = 2;
-                    }},
-
-                    bossGroup(UnitTypes.revenant),
-                    bossGroup(UnitTypes.revenant)
-                );
             }};
         }};
 
@@ -281,7 +95,7 @@ public class Zones implements ContentList{
             .dist(2.5f, true)
             .decor(new Decoration(Blocks.moss, Blocks.shaleBoulder, 0.02))){{
             loadout = Loadouts.basicFoundation;
-            baseLaunchCost = ItemStack.with(Items.copper, 100, Items.lead, 200, Items.silicon, 100);
+            baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 400, Items.lead, 100);
             conditionWave = 10;
             launchPeriod = 10;
@@ -293,69 +107,12 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 2;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.titan){{
-                        unitScaling = 2;
-                        spacing = 2;
-                        end = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 1;
-                        unitScaling = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 11;
-                        spacing = 2;
-                        unitScaling = 2;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.ghoul){{
-                        begin = 6;
-                        unitScaling = 0.5f;
-                        unitAmount = 1;
-                        spacing = 5;
-                    }},
-
-                    new SpawnGroup(UnitTypes.wraith){{
-                        begin = 10;
-                        unitScaling = 1f;
-                        unitAmount = 1;
-                        spacing = 5;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 2;
-                        unitScaling = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.wraith){{
-                        begin = 23;
-                        unitScaling = 1f;
-                        unitAmount = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 20;
-                        unitScaling = 1;
-                        spacing = 10;
-                        unitScaling = 0.5f;
-                        unitAmount = 10;
-                    }},
-
-                    bossGroup(UnitTypes.chaosArray)
-                );
             }};
         }};
 
         desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift").dist(2f)){{
             loadout = Loadouts.basicNucleus;
-            baseLaunchCost = ItemStack.with(Items.copper, 500);
+            baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 1500);
             itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000);
             conditionWave = 10;
@@ -367,62 +124,6 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 1.5f;
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.crawler){{
-                        unitScaling = 1;
-                        spacing = 2;
-                        end = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.titan){{
-                        begin = 1;
-                        unitScaling = 3;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 2;
-                        spacing = 2;
-                        unitScaling = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.titan){{
-                        begin = 10;
-                        unitScaling = 1f;
-                        unitAmount = 3;
-                        spacing = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.fortress){{
-                        begin = 5;
-                        unitScaling = 1;
-                        spacing = 5;
-                        unitAmount = 1;
-                    }},
-
-                    new SpawnGroup(UnitTypes.fortress){{
-                        begin = 13;
-                        unitScaling = 1;
-                        spacing = 4;
-                        unitAmount = 1;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 11;
-                        spacing = 2;
-                        unitScaling = 2;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        unitScaling = 1;
-                        spacing = 2;
-                        unitAmount = 4;
-                        begin = 13;
-                    }},
-
-                    bossGroup(UnitTypes.chaosArray)
-                );
             }};
         }};
 
@@ -430,7 +131,7 @@ public class Zones implements ContentList{
         .drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 1000, Items.thorium, 200, Items.titanium, 2000, Items.metaglass, 1000))
         .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{
             loadout = Loadouts.basicNucleus;
-            baseLaunchCost = ItemStack.with(Items.copper, 500, Items.silicon, 200, Items.metaglass, 100);
+            baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 2500, Items.lead, 3000, Items.silicon, 800, Items.metaglass, 400);
             itemRequirements = ItemStack.with(Items.copper, 10000, Items.titanium, 8000, Items.metaglass, 6000, Items.plastanium, 2000);
             conditionWave = 30;
@@ -442,77 +143,6 @@ public class Zones implements ContentList{
                 waves = true;
                 waveTimer = true;
                 waveSpacing = 60 * 60 * 2;
-
-                spawns = Array.with(
-                    new SpawnGroup(UnitTypes.titan){{
-                        unitScaling = 2;
-                        spacing = 2;
-                        end = 10;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 1;
-                        unitScaling = 2;
-                        spacing = 2;
-                        unitAmount = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 2;
-                        unitScaling = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 10;
-                        spacing = 2;
-                        unitScaling = 2;
-                        unitAmount = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.ghoul){{
-                        begin = 5;
-                        unitScaling = 0.5f;
-                        unitAmount = 1;
-                        spacing = 5;
-                    }},
-
-                    new SpawnGroup(UnitTypes.fortress){{
-                        begin = 13;
-                        unitScaling = 2;
-                        spacing = 3;
-                    }},
-
-                    new SpawnGroup(UnitTypes.wraith){{
-                        begin = 10;
-                        unitScaling = 1f;
-                        unitAmount = 1;
-                        spacing = 5;
-                    }},
-
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 2;
-                        unitScaling = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.wraith){{
-                        begin = 23;
-                        unitScaling = 1f;
-                        unitAmount = 1;
-                        spacing = 2;
-                    }},
-
-                    new SpawnGroup(UnitTypes.crawler){{
-                        begin = 20;
-                        unitScaling = 1;
-                        spacing = 10;
-                        unitScaling = 0.5f;
-                        unitAmount = 10;
-                    }},
-
-                    bossGroup(UnitTypes.reaper)
-                );
             }};
         }};
     }
diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
index dd6ae3ea6d..1cb2fadae4 100644
--- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
@@ -147,9 +147,9 @@ public class WaveInfoDialog extends FloatingDialog{
                         }).width(80f);
 
                         a.add(" + ");
-                        a.addField(Math.max((int)(Mathf.isZero(group.unitScaling) ? 0 : 1f/group.unitScaling), 0) + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
-                                group.unitScaling = 1f / Strings.parseInt(text);
+                        a.addField(Strings.toFixed(Math.max((Mathf.isZero(group.unitScaling) ? 0 : 1f/group.unitScaling), 0), 2), TextFieldFilter.floatsOnly, text -> {
+                            if(Strings.canParsePositiveFloat(text)){
+                                group.unitScaling = 1f / Strings.parseFloat(text);
                                 updateWaves();
                             }
                         }).width(80f);
diff --git a/core/src/io/anuke/mindustry/editor/generation/FilterOption.java b/core/src/io/anuke/mindustry/editor/generation/FilterOption.java
index 7a80339440..f3e7d3fbee 100644
--- a/core/src/io/anuke/mindustry/editor/generation/FilterOption.java
+++ b/core/src/io/anuke/mindustry/editor/generation/FilterOption.java
@@ -59,9 +59,7 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
-            table.addButton(b -> {
-                b.addImage(supplier.get().icon(Icon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable()).setRegion(supplier.get().icon(Icon.small))).size(8*3);
-            }, () -> {
+            table.addButton(b -> b.addImage(supplier.get().icon(Icon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable()).setRegion(supplier.get().icon(Icon.small))).size(8*3), () -> {
                 FloatingDialog dialog = new FloatingDialog("");
                 dialog.setFillParent(false);
                 int i = 0;