Unit name changes

core/src/mindustry/content/Blocks.java

@@ -1698,7 +1698,7 @@ public class Blocks implements ContentList{
         airFactory = new UnitFactory("air-factory"){{
             requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)),
+                new UnitPlan(UnitTypes.flare, 200f, with(Items.silicon, 10)),
                 new UnitPlan(UnitTypes.mono, 200f, with(Items.silicon, 10)),
                 //new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)),
             };
@@ -1729,7 +1729,7 @@ public class Blocks implements ContentList{
                 {UnitTypes.nova, UnitTypes.quasar},
                 {UnitTypes.dagger, UnitTypes.mace},
                 {UnitTypes.crawler, UnitTypes.eruptor},
-                {UnitTypes.wraith, UnitTypes.ghoul},
+                {UnitTypes.flare, UnitTypes.horizon},
                 {UnitTypes.mono, UnitTypes.poly},
                 {UnitTypes.risse, UnitTypes.minke},
             };
@@ -1745,10 +1745,11 @@ public class Blocks implements ContentList{
             constructTime = 60f * 15f;
 
             upgrades = new UnitType[][]{
-                {UnitTypes.ghoul, UnitTypes.revenant},
+                {UnitTypes.horizon, UnitTypes.zenith},
                 {UnitTypes.mace, UnitTypes.fortress},
                 {UnitTypes.poly, UnitTypes.mega},
                 {UnitTypes.minke, UnitTypes.bryde},
+                {UnitTypes.quasar, UnitTypes.pulsar},
             };
         }};
 
@@ -1763,7 +1764,7 @@ public class Blocks implements ContentList{
             constructTime = 60f * 60f;
 
             upgrades = new UnitType[][]{
-                {UnitTypes.revenant, UnitTypes.lich},
+                {UnitTypes.zenith, UnitTypes.antumbra},
             };
         }};
 
@@ -1778,7 +1779,7 @@ public class Blocks implements ContentList{
             constructTime = 60f * 60f * 3;
 
             upgrades = new UnitType[][]{
-                {UnitTypes.lich, UnitTypes.reaper},
+                {UnitTypes.antumbra, UnitTypes.eclipse},
             };
         }};
 

core/src/mindustry/content/UnitTypes.java

@@ -27,7 +27,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix, eruptor;
 
     //air (no special traits)
-    public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
+    public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra;
 
     //air + building
     public static @EntityDef({Unitc.class, Builderc.class}) UnitType mono;
@@ -319,7 +319,7 @@ public class UnitTypes implements ContentList{
         //endregion
         //region air attack
 
-        wraith = new UnitType("wraith"){{
+        flare = new UnitType("flare"){{
             speed = 3f;
             accel = 0.08f;
             drag = 0.01f;
@@ -338,7 +338,7 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        ghoul = new UnitType("ghoul"){{
+        horizon = new UnitType("horizon"){{
             health = 220;
             speed = 2f;
             accel = 0.08f;
@@ -362,7 +362,7 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        revenant = new UnitType("revenant"){{
+        zenith = new UnitType("zenith"){{
             health = 220;
             speed = 1.9f;
             accel = 0.04f;
@@ -375,7 +375,7 @@ public class UnitTypes implements ContentList{
             engineOffset = 12f;
             engineSize = 3f;
 
-            weapons.add(new Weapon("revenant-missiles"){{
+            weapons.add(new Weapon("zenith-missiles"){{
                 reload = 70f;
                 x = 7f;
                 rotate = true;
@@ -402,7 +402,28 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        reaper = new UnitType("reaper"){{
+        antumbra = new UnitType("antumbra"){{
+            speed = 1.1f;
+            accel = 0.02f;
+            drag = 0.05f;
+            rotateSpeed = 2.5f;
+            flying = true;
+            lowAltitude = true;
+            health = 75000;
+            engineOffset = 38;
+            engineSize = 7.3f;
+            hitsize = 58f;
+
+            weapons.add(new Weapon(){{
+                y = 1.5f;
+                reload = 28f;
+                ejectEffect = Fx.shellEjectSmall;
+                bullet = Bullets.standardCopper;
+                shootSound = Sounds.shoot;
+            }});
+        }};
+
+        eclipse = new UnitType("eclipse"){{
             speed = 1.1f;
             accel = 0.02f;
             drag = 0.05f;
@@ -424,27 +445,6 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        lich = new UnitType("lich"){{
-            speed = 1.1f;
-            accel = 0.02f;
-            drag = 0.05f;
-            rotateSpeed = 2.5f;
-            flying = true;
-            lowAltitude = true;
-            health = 75000;
-            engineOffset = 38;
-            engineSize = 7.3f;
-            hitsize = 58f;
-
-            weapons.add(new Weapon(){{
-                y = 1.5f;
-                reload = 28f;
-                ejectEffect = Fx.shellEjectSmall;
-                bullet = Bullets.standardCopper;
-                shootSound = Sounds.shoot;
-            }});
-        }};
-
         //endregion
         //region air support