From 429e07adec47577f28d00fc7f39ef4451291261c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 5 May 2022 13:39:14 -0400
Subject: [PATCH] More units renamed

---
 .../src/main/resources/classids.properties    |   1 +
 .../src/main/resources/revisions/elude/0.json |   1 +
 .../units/{latum-cell.png => cleroi-cell.png} | Bin
 ...latum-leg-base.png => cleroi-leg-base.png} | Bin
 .../units/{latum-leg.png => cleroi-leg.png}   | Bin
 .../{latum-spine.png => cleroi-spine.png}     | Bin
 .../sprites/units/{latum.png => cleroi.png}   | Bin
 ...t-defense.png => cleroi-point-defense.png} | Bin
 ...weapon-heat.png => cleroi-weapon-heat.png} | Bin
 .../{latum-weapon.png => cleroi-weapon.png}   | Bin
 core/assets/bundles/bundle.properties         |   2 +-
 core/assets/icons/icons.properties            |   7 ++++---
 core/assets/logicids.dat                      | Bin 4410 -> 4412 bytes
 core/src/mindustry/content/Blocks.java        |  10 +++++-----
 .../src/mindustry/content/ErekirTechTree.java |   2 +-
 core/src/mindustry/content/UnitTypes.java     |   8 ++++----
 16 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 annotations/src/main/resources/revisions/elude/0.json
 rename core/assets-raw/sprites/units/{latum-cell.png => cleroi-cell.png} (100%)
 rename core/assets-raw/sprites/units/{latum-leg-base.png => cleroi-leg-base.png} (100%)
 rename core/assets-raw/sprites/units/{latum-leg.png => cleroi-leg.png} (100%)
 rename core/assets-raw/sprites/units/{latum-spine.png => cleroi-spine.png} (100%)
 rename core/assets-raw/sprites/units/{latum.png => cleroi.png} (100%)
 rename core/assets-raw/sprites/units/weapons/{latum-point-defense.png => cleroi-point-defense.png} (100%)
 rename core/assets-raw/sprites/units/weapons/{latum-weapon-heat.png => cleroi-weapon-heat.png} (100%)
 rename core/assets-raw/sprites/units/weapons/{latum-weapon.png => cleroi-weapon.png} (100%)

diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index dcecb9b5c5..398f70acb6 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -6,6 +6,7 @@ atrax=1
 beta=30
 block=2
 corvus=24
+elude=45
 flare=3
 gamma=31
 mace=4
