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

Internal unit name finalizations

Browse Source
This commit is contained in:
Anuken
2020-07-13 20:39:43 -04:00
parent 103ebc009d
commit 250d982d99
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ public class UnitTypes implements ContentList{
//region definitions //region definitions
//ground //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 //ground + builder
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova; public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova;

4
core/src/mindustry/game/DefaultWaves.java
View File

@@ -157,14 +157,14 @@ public class DefaultWaves{
spacing = 3; spacing = 3;
}}, }},
new SpawnGroup(UnitTypes.siegeArray){{ new SpawnGroup(UnitTypes.vestige){{
begin = 41; begin = 41;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;
spacing = 30; spacing = 30;
}}, }},
new SpawnGroup(UnitTypes.eradicator){{ new SpawnGroup(UnitTypes.cataclyst){{
begin = 81; begin = 81;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;

3
core/src/mindustry/type/UnitType.java
View File

@@ -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); public static final float shadowTX = -12, shadowTY = -13, shadowColor = Color.toFloatBits(0, 0, 0, 0.22f);
private static final Vec2 legOffset = new Vec2(); private static final Vec2 legOffset = new Vec2();
//TODO document
public boolean flying; public boolean flying;
public @NonNull Prov<? extends Unit> constructor; public @NonNull Prov<? extends Unit> constructor;
public @NonNull Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI(); 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 payloadCapacity = 1;
public int commandLimit = 24; public int commandLimit = 24;
public float visualElevation = -1f; public float visualElevation = -1f;
public float deathShake = 2f;
public boolean allowLegStep = false; public boolean allowLegStep = false;
public boolean hovering = false; public boolean hovering = false;
public Effect fallEffect = Fx.fallSmoke; public Effect fallEffect = Fx.fallSmoke;
public Effect fallThrusterEffect = Fx.fallSmoke; public Effect fallThrusterEffect = Fx.fallSmoke;
public Seq<Ability> abilities = new Seq<>(); public Seq<Ability> abilities = new Seq<>();
//TODO document
public int legCount = 4, legGroupSize = 2; 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 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; public float legSplashDamage = 0f, legSplashRange = 5;