Merge pull request #130 from battlecode/release-1.3.1

Fixed headquarter color bug and islands on edge issue

Author: pv711

client/visualizer/src/config.ts

@@ -154,7 +154,7 @@ export enum Mode {
 export function defaults(supplied?: any): Config {
   let year = "2023"
   let conf: Config = {
-    gameVersion: "1.3.0", //TODO: Change this on each release!
+    gameVersion: "1.3.1", //TODO: Change this on each release!
     year: year,
     map_extension: 'map'+year.substring(2),
     game_extension: 'bc'+year.substring(2),

engine/src/main/battlecode/common/GameConstants.java

@@ -10,7 +10,7 @@ public class GameConstants {
     /**
      * The current spec version the server compiles with.
      */
-    public static final String SPEC_VERSION = "1.3.0";
+    public static final String SPEC_VERSION = "1.3.1";
 
     // *********************************
     // ****** MAP CONSTANTS ************

engine/src/main/battlecode/server/Server.java

@@ -234,6 +234,7 @@ private void extendOut(LiveMap liveMap, MapLocation mapLocation, Set<MapLocation
         for (Direction dir : Direction.cardinalDirections()) {
             MapLocation newLocation = mapLocation.add(dir);
             if (seenLocations.contains(newLocation)) {continue;}
+            if (!onTheMap(liveMap, newLocation)) {continue;}
             if (islandArray[locationToIndex(liveMap, newLocation)] == currValue) {
                 extendOut(liveMap, newLocation, seenLocations);
             }
@@ -452,14 +453,14 @@ private Team runMatch(GameInfo currentGame,
         final LiveMap loadedMap;
 
         try {
-            loadedMap = GameMapIO.loadMap(mapName, new File(options.get("bc.game.map-path")));
+            loadedMap = GameMapIO.loadMap(mapName, new File(options.get("bc.game.map-path")), teamsReversed);
         } catch (IOException e) {
             warn("Couldn't load map " + mapName + ", skipping");
             throw e;
         }
 
         // Create the game world!
-        currentWorld = new GameWorld(loadedMap, prov, gameMaker.getMatchMaker(), teamsReversed);
+        currentWorld = new GameWorld(loadedMap, prov, gameMaker.getMatchMaker());
 
         if (checkMapGuarantees) {
             // Validate the map

engine/src/main/battlecode/world/GameMapIO.java

@@ -48,18 +48,18 @@ public final strictfp class GameMapIO {
      * @return LiveMap for map
      * @throws IOException if the map fails to load or can't be found.
      */
-    public static LiveMap loadMap(String mapName, File mapDir) throws IOException {
+    public static LiveMap loadMap(String mapName, File mapDir, boolean teamsReversed) throws IOException {
         final LiveMap result;
 
         final File mapFile = new File(mapDir, mapName + MAP_EXTENSION);
         if (mapFile.exists()) {
-            result = loadMap(new FileInputStream(mapFile));
+            result = loadMap(new FileInputStream(mapFile), teamsReversed);
         } else {
             final InputStream backupStream = BACKUP_LOADER.getResourceAsStream(DEFAULT_MAP_PACKAGE + mapName + MAP_EXTENSION);
             if (backupStream == null) {
                 throw new IOException("Can't load map: " + mapName + " from dir " + mapDir + " or default maps.");
             }
-            result = loadMap(backupStream);
+            result = loadMap(backupStream, teamsReversed);
         }
 
         if (!result.getMapName().equals(mapName)) {
@@ -73,7 +73,7 @@ public static LiveMap loadMap(String mapName, File mapDir) throws IOException {
 
     public static LiveMap loadMapAsResource(final ClassLoader loader,
                                             final String mapPackage,
-                                            final String map) throws IOException {
+                                            final String map, final boolean teamsReversed) throws IOException {
         final InputStream mapStream = loader.getResourceAsStream(
                 mapPackage + (mapPackage.endsWith("/")? "" : "/") +
                 map + MAP_EXTENSION
@@ -83,7 +83,7 @@ public static LiveMap loadMapAsResource(final ClassLoader loader,
             throw new IOException("Can't load map: " + map + " from package " + mapPackage);
         }
 
-        final LiveMap result = loadMap(mapStream);
+        final LiveMap result = loadMap(mapStream, teamsReversed);
 
         if (!result.getMapName().equals(map)) {
             throw new IOException("Invalid map: name (" + result.getMapName()
@@ -101,8 +101,8 @@ public static LiveMap loadMapAsResource(final ClassLoader loader,
      * @return a map read from the stream
      * @throws IOException if the read fails somehow
      */
-    public static LiveMap loadMap(InputStream stream) throws IOException {
-        return Serial.deserialize(IOUtils.toByteArray(stream));
+    public static LiveMap loadMap(InputStream stream, boolean teamsReversed) throws IOException {
+        return Serial.deserialize(IOUtils.toByteArray(stream), teamsReversed);
     }
 
     /**
@@ -189,12 +189,12 @@ public static class Serial {
          * @param mapBytes the raw bytes of the map
          * @return a new copy of the map as a LiveMap
          */
-        public static LiveMap deserialize(byte[] mapBytes) {
+        public static LiveMap deserialize(byte[] mapBytes, boolean teamsReversed) {
             battlecode.schema.GameMap rawMap = battlecode.schema.GameMap.getRootAsGameMap(
                     ByteBuffer.wrap(mapBytes)
             );
 
-            return Serial.deserialize(rawMap);
+            return Serial.deserialize(rawMap, teamsReversed);
         }
 
         /**
@@ -219,7 +219,7 @@ public static byte[] serialize(LiveMap gameMap) {
          * @param raw the flatbuffer map pointer
          * @return a new copy of the map as a LiveMap
          */
-        public static LiveMap deserialize(battlecode.schema.GameMap raw) {
+        public static LiveMap deserialize(battlecode.schema.GameMap raw, boolean teamsReversed) {
             final int width = (int) (raw.maxCorner().x() - raw.minCorner().x());
             final int height = (int) (raw.maxCorner().y() - raw.minCorner().y());
             final MapLocation origin = new MapLocation((int) raw.minCorner().x(), (int) raw.minCorner().y());
@@ -243,7 +243,7 @@ public static LiveMap deserialize(battlecode.schema.GameMap raw) {
 
             ArrayList<RobotInfo> initBodies = new ArrayList<>();
             SpawnedBodyTable bodyTable = raw.bodies();
-            initInitialBodiesFromSchemaBodyTable(bodyTable, initBodies);
+            initInitialBodiesFromSchemaBodyTable(bodyTable, initBodies, teamsReversed);
 
             RobotInfo[] initialBodies = initBodies.toArray(new RobotInfo[initBodies.size()]);
 
@@ -335,7 +335,7 @@ public static int serialize(FlatBufferBuilder builder, LiveMap gameMap) {
         // *** HELPER METHODS *********
         // ****************************
 
-        private static void initInitialBodiesFromSchemaBodyTable(SpawnedBodyTable bodyTable, ArrayList<RobotInfo> initialBodies) {
+        private static void initInitialBodiesFromSchemaBodyTable(SpawnedBodyTable bodyTable, ArrayList<RobotInfo> initialBodies, boolean teamsReversed) {
             VecTable locs = bodyTable.locs();
             for (int i = 0; i < bodyTable.robotIDsLength(); i++) {
                 // all initial bodies should be headquarters
@@ -344,11 +344,14 @@ private static void initInitialBodiesFromSchemaBodyTable(SpawnedBodyTable bodyTa
                 int bodyX = locs.xs(i);
                 int bodyY = locs.ys(i);
                 Team bodyTeam = TeamMapping.team(bodyTable.teamIDs(i));
+                if (teamsReversed) {
+                    bodyTeam = bodyTeam.opponent();
+                }
                 if (bodyType == RobotType.HEADQUARTERS) {
                     Inventory headquarterInventory = new Inventory();
                     initialBodies.add(new RobotInfo(bodyID, bodyTeam, bodyType, headquarterInventory, RobotType.HEADQUARTERS.health, new MapLocation(bodyX, bodyY)));
                 }
-                // ignore robots that are not archons, TODO throw error?
+                // ignore robots that are not headquarters, TODO throw error?
             }
         }
     }

engine/src/main/battlecode/world/GameWorld.java

@@ -52,12 +52,8 @@ public strictfp class GameWorld {
     private Random rand;
     private final GameMaker.MatchMaker matchMaker;
 
-    public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker matchMaker) {
-        this(gm, cp, matchMaker, false);
-    }
-
     @SuppressWarnings("unchecked")
-    public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker matchMaker, boolean reverseTeams) {
+    public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker matchMaker) {
         this.walls = gm.getWallArray();
         this.clouds = gm.getCloudArray();
         this.islandIds = gm.getIslandArray();
@@ -86,26 +82,9 @@ public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker match
 
         // Add the robots contained in the LiveMap to this world.
         RobotInfo[] initialBodies = this.gameMap.getInitialBodies();
-        RobotInfo[] bodiesToUse = initialBodies;
-        RobotInfo[] reversedBodies = new RobotInfo[initialBodies.length];
+
         for (int i = 0; i < initialBodies.length; i++) {
             RobotInfo robot = initialBodies[i];
-            Inventory inv = new Inventory();
-            for (ResourceType rType : ResourceType.values()) {
-                if (rType == ResourceType.NO_RESOURCE) {
-                    continue;
-                }
-                inv.addResource(rType, robot.getResourceAmount(rType));
-            }
-            reversedBodies[i] = new RobotInfo(robot.ID, robot.team.opponent(), robot.type, inv, robot.health, robot.location);
-        }
-
-        if (reverseTeams) {
-            bodiesToUse = reversedBodies;
-        }
-
-        for (int i = 0; i < bodiesToUse.length; i++) {
-            RobotInfo robot = bodiesToUse[i];
             MapLocation newLocation = robot.location.translate(gm.getOrigin().x, gm.getOrigin().y);
             spawnRobot(robot.ID, robot.type, newLocation, robot.team);
         }

engine/src/test/battlecode/world/GenerateMaps.java

@@ -39,8 +39,9 @@ public void makeSimple() throws IOException {
                         )
                 )
                 .build();
+        boolean teamsReversed = false;
         GameMapIO.writeMap(map, new File("/Users/ezou/dev/battlecode20/engine/src/main/battlecode/world/maptest"));
-        LiveMap test = GameMapIO.loadMap("maptest", new File("/Users/ezou/dev/battlecode20/engine/src/main/battlecode/world/resources"));
+        LiveMap test = GameMapIO.loadMap("maptest", new File("/Users/ezou/dev/battlecode20/engine/src/main/battlecode/world/resources"), teamsReversed);
         // System.out.println(test.toString());
     }
 }

specs/specs.md.html

@@ -287,6 +287,11 @@
 
 # Appendix: Changelog
 
+- Version 1.3.1 (January 15, 2023)
+  - Engine Fixes:
+    - Fixed headquarter colors being reversed when teams are reversed (from alternateOrder)
+    - Fixed issue in checking maps with islands on edges
+
 - Version 1.3.0 (January 15, 2023)
   - Spec Fixes:
     - Clarified that clouds change vision radius to 4 units