Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More units renamed

Browse Source
This commit is contained in:
Anuken
2022-05-05 13:39:14 -04:00
parent 7782331dbc
commit 429e07adec
16 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/content/Blocks.java
View File

@@ -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);

2
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -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);

8
core/src/mindustry/content/UnitTypes.java
View File

@@ -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;