From 36ec88e2e26ee88794aa9d87e2e24bc5a9d1b51f Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 14:20:36 -0500 Subject: [PATCH] Team cleanup --- core/src/mindustry/Vars.java | 4 ++-- core/src/mindustry/game/Teams.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 1a55d6e23f..fafb869c39 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -128,9 +128,9 @@ public class Vars implements Loadable{ public static Fi dataDirectory; /** data subdirectory used for screenshots */ public static Fi screenshotDirectory; - /** data subdirectory used for custom mmaps */ + /** data subdirectory used for custom maps */ public static Fi customMapDirectory; - /** data subdirectory used for custom mmaps */ + /** data subdirectory used for custom map previews */ public static Fi mapPreviewDirectory; /** tmp subdirectory for map conversion */ public static Fi tmpDirectory; diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 020bfb4b88..d77b7902ae 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -1,12 +1,23 @@ package mindustry.game; +import arc.func.*; import arc.struct.*; import mindustry.*; +import mindustry.entities.type.*; import mindustry.world.*; /** Class for various team-based utilities. */ public class Teams{ - private TeamData[] map = new TeamData[256]; + /** Maps team IDs to team data. */ + private Array map = new Array<>(); + /** Active teams. */ + private Array active = new Array<>(); + + public T eachEnemyCore(Team team, Func ret){ + T out = null; + //todo each enemy, each enemy core... + return out; + } /** * Register a team.