diff --git a/annotations/src/main/resources/revisions/elude/0.json b/annotations/src/main/resources/revisions/elude/0.json
new file mode 100644
index 0000000000..545bb6c8ae
--- /dev/null
+++ b/annotations/src/main/resources/revisions/elude/0.json
@@ -0,0 +1 @@
+{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/core/assets-raw/sprites/units/latum-cell.png b/core/assets-raw/sprites/units/cleroi-cell.png
similarity index 100%
rename from core/assets-raw/sprites/units/latum-cell.png
rename to core/assets-raw/sprites/units/cleroi-cell.png
diff --git a/core/assets-raw/sprites/units/latum-leg-base.png b/core/assets-raw/sprites/units/cleroi-leg-base.png
similarity index 100%
rename from core/assets-raw/sprites/units/latum-leg-base.png
rename to core/assets-raw/sprites/units/cleroi-leg-base.png
diff --git a/core/assets-raw/sprites/units/latum-leg.png b/core/assets-raw/sprites/units/cleroi-leg.png
similarity index 100%
rename from core/assets-raw/sprites/units/latum-leg.png
rename to core/assets-raw/sprites/units/cleroi-leg.png
diff --git a/core/assets-raw/sprites/units/latum-spine.png b/core/assets-raw/sprites/units/cleroi-spine.png
similarity index 100%
rename from core/assets-raw/sprites/units/latum-spine.png
rename to core/assets-raw/sprites/units/cleroi-spine.png
diff --git a/core/assets-raw/sprites/units/latum.png b/core/assets-raw/sprites/units/cleroi.png
similarity index 100%
rename from core/assets-raw/sprites/units/latum.png
rename to core/assets-raw/sprites/units/cleroi.png
diff --git a/core/assets-raw/sprites/units/weapons/latum-point-defense.png b/core/assets-raw/sprites/units/weapons/cleroi-point-defense.png
similarity index 100%
rename from core/assets-raw/sprites/units/weapons/latum-point-defense.png
rename to core/assets-raw/sprites/units/weapons/cleroi-point-defense.png
diff --git a/core/assets-raw/sprites/units/weapons/latum-weapon-heat.png b/core/assets-raw/sprites/units/weapons/cleroi-weapon-heat.png
similarity index 100%
rename from core/assets-raw/sprites/units/weapons/latum-weapon-heat.png
rename to core/assets-raw/sprites/units/weapons/cleroi-weapon-heat.png
diff --git a/core/assets-raw/sprites/units/weapons/latum-weapon.png b/core/assets-raw/sprites/units/weapons/cleroi-weapon.png
similarity index 100%
rename from core/assets-raw/sprites/units/weapons/latum-weapon.png
rename to core/assets-raw/sprites/units/weapons/cleroi-weapon.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 14fb5872cf..d111d6e6d0 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2017,7 +2017,7 @@ unit.stell.name = Stell
 unit.locus.name = Locus
 unit.vanquish.name = Vanquish
 unit.conquer.name = Conquer
-unit.latum.name = Latum
+unit.cleroi.name = Cleroi
 unit.tecta.name = Tecta
 unit.collaris.name = Collaris
 unit.avert.name = Avert
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 45dbe999a0..2c9822b706 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -485,7 +485,6 @@
 63210=eruption-drill|block-eruption-drill-ui
 63209=ship-assembler|block-ship-assembler-ui
 63208=quell-missile|unit-quell-missile-ui
-63207=bulwark|unit-bulwark-ui
 63206=mech-assembler|block-mech-assembler-ui
 63205=ore-crystal-thorium|block-ore-crystal-thorium-ui
 63204=ore-wall-beryllium|block-ore-wall-beryllium-ui
@@ -510,7 +509,6 @@
 63184=crystal-orbs|block-crystal-orbs-ui
 63183=conquer|unit-conquer-ui
 63182=disrupt|unit-disrupt-ui
-63181=krepost|unit-krepost-ui
 63180=disrupt-missile|unit-disrupt-missile-ui
 63179=rhyolite-vent|block-rhyolite-vent-ui
 63178=arkyic-vent|block-arkyic-vent-ui
@@ -536,7 +534,7 @@
 63156=ore-beryllium|block-ore-beryllium-ui
 63155=locus|unit-locus-ui
 63154=avert|unit-avert-ui
-63153=latum|unit-latum-ui
+63153=cleroi|unit-cleroi-ui
 63152=tank-reconstructor|block-tank-reconstructor-ui
 63151=mech-reconstructor|block-mech-reconstructor-ui
 63150=ship-reconstructor|block-ship-reconstructor-ui
@@ -560,3 +558,6 @@
 63132=precept|unit-precept-ui
 63131=diffuse|block-diffuse-ui
 63130=basic-assembler-module|block-basic-assembler-module-ui
+63129=tecta|unit-tecta-ui
+63128=collaris|unit-collaris-ui
+63127=elude|unit-elude-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index c257a4a4916b2a7987030016f616281eaf15f05f..ca503e8b192eafabb4ad50c8d80cb994bf75a238 100644
GIT binary patch
delta 77
zcmdm`v`1;f1b+VH{Jg@_)FKA<l+5Cy(t^nw`Nb!n=a<r8FDOb)PAw>5U@b{aE=gqI
hNY2m6Ni51NW?)UtDNRXbU`x(PEy~Z_{Egp*5dbjk8rJ{-

delta 97
zcmdm^v`cBj1b)S&(wy?dqHG5C<ovwC($pdb_LR)xqSAsA2KMZt)Pnrt$@BTe^;mNf
zOG<MYI1=+pGBT4(iy7GSlgcs^OHvtFb5n~-GZ~oki<24H3yM;cQwvHq|KN9F1OR@k
BAwmEE

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 58a8fa41b1..f60a2a6771 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1715,7 +1715,7 @@ public class Blocks{
         }};
 
         buildTower = new BuildTurret("build-tower"){{
-            requirements(Category.effect, with(Items.silicon, 80, Items.carbide, 30, Items.oxide, 40, Items.thorium, 30));
+            requirements(Category.effect, with(Items.silicon, 150, Items.oxide, 40, Items.thorium, 60));
             outlineColor = Pal.darkOutline;
             consumePower(3f);
             range = 160f;
@@ -4239,7 +4239,7 @@ public class Blocks{
 
             upgrades.addAll(
             new UnitType[]{UnitTypes.stell, UnitTypes.locus},
-            new UnitType[]{UnitTypes.merui, UnitTypes.latum},
+            new UnitType[]{UnitTypes.merui, UnitTypes.cleroi},
             new UnitType[]{UnitTypes.elude, UnitTypes.avert}
             );
         }};
@@ -4257,7 +4257,7 @@ public class Blocks{
 
             upgrades.addAll(
             new UnitType[]{UnitTypes.locus, UnitTypes.precept},
-            new UnitType[]{UnitTypes.latum, UnitTypes.anthicus},
+            new UnitType[]{UnitTypes.cleroi, UnitTypes.anthicus},
             new UnitType[]{UnitTypes.avert, UnitTypes.obviate}
             );
         }};
@@ -4346,7 +4346,7 @@ public class Blocks{
             regionSuffix = "-dark";
             size = 5;
             //TODO different reqs
-            plans.add(new AssemblerUnitPlan(UnitTypes.tecta, 60f * 60f, PayloadStack.list(UnitTypes.latum, 2, Blocks.tungstenWallLarge, 10)));
+            plans.add(new AssemblerUnitPlan(UnitTypes.tecta, 60f * 60f, PayloadStack.list(UnitTypes.cleroi, 2, Blocks.tungstenWallLarge, 10)));
             consumePower(3f);
             areaSize = 13;
             researchCostMultiplier = 0.4f;
@@ -4354,7 +4354,7 @@ public class Blocks{
             consumeLiquid(Liquids.nitrogen, 24f / 60f);
         }};
 
-        //TODO 5x5
+        //TODO requirements / only accept inputs
         basicAssemblerModule = new UnitAssemblerModule("basic-assembler-module"){{
             requirements(Category.units, with(Items.carbide, 400, Items.thorium, 500, Items.oxide, 300, Items.graphite, 500));
             consumePower(4f);
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index 0243a69407..8009cc0344 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -294,7 +294,7 @@ public class ErekirTechTree{
                         });
 
                         node(basicReconstructor, Seq.with(new OnSector(three)), () -> {
-                            node(UnitTypes.latum);
+                            node(UnitTypes.cleroi);
                             node(UnitTypes.avert);
                             node(UnitTypes.locus);
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 66f6c1c1ad..4edee1c1d7 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -38,7 +38,7 @@ public class UnitTypes{
 
     //legs
     public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax,
-    merui, latum, anthicus,
+    merui, cleroi, anthicus,
     tecta, collaris; //TODO horrid name here
 
     //legs, legacy
@@ -3001,7 +3001,7 @@ public class UnitTypes{
 
         }};
 
-        latum = new ErekirUnitType("latum"){{
+        cleroi = new ErekirUnitType("cleroi"){{
             speed = 0.7f;
             drag = 0.1f;
             hitSize = 14f;
@@ -3040,7 +3040,7 @@ public class UnitTypes{
                 }});
             }
 
-            weapons.add(new Weapon("latum-weapon"){{
+            weapons.add(new Weapon("cleroi-weapon"){{
                 x = 14f / 4f;
                 y = 33f / 4f;
                 reload = 30f;
@@ -3088,7 +3088,7 @@ public class UnitTypes{
                 }};
             }});
 
-            weapons.add(new PointDefenseWeapon("latum-point-defense"){{
+            weapons.add(new PointDefenseWeapon("cleroi-point-defense"){{
                 x = 16f / 4f;
                 y = -20f / 4f;
                 reload = 9f;