Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/game/EventType.java

@@ -428,6 +428,15 @@ public class EventType{
         }
     }
 
+    /** Called when a unit is spawned by wave. */
+    public static class UnitSpawnEvent{
+        public final Unit unit;
+
+        public UnitSpawnEvent(Unit unit) {
+            this.unit = unit;
+        }
+    }
+
     /** Called when a unit is dumped from any payload block. */
     public static class UnitUnloadEvent{
         public final Unit unit;

core/src/mindustry/game/Waves.java

@@ -116,7 +116,7 @@ public class Waves{
                 spacing = 5;
                 unitAmount = 1;
                 unitScaling = 3;
-                effect = StatusEffects.shielded;
+                shields = 640f;
                 max = 25;
             }},