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

Fixed crashes with team IDs above 127

Browse Source
This commit is contained in:
Anuken
2020-07-03 12:36:12 -04:00
parent 3772b04c6b
commit 843a8c3e56
18 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
-1
View File
@@ -1689,7 +1689,6 @@ public class Blocks implements ContentList{
plans = new UnitPlan[]{
new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.spirit, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.draug, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)),
};
size = 3;
core/src/mindustry/content/UnitTypes.java
+6 -19
View File
@@ -13,7 +13,7 @@ import mindustry.type.*;
public class UnitTypes implements ContentList{
//ground
public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, chaosArray, eradicator;
public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, siegeArray, eradicator;
//ground + builder
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType tau;
@@ -24,14 +24,14 @@ public class UnitTypes implements ContentList{
//legs
public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix, eruptor;
//air
//air (no special traits)
public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
//air + mining
public static @EntityDef({Unitc.class, Minerc.class}) UnitType draug;
//air + building
public static @EntityDef({Unitc.class, Builderc.class}) UnitType phantom, spirit;
public static @EntityDef({Unitc.class, Builderc.class}) UnitType spirit;
//air + mining
public static @EntityDef({Unitc.class, Minerc.class}) UnitType phantom;
//air + building + mining
//TODO implement other starter drones
@@ -403,19 +403,6 @@ public class UnitTypes implements ContentList{
}});
}};
draug = new UnitType("draug"){{
flying = true;
drag = 0.05f;
speed = 2f;
range = 50f;
accel = 0.2f;
health = 80;
mineSpeed = 0.9f;
engineSize = 1.8f;
engineOffset = 5.7f;
mineTier = 1;
}};
spirit = new UnitType("spirit"){{
flying = true;
drag = 0.05f;