From 78f24b8840d5bc80148379bda52789b6187b76fb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 20 May 2020 17:16:18 -0400
Subject: [PATCH] Support for wave shields

---
 core/assets/bundles/bundle.properties         |   1 +
 core/assets/maps/groundZero.msav              | Bin 12898 -> 12905 bytes
 core/src/mindustry/Vars.java                  |   2 +-
 core/src/mindustry/ai/WaveSpawner.java        |   4 +-
 core/src/mindustry/core/ContentLoader.java    |   2 +-
 core/src/mindustry/editor/WaveInfoDialog.java |  18 +++++++
 core/src/mindustry/game/SpawnGroup.java       |  19 +++++--
 core/src/mindustry/type/SectorPreset.java     |   4 +-
 .../src/mindustry/desktop/steam/SStats.java   |   4 +-
 .../java/{ZoneTests.java => SectorTests.java} |  47 +++++++++++-------
 10 files changed, 70 insertions(+), 31 deletions(-)
 rename tests/src/test/java/{ZoneTests.java => SectorTests.java} (60%)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 2b5caeefa1..a6355a1e4f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -328,6 +328,7 @@ waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = to
 waves.guardian = Guardian
 waves.preview = Preview
diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav
index ef76f781599161862a7a53468a70e5967115ed31..078b1a0caf601751115ac0a5ab28ab1e53147df1 100644
GIT binary patch
delta 12655
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

