Fixed compilation

This commit is contained in:
Anuken
2019-12-26 19:40:54 -05:00
parent de5979f4ee
commit 4858e602ed
18 changed files with 129 additions and 103 deletions
+2 -4
View File
@@ -6,10 +6,9 @@ import arc.util.*;
import mindustry.graphics.*;
public class Team implements Comparable<Team>{
public final Color color;
public final int intColor;
public final String name;
public final byte id;
public final Color color;
public String name;
/** All 256 registered teams. */
private static final Team[] all = new Team[256];
@@ -48,7 +47,6 @@ public class Team implements Comparable<Team>{
protected Team(int id, String name, Color color){
this.name = name;
this.color = color;
this.intColor = Color.rgba8888(color);
this.id = (byte)id;
int us = Pack.u(this.id);
+22 -4
View File
@@ -3,12 +3,12 @@ package mindustry.game;
import arc.func.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.entities.type.*;
import mindustry.world.blocks.storage.CoreBlock.*;
import static mindustry.Vars.state;
import static mindustry.Vars.*;
/** Class for various team-based utilities. */
public class Teams{
@@ -33,6 +33,10 @@ public class Teams{
return Geometry.findClosest(x, y, get(team).cores);
}
public Array<Team> enemiesOf(Team team){
return get(team).enemies;
}
public boolean eachEnemyCore(Team team, Boolf<CoreEntity> ret){
for(TeamData data : active){
if(areEnemies(team, data.team)){
@@ -104,6 +108,8 @@ public class Teams{
//register in active list if needed
if(data.active() && !active.contains(data)){
active.add(data);
updateEnemies();
indexer.updateTeamIndex(data.team);
}
}
@@ -114,12 +120,24 @@ public class Teams{
//unregister in active list
if(!data.active()){
active.remove(data);
updateEnemies();
}
}
private void updateEnemies(){
for(TeamData data : active){
data.enemies.clear();
for(TeamData other : active){
if(areEnemies(data.team, other.team)){
data.enemies.add(other.team);
}
}
}
}
public class TeamData{
private final Array<CoreEntity> cores = new Array<>();
public final Array<CoreEntity> cores = new Array<>();
public final Array<Team> enemies = new Array<>();
public final Team team;
public Queue<BrokenBlock> brokenBlocks = new Queue<>();