updates by spec

Author: hannah-y-gao

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

@@ -134,7 +134,7 @@ public class GameConstants {
     public static final int BUILD_DISTANCE_SQUARED = 2;
 
     /** The maximum number of rounds a message will exist for */
-    public static final int MESSAGE_ROUND_DURATION = 5; // TODO need to spec messages as a whole!
+    public static final int MESSAGE_ROUND_DURATION = 5;
 
     /** The maximum number of messages a robot can send per turn */
     public static final int MAX_MESSAGES_SENT_ROBOT = 1;
@@ -174,9 +174,6 @@ public class GameConstants {
      */
     public static final int HEALTH_GRAB_THRESHOLD = 0;
 
-    /** The area effected by the cat's attack. */
-    public static final int CAT_ATTACK_AOE_RADIUS_SQUARED = 4; // TODO need to specify!
-
     /** The cheese cost for upgrading a rat into a rat king */
     public static final int RAT_KING_UPGRADE_CHEESE_COST = 50;
 
@@ -186,8 +183,6 @@ public class GameConstants {
     /** The cheese cost to place a tile of dirt */
     public static final int PLACE_DIRT_CHEESE_COST = 10;
 
-    /** After this many turns, cats will begin moving if they haven't already. */
-    public static final int CAT_GRACE_PERIOD = 100;
 
     // *********************************
     // ****** COMMUNICATION ************
@@ -199,8 +194,6 @@ public class GameConstants {
     /** The maximum value of an integer in the shared array and persistent array. */
     public static final int COMM_ARRAY_MAX_VALUE = 1023;
 
-    /** The size of the persistent array. */
-    public static final int PERSISTENT_ARRAY_SIZE = 5;
 
     // *********************************
     // ****** COOLDOWNS ****************
@@ -215,12 +208,7 @@ public class GameConstants {
     /**
      * The amount added to the turning cooldown counter when turning
      */
-    public static final int TURNING_COOLDOWN = 5; // TODO not sure
-
-    /**
-     * The amount added to the movement cooldown counter when a king moves
-     */
-    public static final int DRAGGING_MOVEMENT_COOLDOWN = 15; // TODO need to specify!
+    public static final int TURNING_COOLDOWN = 10;
 
     /**
      * The amount added to the action cooldown counter after a king builds a robot
@@ -240,8 +228,7 @@ public class GameConstants {
     public static final int DIG_COOLDOWN = 25;
 
     /**
-     * The multiplier to the cooldowns when carrying another robot; TODO increases
-     * exponentially when >1 robot is carried?
+     * The multiplier to the cooldowns when carrying another robot
      */
     public static final double CARRY_COOLDOWN_MULTIPLIER = 1.5;
 
@@ -252,9 +239,7 @@ public class GameConstants {
     public static final int MAX_CARRY_DURATION = 10;
 
     /**
-     * The total number turns a rat can travel for while thrown (rats are stunned
-     * while
-     * thrown)
+     * The total number turns a rat can travel for while thrown (rats are stunned while thrown)
      */
     public static final int THROW_DURATION = 4;
 

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

@@ -345,8 +345,7 @@ public interface RobotController {
     RobotInfo[] senseNearbyRobots(MapLocation center, int radiusSquared, Team team) throws GameActionException;
 
     /**
-     * Given a senseable location, returns whether that location is passable (a
-     * wall).
+     * Given a senseable location, returns whether that location is passable (i.e. no wall or dirt)
      * 
      * @param loc the given location
      * @return whether that location is passable
@@ -511,7 +510,7 @@ public interface RobotController {
 
     /**
      * Returns the number of turning cooldown turns remaining before this unit can
-     * move again.
+     * turn again.
      * When this number is strictly less than {@link GameConstants#COOLDOWN_LIMIT},
      * isTurningReady()
      * is true and the robot can turn again. This number decreases by
@@ -534,7 +533,7 @@ public interface RobotController {
      * location is not on the map, if the target location is occupied, if the target
      * location is impassible, or if there are cooldown turns remaining.
      *
-     * @return true if it is possible to call <code>move</code> without an exception
+     * @return true if it is possible to call <code>moveForward</code> without an exception
      *
      * @battlecode.doc.costlymethod
      */

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

@@ -30,8 +30,6 @@
 
 import static battlecode.util.FlatHelpers.*;
 
-// TODO: new actions for this year's game and update all call sites
-
 /**
  * Writes a game to a flatbuffer, hooray.
  */

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

@@ -193,7 +193,6 @@ public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker match
         }
 
         this.sharedArray = new int[2][GameConstants.SHARED_ARRAY_SIZE];
-        this.persistentArray = new int[2][GameConstants.PERSISTENT_ARRAY_SIZE];
         // TODO make persistent array last between matches
 
         RobotInfo[] initialBodies = gm.getInitialBodies();

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

@@ -785,7 +785,7 @@ public void hitGround() {
         setActionCooldownTurns(this.actionCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
         setTurningCooldownTurns(this.turningCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
 
-        this.gameWorld.getMatchMaker().addStunAction(this.ID, GameConstants.HIT_TARGET_COOLDOWN);
+        this.gameWorld.getMatchMaker().addStunAction(this.ID, GameConstants.HIT_GROUND_COOLDOWN);
     }
 
     public void hitTarget(boolean isSecondMove) {
@@ -803,12 +803,12 @@ public void hitTarget(boolean isSecondMove) {
         if (this.health > 0){
             this.gameWorld.addRobot(this.location, this);
         }
-        setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
-        setActionCooldownTurns(this.actionCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
-        setTurningCooldownTurns(this.turningCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
+        setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
+        setActionCooldownTurns(this.actionCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
+        setTurningCooldownTurns(this.turningCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
         this.gameWorld.getMatchMaker().addDamageAction(this.ID, damage);
 
-        this.gameWorld.getMatchMaker().addStunAction(this.ID, GameConstants.HIT_GROUND_COOLDOWN);
+        this.gameWorld.getMatchMaker().addStunAction(this.ID, GameConstants.HIT_TARGET_COOLDOWN);
     }
 
     public void travelFlying(boolean isSecondMove) {

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

@@ -1025,6 +1025,9 @@ public void assertCanBecomeRatKing() throws GameActionException {
         if (this.gameWorld.getTeamInfo().getCheese(this.robot.getTeam()) < GameConstants.RAT_KING_UPGRADE_CHEESE_COST) {
             throw new GameActionException(CANT_DO_THAT, "Not enough cheese to upgrade to a rat king");
         }
+        if (this.gameWorld.getTeamInfo().getNumRatKings(this.robot.getTeam()) >= GameConstants.MAX_NUMBER_OF_RAT_KINGS){
+            throw new GameActionException(CANT_DO_THAT, "Cannot have more than " +GameConstants.MAX_NUMBER_OF_RAT_KINGS + "rat kings per team!" );
+        }
         int numAllyRats = 0;
         for (Direction d : Direction.allDirections()) {
             MapLocation curLoc = this.adjacentLocation(d);
@@ -1140,9 +1143,6 @@ public int readSharedArray(int index) throws GameActionException {
     public void writePersistentArray(int index, int value) throws GameActionException {
         if (!this.getType().isRatKingType()) {
             throw new GameActionException(CANT_DO_THAT, "Only rat kings can write to the persistent array!");
-        } else if (index < 0 || index >= GameConstants.PERSISTENT_ARRAY_SIZE) {
-            throw new GameActionException(CANT_DO_THAT,
-                    "Index " + index + " is out of bounds for the persistent array!");
         } else if (value < 0 || value > GameConstants.COMM_ARRAY_MAX_VALUE) {
             throw new GameActionException(CANT_DO_THAT,
                     "Value " + value + " is out of bounds for the persistent array!");