mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-23 13:01:38 -08:00
Code Issues Projects Releases Wiki Activity

New team colors

Browse source
This commit is contained in:
Anuken 2019-08-02 10:10:37 -04:00
parent 5acda423d8
commit 04c8ecf4af
22 changed files with 51 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/src/test/java/ApplicationTests.java
View file

@ -129,8 +129,8 @@ public class ApplicationTests{
createMap();
int bx = 4;
int by = 4;
world.setBlock(world.tile(bx, by), Blocks.coreShard, Team.blue);
assertEquals(world.tile(bx, by).getTeam(), Team.blue);
world.setBlock(world.tile(bx, by), Blocks.coreShard, Team.sharded);
assertEquals(world.tile(bx, by).getTeam(), Team.sharded);
for(int x = bx - 1; x <= bx + 1; x++){
for(int y = by - 1; y <= by + 1; y++){
if(x == bx && by == y){
@ -250,8 +250,8 @@ public class ApplicationTests{
void buildingOverlap(){
initBuilding();
Phantom d1 = (Phantom)UnitTypes.phantom.create(Team.blue);
Phantom d2 = (Phantom)UnitTypes.phantom.create(Team.blue);
Phantom d1 = (Phantom)UnitTypes.phantom.create(Team.sharded);
Phantom d2 = (Phantom)UnitTypes.phantom.create(Team.sharded);
d1.set(10f, 20f);
d2.set(10f, 20f);
@ -272,8 +272,8 @@ public class ApplicationTests{
void buildingDestruction(){
initBuilding();
Phantom d1 = (Phantom)UnitTypes.phantom.create(Team.blue);
Phantom d2 = (Phantom)UnitTypes.phantom.create(Team.blue);
Phantom d1 = (Phantom)UnitTypes.phantom.create(Team.sharded);
Phantom d2 = (Phantom)UnitTypes.phantom.create(Team.sharded);
d1.set(10f, 20f);
d2.set(10f, 20f);
@ -340,16 +340,16 @@ public class ApplicationTests{
createMap();
Tile core = world.tile(5, 5);
world.setBlock(core, Blocks.coreShard, Team.blue);
world.setBlock(core, Blocks.coreShard, Team.sharded);
for(Item item : content.items()){
core.entity.items.set(item, 3000);
}
assertEquals(core, state.teams.get(Team.blue).cores.first());
assertEquals(core, state.teams.get(Team.sharded).cores.first());
}
void depositTest(Block block, Item item){
BaseUnit unit = UnitTypes.spirit.create(Team.none);
BaseUnit unit = UnitTypes.spirit.create(Team.derelict);
Tile tile = new Tile(0, 0, Blocks.air.id, (byte)0, block.id);
int capacity = tile.block().itemCapacity;