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

Removed references to "phantom"

Browse Source
This commit is contained in:
Anuken
2020-07-05 11:15:46 -04:00
parent 403597f860
commit 9b285e6b21
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/main/resources/classids.properties
View File

@@ -27,6 +27,7 @@ nova=30
oculon=15 oculon=15
phantom=16 phantom=16
poly=31 poly=31
pulsar=34
quasar=32 quasar=32
risse=33 risse=33
spirit=27 spirit=27

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

@@ -1692,7 +1692,7 @@ public class Blocks implements ContentList{
plans = new UnitPlan[]{ plans = new UnitPlan[]{
new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)), new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.mono, 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; size = 3;
consumes.power(1.2f); consumes.power(1.2f);
@@ -1723,6 +1723,7 @@ public class Blocks implements ContentList{
{UnitTypes.crawler, UnitTypes.eruptor}, {UnitTypes.crawler, UnitTypes.eruptor},
{UnitTypes.wraith, UnitTypes.ghoul}, {UnitTypes.wraith, UnitTypes.ghoul},
{UnitTypes.mono, UnitTypes.poly}, {UnitTypes.mono, UnitTypes.poly},
{UnitTypes.risse, UnitTypes.minke},
}; };
}}; }};
@@ -1739,6 +1740,7 @@ public class Blocks implements ContentList{
{UnitTypes.ghoul, UnitTypes.revenant}, {UnitTypes.ghoul, UnitTypes.revenant},
{UnitTypes.mace, UnitTypes.fortress}, {UnitTypes.mace, UnitTypes.fortress},
{UnitTypes.poly, UnitTypes.mega}, {UnitTypes.poly, UnitTypes.mega},
{UnitTypes.minke, UnitTypes.bryde},
}; };
}}; }};

2
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -30,7 +30,7 @@ public class MenuRenderer implements Disposable{
private float time = 0f; private float time = 0f;
private float flyerRot = 45f; private float flyerRot = 45f;
private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15); 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(){ public MenuRenderer(){
Time.mark(); Time.mark();

7
desktop/src/mindustry/desktop/steam/SStats.java
View File

@@ -55,9 +55,10 @@ public class SStats implements SteamUserStatsCallback{
if(campaign()){ if(campaign()){
SStat.maxUnitActive.max(Groups.unit.count(t -> t.team() == player.team())); 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){ //TODO
active10Phantoms.complete(); //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){ if(Groups.unit.count(u -> u.type() == UnitTypes.crawler && u.team() == player.team()) >= 50){
active50Crawlers.complete(); active50Crawlers.complete();

10
tests/src/test/java/ApplicationTests.java
View File

@@ -481,8 +481,8 @@ public class ApplicationTests{
void buildingOverlap(){ void buildingOverlap(){
initBuilding(); initBuilding();
Builderc d1 = (Builderc)UnitTypes.phantom.create(Team.sharded); Builderc d1 = (Builderc)UnitTypes.mono.create(Team.sharded);
Builderc d2 = (Builderc)UnitTypes.phantom.create(Team.sharded); Builderc d2 = (Builderc)UnitTypes.mono.create(Team.sharded);
//infinite build range //infinite build range
state.rules.editor = true; state.rules.editor = true;
@@ -508,8 +508,8 @@ public class ApplicationTests{
void buildingDestruction(){ void buildingDestruction(){
initBuilding(); initBuilding();
Builderc d1 = (Builderc)UnitTypes.phantom.create(Team.sharded); Builderc d1 = (Builderc)UnitTypes.mono.create(Team.sharded);
Builderc d2 = (Builderc)UnitTypes.phantom.create(Team.sharded); Builderc d2 = (Builderc)UnitTypes.mono.create(Team.sharded);
d1.set(10f, 20f); d1.set(10f, 20f);
d2.set(10f, 20f); d2.set(10f, 20f);
@@ -591,7 +591,7 @@ public class ApplicationTests{
} }
void depositTest(Block block, Item item){ 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); Tile tile = new Tile(0, 0, Blocks.air, Blocks.air, block);
int capacity = tile.block().itemCapacity; int capacity = tile.block().itemCapacity;