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

New team system / Prototype dedicated PvP gamemode

Browse Source
This commit is contained in:
Anuken
2018-08-20 23:45:27 -04:00
parent 7a5e61fd2e
commit 2e958d8d8f
25 changed files with 255 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -84,8 +84,7 @@ public class WorldGenerator{
Team team = tile.getTeam();
if(tile.block() == StorageBlocks.core &&
state.teams.has(team)){
if(tile.block() == StorageBlocks.core){
state.teams.get(team).cores.add(tile);
}

8
core/src/io/anuke/mindustry/maps/missions/BattleMission.java
View File

@@ -39,8 +39,12 @@ public class BattleMission implements Mission{
@Override
public boolean isComplete(){
//TODO check all enemy teams, not just the first
return Vars.state.teams.getTeams(false).first().cores.size == 0;
for(Team team : Vars.state.teams.enemiesOf(Vars.defaultTeam)){
if(Vars.state.teams.isActive(team)){
return false;
}
}
return true;
}
@Override

2
core/src/io/anuke/mindustry/maps/missions/ResourceMission.java
View File

@@ -27,7 +27,7 @@ public class ResourceMission implements Mission{
@Override
public boolean isComplete(){
return Vars.state.teams.getTeams(true).first().cores.first().entity.items.has(item, amount);
return Vars.state.teams.get(Vars.defaultTeam).cores.first().entity.items.has(item, amount);
}
@Override