From 250d982d998d423b0785daf1f7cf1bbf06d377b3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 13 Jul 2020 20:39:43 -0400
Subject: [PATCH] Internal unit name finalizations

---
 core/src/mindustry/content/UnitTypes.java | 2 +-
 core/src/mindustry/game/DefaultWaves.java | 4 ++--
 core/src/mindustry/type/UnitType.java     | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index e8f685b224..198247d78e 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -15,7 +15,7 @@ public class UnitTypes implements ContentList{
     //region definitions
 
     //ground
-    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, siegeArray, eradicator;
+    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, vestige, cataclyst;
 
     //ground + builder
     public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova;
diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java
index f99049f41a..b7388040f5 100644
--- a/core/src/mindustry/game/DefaultWaves.java
+++ b/core/src/mindustry/game/DefaultWaves.java
@@ -157,14 +157,14 @@ public class DefaultWaves{
                 spacing = 3;
             }},
 
-            new SpawnGroup(UnitTypes.siegeArray){{
+            new SpawnGroup(UnitTypes.vestige){{
                 begin = 41;
                 unitAmount = 1;
                 unitScaling = 1;
                 spacing = 30;
             }},
 
-            new SpawnGroup(UnitTypes.eradicator){{
+            new SpawnGroup(UnitTypes.cataclyst){{
                 begin = 81;
                 unitAmount = 1;
                 unitScaling = 1;
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 59389341ca..23f24cb952 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -32,6 +32,7 @@ public class UnitType extends UnlockableContent{
     public static final float shadowTX = -12, shadowTY = -13, shadowColor = Color.toFloatBits(0, 0, 0, 0.22f);
     private static final Vec2 legOffset = new Vec2();
 
+    //TODO document
     public boolean flying;
     public @NonNull Prov<? extends Unit> constructor;
     public @NonNull Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
@@ -48,14 +49,12 @@ public class UnitType extends UnlockableContent{
     public int payloadCapacity = 1;
     public int commandLimit = 24;
     public float visualElevation = -1f;
-    public float deathShake = 2f;
     public boolean allowLegStep = false;
     public boolean hovering = false;
     public Effect fallEffect = Fx.fallSmoke;
     public Effect fallThrusterEffect = Fx.fallSmoke;
     public Seq<Ability> abilities = new Seq<>();
 
-    //TODO document
     public int legCount = 4, legGroupSize = 2;
     public float legLength = 10f, legSpeed = 0.1f, legTrns = 1f, legBaseOffset = 0f, legMoveSpace = 1f, legExtension = 0, legPairOffset = 0, legLengthScl = 1f, kinematicScl = 1f, maxStretch = 1.75f;
     public float legSplashDamage = 0f, legSplashRange = 5;