Merge remote-tracking branch 'origin/engine-day-2'

Author: TheApplePieGod

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

@@ -1,19 +1,19 @@
 package battlecode.common;
 
 public enum UnitType {
-    SOLDIER(200, 250, 5, 250, -1, 200, 10, 20, 20, -1, 0, 0),
-    SPLASHER(300, 400, 50, 150, -1, 300, 50, 9, -1, 50, 0, 0),
+    SOLDIER(200, 250, 5, 250, -1, 200, 10, 9, 20, -1, 0, 0),
+    SPLASHER(300, 400, 50, 150, -1, 300, 50, 8, -1, 50, 0, 0),
     MOPPER(100, 300, 0, 50, -1, 100, 30, 2, -1, -1, 0, 0),
 
-    LEVEL_ONE_PAINT_TOWER(0, 25,  0, 1000, 1, 1000, 10, 9, 20, 10, 5, 0),
+    LEVEL_ONE_PAINT_TOWER(0, 100,  0, 1000, 1, 1000, 10, 9, 20, 10, 5, 0),
     LEVEL_TWO_PAINT_TOWER(0, 250, 0, 1500, 2, 1000, 10, 9, 20, 10, 10, 0),
     LEVEL_THREE_PAINT_TOWER(0, 500, 0, 2000, 3, 1000, 10, 9, 20, 10, 15, 0),
 
-    LEVEL_ONE_MONEY_TOWER(0, 25,  0, 1000, 1, 1000, 10, 9, 20, 10, 0, 10),
+    LEVEL_ONE_MONEY_TOWER(0, 100,  0, 1000, 1, 1000, 10, 9, 20, 10, 0, 10),
     LEVEL_TWO_MONEY_TOWER(0, 250,  0, 1500, 2, 1000, 10, 9, 20, 10, 0, 15),
     LEVEL_THREE_MONEY_TOWER(0, 500, 0, 2000, 3, 1000, 10, 9, 20, 10, 0, 20),
 
-    LEVEL_ONE_DEFENSE_TOWER(0, 25,  0, 2500, 1, 1000, 10, 20, 60, 30, 0, 0),
+    LEVEL_ONE_DEFENSE_TOWER(0, 100,  0, 2500, 1, 1000, 10, 20, 60, 30, 0, 0),
     LEVEL_TWO_DEFENSE_TOWER(0, 250,  0, 3000, 2, 1000, 10, 20, 65, 35, 0, 0),
     LEVEL_THREE_DEFENSE_TOWER(0, 500, 0, 3500, 3, 1000, 10, 20, 70, 40, 0, 0);
 

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

@@ -236,7 +236,7 @@ public static LiveMap deserialize(battlecode.schema.GameMap raw, boolean teamsRe
             int[] patternArray = new int[4];
             for (int i = 0; i < wallArray.length; i++) {
                 wallArray[i] = raw.walls(i);
-                paintArray[i] = raw.paint(i);
+                paintArray[i] = possiblyReversePaint(raw.paint(i), teamsReversed);
             }
             for (int i = 0; i < patternArray.length; i++){
                 patternArray[i] = raw.paintPatterns(i);
@@ -294,6 +294,7 @@ public static int serialize(FlatBufferBuilder builder, LiveMap gameMap) {
                 bodyTypes.add(FlatHelpers.getRobotTypeFromUnitType(robot.type));
                 bodyLocsXs.add(robot.location.x);
                 bodyLocsYs.add(robot.location.y);
+                ruinArray[gameMap.locationToIndex(robot.location)] = true;
             }
 
             for (int i = 0; i < gameMap.getWidth() * gameMap.getHeight(); i++) {
@@ -365,6 +366,19 @@ private static void initInitialBodiesFromSchemaBodyTable(InitialBodyTable bodyTa
             }
         }
 
+        // No color = 0, Team A color 1 = 1, Team A color 2 = 2, Team B color 1 = 3, Team B color 2 = 4
+        private static byte possiblyReversePaint(byte originalPaint, boolean teamsReversed){
+            if (!teamsReversed)
+                return originalPaint;
+            switch (originalPaint){
+                case 1: return 3;
+                case 2: return 4;
+                case 3: return 1;
+                case 4: return 2;
+                default: return originalPaint;
+            }
+        }
+
         private static int createSpawnActionsVector(FlatBufferBuilder builder, ArrayList<Integer> ids, ArrayList<Integer> xs, ArrayList<Integer> ys, ArrayList<Byte> teams, ArrayList<Byte> types){
             InitialBodyTable.startSpawnActionsVector(builder, ids.size());
             for (int i = 0; i < ids.size(); i++){

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

@@ -577,11 +577,23 @@ public int getTowerPattern(UnitType towerType) {
     }
 
     public boolean isValidPatternCenter(MapLocation loc) {
-        return !(loc.x < GameConstants.PATTERN_SIZE / 2
+        return (!(loc.x < GameConstants.PATTERN_SIZE / 2
               || loc.y < GameConstants.PATTERN_SIZE / 2
               || loc.x >= gameMap.getWidth() - (GameConstants.PATTERN_SIZE - 1) / 2
               || loc.y >= gameMap.getHeight() - (GameConstants.PATTERN_SIZE - 1) / 2
-        );
+        )) && areaIsPaintable(loc) ;
+    }
+
+    // checks that location has no walls/ruins in the surrounding 5x5 area
+    public boolean areaIsPaintable(MapLocation loc){
+        for (int dx = -GameConstants.PATTERN_SIZE / 2; dx < (GameConstants.PATTERN_SIZE + 1) / 2; dx++) {
+            for (int dy = -GameConstants.PATTERN_SIZE / 2; dy < (GameConstants.PATTERN_SIZE + 1) / 2; dy++) {
+                MapLocation newLoc = loc.translate(dx, dy);
+                if (!isPaintable(newLoc))
+                    return false;
+            }
+        }
+        return true;
     }
 
     public boolean isPassable(MapLocation loc) {

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

@@ -713,6 +713,20 @@ public void markResourcePattern(MapLocation loc, int rotationAngle, boolean refl
         this.gameWorld.markResourcePattern(getTeam(), loc, rotationAngle, reflect);
     }
 
+    private UnitType getBaseUnitType(UnitType type){
+        UnitType baseType;
+        switch (type){
+            case LEVEL_TWO_DEFENSE_TOWER: baseType = UnitType.LEVEL_ONE_DEFENSE_TOWER; break;
+            case LEVEL_THREE_DEFENSE_TOWER: baseType = UnitType.LEVEL_ONE_DEFENSE_TOWER; break;
+            case LEVEL_TWO_MONEY_TOWER: baseType = UnitType.LEVEL_ONE_MONEY_TOWER; break;
+            case LEVEL_THREE_MONEY_TOWER: baseType = UnitType.LEVEL_ONE_MONEY_TOWER; break;
+            case LEVEL_TWO_PAINT_TOWER: baseType = UnitType.LEVEL_ONE_PAINT_TOWER; break;
+            case LEVEL_THREE_PAINT_TOWER: baseType = UnitType.LEVEL_ONE_PAINT_TOWER; break;
+            default: baseType = type;
+        }
+        return baseType;
+    }
+
     private void assertCanCompleteTowerPattern(UnitType type, MapLocation loc) throws GameActionException {
         assertIsRobotType(this.robot.getType());
         assertIsTowerType(type);
@@ -730,6 +744,12 @@ private void assertCanCompleteTowerPattern(UnitType type, MapLocation loc) throw
                             + ") because the center is not a ruin");
         }
 
+        if (getMoney() < getBaseUnitType(type).moneyCost){
+            throw new GameActionException(CANT_DO_THAT,
+            "Cannot complete tower pattern centered at (" + loc.x + ", " + loc.y
+                    + ") because the team does not have enough money!"); 
+        }
+
         if (!this.gameWorld.isValidPatternCenter(loc)) {
             throw new GameActionException(CANT_DO_THAT,
                     "Cannot complete tower pattern centered at (" + loc.x + ", " + loc.y
@@ -773,6 +793,7 @@ public void completeTowerPattern(UnitType type, MapLocation loc) throws GameActi
         assertCanCompleteTowerPattern(type, loc);
         this.gameWorld.completeTowerPattern(getTeam(), type, loc);
         InternalRobot tower = this.gameWorld.getRobot(loc);
+        this.gameWorld.getTeamInfo().addMoney(getTeam(), -getBaseUnitType(type).moneyCost);
         this.gameWorld.getMatchMaker().addSpawnAction(tower.getID(), loc, tower.getTeam(), type);
         this.gameWorld.getMatchMaker().addBuildAction(tower.getID());
     }