diff --git a/core/assets-raw/sprites/units/krepost-cell.png b/core/assets-raw/sprites/units/collaris-cell.png similarity index 100% rename from core/assets-raw/sprites/units/krepost-cell.png rename to core/assets-raw/sprites/units/collaris-cell.png diff --git a/core/assets-raw/sprites/units/krepost-joint-base.png b/core/assets-raw/sprites/units/collaris-joint-base.png similarity index 100% rename from core/assets-raw/sprites/units/krepost-joint-base.png rename to core/assets-raw/sprites/units/collaris-joint-base.png diff --git a/core/assets-raw/sprites/units/krepost-leg-base.png b/core/assets-raw/sprites/units/collaris-leg-base.png similarity index 100% rename from core/assets-raw/sprites/units/krepost-leg-base.png rename to core/assets-raw/sprites/units/collaris-leg-base.png diff --git a/core/assets-raw/sprites/units/krepost-leg.png b/core/assets-raw/sprites/units/collaris-leg.png similarity index 100% rename from core/assets-raw/sprites/units/krepost-leg.png rename to core/assets-raw/sprites/units/collaris-leg.png diff --git a/core/assets-raw/sprites/units/krepost.png b/core/assets-raw/sprites/units/collaris.png similarity index 100% rename from core/assets-raw/sprites/units/krepost.png rename to core/assets-raw/sprites/units/collaris.png diff --git a/core/assets-raw/sprites/units/osc-cell.png b/core/assets-raw/sprites/units/elude-cell.png similarity index 100% rename from core/assets-raw/sprites/units/osc-cell.png rename to core/assets-raw/sprites/units/elude-cell.png diff --git a/core/assets-raw/sprites/units/osc.png b/core/assets-raw/sprites/units/elude.png similarity index 100% rename from core/assets-raw/sprites/units/osc.png rename to core/assets-raw/sprites/units/elude.png diff --git a/core/assets-raw/sprites/units/bulwark-cell.png b/core/assets-raw/sprites/units/tecta-cell.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark-cell.png rename to core/assets-raw/sprites/units/tecta-cell.png diff --git a/core/assets-raw/sprites/units/bulwark-foot.png b/core/assets-raw/sprites/units/tecta-foot.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark-foot.png rename to core/assets-raw/sprites/units/tecta-foot.png diff --git a/core/assets-raw/sprites/units/bulwark-leg-base.png b/core/assets-raw/sprites/units/tecta-leg-base.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark-leg-base.png rename to core/assets-raw/sprites/units/tecta-leg-base.png diff --git a/core/assets-raw/sprites/units/bulwark-leg.png b/core/assets-raw/sprites/units/tecta-leg.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark-leg.png rename to core/assets-raw/sprites/units/tecta-leg.png diff --git a/core/assets-raw/sprites/units/bulwark-shield.png b/core/assets-raw/sprites/units/tecta-shield.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark-shield.png rename to core/assets-raw/sprites/units/tecta-shield.png diff --git a/core/assets-raw/sprites/units/bulwark.png b/core/assets-raw/sprites/units/tecta.png similarity index 100% rename from core/assets-raw/sprites/units/bulwark.png rename to core/assets-raw/sprites/units/tecta.png diff --git a/core/assets-raw/sprites/units/anthicus-weapon-blade-heat.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade-heat.png similarity index 100% rename from core/assets-raw/sprites/units/anthicus-weapon-blade-heat.png rename to core/assets-raw/sprites/units/weapons/anthicus-weapon-blade-heat.png diff --git a/core/assets-raw/sprites/units/anthicus-weapon-blade.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-blade.png similarity index 100% rename from core/assets-raw/sprites/units/anthicus-weapon-blade.png rename to core/assets-raw/sprites/units/weapons/anthicus-weapon-blade.png diff --git a/core/assets-raw/sprites/units/anthicus-weapon-heat.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/anthicus-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/anthicus-weapon-heat.png diff --git a/core/assets-raw/sprites/units/anthicus-weapon.png b/core/assets-raw/sprites/units/weapons/anthicus-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/anthicus-weapon.png rename to core/assets-raw/sprites/units/weapons/anthicus-weapon.png diff --git a/core/assets-raw/sprites/units/weapons/krepost-weapon-blade-heat.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade-heat.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/krepost-weapon-blade-heat.png rename to core/assets-raw/sprites/units/weapons/collaris-weapon-blade-heat.png diff --git a/core/assets-raw/sprites/units/weapons/krepost-weapon-blade.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-blade.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/krepost-weapon-blade.png rename to core/assets-raw/sprites/units/weapons/collaris-weapon-blade.png diff --git a/core/assets-raw/sprites/units/weapons/krepost-weapon-heat.png b/core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/krepost-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/collaris-weapon-heat.png diff --git a/core/assets-raw/sprites/units/weapons/krepost-weapon.png b/core/assets-raw/sprites/units/weapons/collaris-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/krepost-weapon.png rename to core/assets-raw/sprites/units/weapons/collaris-weapon.png diff --git a/core/assets-raw/sprites/units/corvus-weapon-heat.png b/core/assets-raw/sprites/units/weapons/corvus-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/corvus-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/corvus-weapon-heat.png diff --git a/core/assets-raw/sprites/units/weapons/osc-weapon.png b/core/assets-raw/sprites/units/weapons/elude-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/osc-weapon.png rename to core/assets-raw/sprites/units/weapons/elude-weapon.png diff --git a/core/assets-raw/sprites/units/merui-weapon-heat.png b/core/assets-raw/sprites/units/weapons/merui-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/merui-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/merui-weapon-heat.png diff --git a/core/assets-raw/sprites/units/merui-weapon.png b/core/assets-raw/sprites/units/weapons/merui-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/merui-weapon.png rename to core/assets-raw/sprites/units/weapons/merui-weapon.png diff --git a/core/assets-raw/sprites/units/precept-weapon-cell.png b/core/assets-raw/sprites/units/weapons/precept-weapon-cell.png similarity index 100% rename from core/assets-raw/sprites/units/precept-weapon-cell.png rename to core/assets-raw/sprites/units/weapons/precept-weapon-cell.png diff --git a/core/assets-raw/sprites/units/precept-weapon-heat.png b/core/assets-raw/sprites/units/weapons/precept-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/precept-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/precept-weapon-heat.png diff --git a/core/assets-raw/sprites/units/precept-weapon.png b/core/assets-raw/sprites/units/weapons/precept-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/precept-weapon.png rename to core/assets-raw/sprites/units/weapons/precept-weapon.png diff --git a/core/assets-raw/sprites/units/weapons/bulwark-weapon-heat.png b/core/assets-raw/sprites/units/weapons/tecta-weapon-heat.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/bulwark-weapon-heat.png rename to core/assets-raw/sprites/units/weapons/tecta-weapon-heat.png diff --git a/core/assets-raw/sprites/units/weapons/bulwark-weapon.png b/core/assets-raw/sprites/units/weapons/tecta-weapon.png similarity index 100% rename from core/assets-raw/sprites/units/weapons/bulwark-weapon.png rename to core/assets-raw/sprites/units/weapons/tecta-weapon.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 03dc64dc9e..14fb5872cf 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2018,8 +2018,8 @@ unit.locus.name = Locus unit.vanquish.name = Vanquish unit.conquer.name = Conquer unit.latum.name = Latum -unit.bulwark.name = Bulwark -unit.krepost.name = Krepost +unit.tecta.name = Tecta +unit.collaris.name = Collaris unit.avert.name = Avert unit.quell.name = Quell unit.disrupt.name = Disrupt @@ -2032,7 +2032,7 @@ unit.effect-drone.name = Effect Drone unit.precept.name = Precept unit.merui.name = Merui unit.anthicus.name = Anthicus -unit.osc.name = Osc +unit.elude.name = Elude unit.obviate.name = Obviate sector.two.name = Two sector.three.name = Three diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a9d4fb31f3..58a8fa41b1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -143,7 +143,6 @@ public class Blocks{ basicReconstructor, advancedReconstructor, - //tankReconstructor, shipReconstructor, mechReconstructor, tankAssembler, shipAssembler, mechAssembler, basicAssemblerModule, @@ -4220,7 +4219,7 @@ public class Blocks{ requirements(Category.units, with(Items.silicon, 200, Items.graphite, 300)); size = 3; configurable = false; - plans.add(new UnitPlan(UnitTypes.osc, 60f * 40f, with(Items.graphite, 40f, Items.silicon, 70f))); + plans.add(new UnitPlan(UnitTypes.elude, 60f * 40f, with(Items.graphite, 40f, Items.silicon, 70f))); regionSuffix = "-dark"; fogRadius = 3; consumePower(2f); @@ -4241,7 +4240,7 @@ public class Blocks{ upgrades.addAll( new UnitType[]{UnitTypes.stell, UnitTypes.locus}, new UnitType[]{UnitTypes.merui, UnitTypes.latum}, - new UnitType[]{UnitTypes.osc, UnitTypes.avert} + new UnitType[]{UnitTypes.elude, UnitTypes.avert} ); }}; @@ -4347,7 +4346,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 5; //TODO different reqs - plans.add(new AssemblerUnitPlan(UnitTypes.bulwark, 60f * 60f, PayloadStack.list(UnitTypes.latum, 2, Blocks.tungstenWallLarge, 10))); + plans.add(new AssemblerUnitPlan(UnitTypes.tecta, 60f * 60f, PayloadStack.list(UnitTypes.latum, 2, Blocks.tungstenWallLarge, 10))); consumePower(3f); areaSize = 13; researchCostMultiplier = 0.4f; diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 2d149c9d8b..0243a69407 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -289,7 +289,7 @@ public class ErekirTechTree{ }); node(shipFabricator, Seq.with(new OnSector(three)), () -> { - node(UnitTypes.osc, () -> { + node(UnitTypes.elude, () -> { }); @@ -321,8 +321,8 @@ public class ErekirTechTree{ }); node(mechAssembler, Seq.with(tmpNever), () -> { - node(UnitTypes.bulwark, () -> { - node(UnitTypes.krepost, Seq.with(tmpNever), () -> { + node(UnitTypes.tecta, () -> { + node(UnitTypes.collaris, Seq.with(tmpNever), () -> { }); }); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index a1026775f3..66f6c1c1ad 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -39,13 +39,13 @@ public class UnitTypes{ //legs public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax, merui, latum, anthicus, - bulwark, krepost; //TODO horrid name here + tecta, collaris; //TODO horrid name here //legs, legacy public static @EntityDef(value = {Unitc.class, Legsc.class}, legacy = true) UnitType spiroct, arkyid, toxopid; //hover - public static @EntityDef({Unitc.class, ElevationMovec.class}) UnitType osc; //TODO bad name + public static @EntityDef({Unitc.class, ElevationMovec.class}) UnitType elude; //TODO bad name //air public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra, @@ -3256,7 +3256,7 @@ public class UnitTypes{ }}); }}; - bulwark = new ErekirUnitType("bulwark"){{ + tecta = new ErekirUnitType("tecta"){{ drag = 0.1f; speed = 0.6f; hitSize = 23f; @@ -3271,7 +3271,7 @@ public class UnitTypes{ legMaxLength = 1.3f; abilities.add(new ShieldArcAbility(){{ - region = "bulwark-shield"; + region = "tecta-shield"; radius = 34f; angle = 82f; regen = 0.6f; @@ -3302,7 +3302,7 @@ public class UnitTypes{ shadowElevation = 0.4f; groundLayer = Layer.legUnit; - weapons.add(new Weapon("bulwark-weapon"){{ + weapons.add(new Weapon("tecta-weapon"){{ mirror = true; top = false; @@ -3358,7 +3358,7 @@ public class UnitTypes{ }}); }}; - krepost = new ErekirUnitType("krepost"){{ + collaris = new ErekirUnitType("collaris"){{ drag = 0.1f; speed = 1.1f; hitSize = 44f; @@ -3392,7 +3392,7 @@ public class UnitTypes{ shadowElevation = 0.4f; groundLayer = Layer.legUnit; - weapons.add(new Weapon("krepost-weapon"){{ + weapons.add(new Weapon("collaris-weapon"){{ mirror = true; rotationLimit = 30f; rotateSpeed = 0.4f; @@ -3474,7 +3474,7 @@ public class UnitTypes{ //endregion //region erekir - flying - osc = new ErekirUnitType("osc"){{ + elude = new ErekirUnitType("elude"){{ hovering = true; shadowElevation = 0.1f; @@ -3511,7 +3511,7 @@ public class UnitTypes{ }}); } - weapons.add(new Weapon("osc-weapon"){{ + weapons.add(new Weapon("elude-weapon"){{ y = -2f; x = 4f; top = true;