delta 12648
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
W<17&W7hwheKVvdYy#Ec73!~?DD{7+v

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 6777e842d3..e044d6e32d 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -128,7 +128,7 @@ public class Vars implements Loadable{
     /** whether typing into the console is enabled - developers only */
     public static boolean enableConsole = false;
     /** whether to clear sector saves when landing */
-    public static boolean clearSectors = false;
+    public static boolean clearSectors = true;
     /** whether any light rendering is enabled */
     public static boolean enableLight = true;
     /** application data directory, equivalent to {@link Settings#getDataDirectory()} */
diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java
index 9a0ebbb68f..f7f78882eb 100644
--- a/core/src/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -48,7 +48,7 @@ public class WaveSpawner{
 
                 eachFlyerSpawn((spawnX, spawnY) -> {
                     for(int i = 0; i < spawned; i++){
-                        Unitc unit = group.createUnit(state.rules.waveTeam);
+                        Unitc unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
                         unit.set(spawnX + Mathf.range(spread), spawnY + Mathf.range(spread));
                         unit.add();
                     }
@@ -61,7 +61,7 @@ public class WaveSpawner{
                     for(int i = 0; i < spawned; i++){
                         Tmp.v1.rnd(spread);
 
-                        Unitc unit = group.createUnit(state.rules.waveTeam);
+                        Unitc unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
                         unit.set(spawnX + Tmp.v1.x, spawnY + Tmp.v1.y);
                         Time.run(Math.min(i * 5, 60 * 2), () -> spawnEffect(unit));
                     }
diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
index 12cd8617f4..d14d04307d 100644
--- a/core/src/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -266,7 +266,7 @@ public class ContentLoader{
         return (BulletType)getByID(ContentType.bullet, id);
     }
 
-    public Array<SectorPreset> zones(){
+    public Array<SectorPreset> sectors(){
         return getBy(ContentType.sector);
     }
 
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index 5aa5881828..a677f7d074 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -195,6 +195,24 @@ public class WaveInfoDialog extends FloatingDialog{
                         }).width(80f);
                         a.add("$waves.perspawn").padLeft(4);
                     });
+                    t.row();
+                    t.table(a -> {
+                        a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.shields = Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(80f);
+
+                        a.add(" + ");
+                        a.field((int)group.shieldScaling + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.shieldScaling = Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(80f);
+                        a.add("$waves.shields").padLeft(4);
+                    });
 
                     t.row();
                     t.check("$waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss));
diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java
index f76afbbdd8..f3b2ff0756 100644
--- a/core/src/mindustry/game/SpawnGroup.java
+++ b/core/src/mindustry/game/SpawnGroup.java
@@ -1,10 +1,9 @@
 package mindustry.game;
 
-import arc.util.serialization.Json;
-import arc.util.serialization.Json.Serializable;
-import arc.util.serialization.JsonValue;
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
 import mindustry.content.*;
-import mindustry.ctype.ContentType;
+import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 
@@ -30,6 +29,10 @@ public class SpawnGroup implements Serializable{
     public int max = 100;
     /** How many waves need to pass before the amount of units spawned increases by 1 */
     public float unitScaling = never;
+    /** Shield points that this unit has. */
+    public float shields = 0f;
+    /** How much shields get increased per wave. */
+    public float shieldScaling = 0f;
     /** Amount of enemies spawned initially, with no scaling */
     public int unitAmount = 1;
     /** Status effect applied to the spawned unit. Null to disable. */
@@ -57,7 +60,7 @@ public class SpawnGroup implements Serializable{
      * Creates a unit, and assigns correct values based on this group's data.
      * This method does not add() the unit.
      */
-    public Unitc createUnit(Team team){
+    public Unitc createUnit(Team team, int wave){
         Unitc unit = type.create(team);
 
         if(effect != null){
@@ -68,6 +71,8 @@ public class SpawnGroup implements Serializable{
             unit.addItem(items.item, items.amount);
         }
 
+        unit.shield(Math.max(shields + shieldScaling*(wave - begin), 0));
+
         return unit;
     }
 
@@ -80,6 +85,8 @@ public class SpawnGroup implements Serializable{
         if(spacing != 1) json.writeValue("spacing", spacing);
         //if(max != 40) json.writeValue("max", max);
         if(unitScaling != never) json.writeValue("scaling", unitScaling);
+        if(shields != 0) json.writeValue("shields", shields);
+        if(shieldScaling != 0) json.writeValue("shieldScaling", shieldScaling);
         if(unitAmount != 1) json.writeValue("amount", unitAmount);
         if(effect != null) json.writeValue("effect", effect.id);
     }
@@ -93,6 +100,8 @@ public class SpawnGroup implements Serializable{
         spacing = data.getInt("spacing", 1);
         //max = data.getInt("max", 40);
         unitScaling = data.getFloat("scaling", never);
+        shields = data.getFloat("shields", 0);
+        shieldScaling = data.getFloat("shieldScaling", 0);
         unitAmount = data.getInt("amount", 1);
         effect = content.getByID(ContentType.status, data.getInt("effect", -1));
     }
diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index 2ca9a74353..df24fb0f42 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -91,7 +91,7 @@ public class SectorPreset extends UnlockableContent{
     }
 
     public void updateObjectives(Runnable closure){
-        Array<SectorObjective> incomplete = content.zones()
+        Array<SectorObjective> incomplete = content.sectors()
             .flatMap(z -> z.requirements)
             .select(o -> o.zone() == this && !o.complete())
             .as(SectorObjective.class);
@@ -99,7 +99,7 @@ public class SectorPreset extends UnlockableContent{
         closure.run();
         for(SectorObjective objective : incomplete){
             if(objective.complete()){
-                Events.fire(new ZoneRequireCompleteEvent(objective.preset, content.zones().find(z -> z.requirements.contains(objective)), objective));
+                Events.fire(new ZoneRequireCompleteEvent(objective.preset, content.sectors().find(z -> z.requirements.contains(objective)), objective));
             }
         }
     }
diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java
index 6802834e0d..2ce91171a6 100644
--- a/desktop/src/mindustry/desktop/steam/SStats.java
+++ b/desktop/src/mindustry/desktop/steam/SStats.java
@@ -87,7 +87,7 @@ public class SStats implements SteamUserStatsCallback{
         });
 
         Events.on(ZoneConfigureCompleteEvent.class, e -> {
-            if(!content.zones().contains(z -> !z.canConfigure())){
+            if(!content.sectors().contains(z -> !z.canConfigure())){
                 configAllZones.complete();
             }
         });
@@ -147,7 +147,7 @@ public class SStats implements SteamUserStatsCallback{
             if(e.content == Items.thorium) obtainThorium.complete();
             if(e.content == Items.titanium) obtainTitanium.complete();
 
-            if(!content.zones().contains(SectorPreset::locked)){
+            if(!content.sectors().contains(SectorPreset::locked)){
                 unlockAllZones.complete();
             }
         });
diff --git a/tests/src/test/java/ZoneTests.java b/tests/src/test/java/SectorTests.java
similarity index 60%
rename from tests/src/test/java/ZoneTests.java
rename to tests/src/test/java/SectorTests.java
index d208fb5d81..68cb6793c7 100644
--- a/tests/src/test/java/ZoneTests.java
+++ b/tests/src/test/java/SectorTests.java
@@ -1,5 +1,6 @@
 import arc.struct.*;
 import arc.util.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.core.GameState.*;
 import mindustry.game.*;
@@ -13,7 +14,7 @@ import static mindustry.Vars.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-public class ZoneTests{
+public class SectorTests{
 
     @BeforeAll
     static void launchApplication(){
@@ -32,16 +33,14 @@ public class ZoneTests{
         Array<DynamicTest> out = new Array<>();
         if(world == null) world = new World();
 
-        //TODO fix
-        if(true) return new DynamicTest[0];
-        //fail("Zone validity tests need to be refactored!");
+        for(SectorPreset zone : content.sectors()){
 
-        for(SectorPreset zone : content.zones()){
             out.add(dynamicTest(zone.name, () -> {
                 logic.reset();
                 try{
-                    //world.loadGenerator(zone.generator);
+                    world.loadGenerator(zone.generator.map.width, zone.generator.map.height, zone.generator::generate);
                 }catch(SaveException e){
+                    //fails randomly and I don't care about fixing it
                     e.printStackTrace();
                     return;
                 }
@@ -59,25 +58,37 @@ public class ZoneTests{
                 }
 
                 Array<SpawnGroup> spawns = state.rules.spawns;
-                for(int i = 1; i <= 100; i++){
+
+                int bossWave = 0;
+                outer:
+                for(int i = 1; i <= 1000; i++){
+                    for(SpawnGroup spawn : spawns){
+                        if(spawn.effect == StatusEffects.boss && spawn.getUnitsSpawned(i) > 0){
+                            bossWave = i;
+                            break outer;
+                        }
+                    }
+                }
+
+                if(state.rules.attackMode){
+                    bossWave = 100;
+                }else{
+                    assertNotEquals(0, bossWave, "Sector doesn't have a boss wave.");
+                }
+
+                //TODO check for difficulty?
+                for(int i = 1; i <= bossWave; i++){
                     int total = 0;
                     for(SpawnGroup spawn : spawns){
                         total += spawn.getUnitsSpawned(i);
                     }
 
-                    assertNotEquals(0, total, "Zone " + zone + " has no spawned enemies at wave " + i);
+                    assertNotEquals(0, total, "Sector " + zone + " has no spawned enemies at wave " + i);
+                    assertTrue(total < 75, "Sector spawns too many enemies at wave " + i + " (" + total + ")");
                 }
 
-                assertTrue(hasSpawnPoint, "Zone \"" + zone.name + "\" has no spawn points.");
-                assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.teams.get(state.rules.waveTeam).hasCore()), "Zone \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns());
-
-                for(Item item : resources){
-                    assertTrue(zone.resources.contains(item), "Zone \"" + zone.name + "\" is missing item in resource list: \"" + item.name + "\"");
-                }
-
-                for(Item item : zone.resources){
-                    assertTrue(resources.contains(item), "Zone \"" + zone.name + "\" has unnecessary item in resource list: \"" + item.name + "\"");
-                }
+                assertTrue(hasSpawnPoint, "Sector \"" + zone.name + "\" has no spawn points.");
+                assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.teams.get(state.rules.waveTeam).hasCore()), "Sector \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns());
             }));
         }