From 5d4ab9ecd7d60d98e847d0529c32816cdb73f365 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 19 Aug 2021 23:26:39 -0400
Subject: [PATCH] Added max units field for wave editor

---
 core/assets/bundles/bundle.properties         |  1 +
 .../src/mindustry/editor/MapResizeDialog.java |  2 ++
 core/src/mindustry/editor/WaveInfoDialog.java | 29 ++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index b2e221af25..750ba063be 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -384,6 +384,7 @@ waves.waves = wave(s)
 waves.perspawn = per spawn
 waves.shields = shields/wave
 waves.to = to
+waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java
index fe3e6eda06..b9925e14dc 100644
--- a/core/src/mindustry/editor/MapResizeDialog.java
+++ b/core/src/mindustry/editor/MapResizeDialog.java
@@ -15,6 +15,8 @@ public class MapResizeDialog extends BaseDialog{
 
     public MapResizeDialog(Intc2 cons){
         super("@editor.resizemap");
+
+        closeOnBack();
         shown(() -> {
             cont.clear();
             width = editor.width();
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index 3d1307b9d0..15049f7381 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -14,7 +14,6 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
 import mindustry.type.*;
-import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
 import static mindustry.Vars.*;
@@ -171,9 +170,8 @@ public class WaveInfoDialog extends BaseDialog{
                             t.remove();
                             updateWaves();
                         }).pad(-6).size(46f).padRight(-12f);
-                    }, () -> showUpdate(group)).height(46f).pad(-6f).padBottom(0f);
+                    }, () -> showUpdate(group)).height(46f).pad(-6f).padBottom(0f).row();
 
-                    t.row();
                     t.table(spawns -> {
                         spawns.field("" + (group.begin + 1), TextFieldFilter.digitsOnly, text -> {
                             if(Strings.canParsePositiveInt(text)){
@@ -191,8 +189,8 @@ public class WaveInfoDialog extends BaseDialog{
                                 updateWaves();
                             }
                         }).width(100f).get().setMessageText("∞");
-                    });
-                    t.row();
+                    }).row();
+
                     t.table(p -> {
                         p.add("@waves.every").padRight(4);
                         p.field(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
@@ -202,9 +200,8 @@ public class WaveInfoDialog extends BaseDialog{
                             }
                         }).width(100f);
                         p.add("@waves.waves").padLeft(4);
-                    });
+                    }).row();
 
-                    t.row();
                     t.table(a -> {
                         a.field(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> {
                             if(Strings.canParsePositiveInt(text)){
@@ -221,8 +218,19 @@ public class WaveInfoDialog extends BaseDialog{
                             }
                         }).width(80f);
                         a.add("@waves.perspawn").padLeft(4);
-                    });
-                    t.row();
+                    }).row();
+
+                    t.table(a -> {
+                        a.field(group.max + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePositiveInt(text)){
+                                group.max = Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(80f);
+
+                        a.add("@waves.max").padLeft(5);
+                    }).row();
+
                     t.table(a -> {
                         a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> {
                             if(Strings.canParsePositiveInt(text)){
@@ -239,9 +247,8 @@ public class WaveInfoDialog extends BaseDialog{
                             }
                         }).width(80f);
                         a.add("@waves.shields").padLeft(4);
-                    });
+                    }).row();
 
-                    t.row();
                     t.check("@waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f);
                 }).width(340f).pad(8);