diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index 54507de0bf..3ad501266e 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -27,6 +27,7 @@ nova=30 oculon=15 phantom=16 poly=31 +pulsar=34 quasar=32 risse=33 spirit=27 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 17f2131805..e1c53bc981 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1692,7 +1692,7 @@ public class Blocks implements ContentList{ plans = new UnitPlan[]{ new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)), new UnitPlan(UnitTypes.mono, 200f, with(Items.silicon, 10)), - new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)), + //new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)), }; size = 3; consumes.power(1.2f); @@ -1723,6 +1723,7 @@ public class Blocks implements ContentList{ {UnitTypes.crawler, UnitTypes.eruptor}, {UnitTypes.wraith, UnitTypes.ghoul}, {UnitTypes.mono, UnitTypes.poly}, + {UnitTypes.risse, UnitTypes.minke}, }; }}; @@ -1739,6 +1740,7 @@ public class Blocks implements ContentList{ {UnitTypes.ghoul, UnitTypes.revenant}, {UnitTypes.mace, UnitTypes.fortress}, {UnitTypes.poly, UnitTypes.mega}, + {UnitTypes.minke, UnitTypes.bryde}, }; }}; diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index e8f8857591..0ffa0c5d5e 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -30,7 +30,7 @@ public class MenuRenderer implements Disposable{ private float time = 0f; private float flyerRot = 45f; private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15); - private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.phantom, UnitTypes.phantom, UnitTypes.revenant); + private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.revenant); public MenuRenderer(){ Time.mark(); diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index ef4584f15e..48b24c45ee 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -55,9 +55,10 @@ public class SStats implements SteamUserStatsCallback{ if(campaign()){ SStat.maxUnitActive.max(Groups.unit.count(t -> t.team() == player.team())); - if(Groups.unit.count(u -> u.type() == UnitTypes.phantom && u.team() == player.team()) >= 10){ - active10Phantoms.complete(); - } + //TODO + //if(Groups.unit.count(u -> u.type() == UnitTypes.phantom && u.team() == player.team()) >= 10){ + // active10Phantoms.complete(); + //} if(Groups.unit.count(u -> u.type() == UnitTypes.crawler && u.team() == player.team()) >= 50){ active50Crawlers.complete(); diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index d7f75b2408..8ad74fddba 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -481,8 +481,8 @@ public class ApplicationTests{ void buildingOverlap(){ initBuilding(); - Builderc d1 = (Builderc)UnitTypes.phantom.create(Team.sharded); - Builderc d2 = (Builderc)UnitTypes.phantom.create(Team.sharded); + Builderc d1 = (Builderc)UnitTypes.mono.create(Team.sharded); + Builderc d2 = (Builderc)UnitTypes.mono.create(Team.sharded); //infinite build range state.rules.editor = true; @@ -508,8 +508,8 @@ public class ApplicationTests{ void buildingDestruction(){ initBuilding(); - Builderc d1 = (Builderc)UnitTypes.phantom.create(Team.sharded); - Builderc d2 = (Builderc)UnitTypes.phantom.create(Team.sharded); + Builderc d1 = (Builderc)UnitTypes.mono.create(Team.sharded); + Builderc d2 = (Builderc)UnitTypes.mono.create(Team.sharded); d1.set(10f, 20f); d2.set(10f, 20f); @@ -591,7 +591,7 @@ public class ApplicationTests{ } void depositTest(Block block, Item item){ - Unit unit = UnitTypes.spirit.create(Team.derelict); + Unit unit = UnitTypes.mono.create(Team.derelict); Tile tile = new Tile(0, 0, Blocks.air, Blocks.air, block); int capacity = tile.block().itemCapacity;