Merge branch 'engine-bugfix-2' of github.com:battlecode/battlecode26 into trap_changes

Author: hannah-y-gao

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

@@ -130,7 +130,7 @@ public interface RobotController {
      *
      * @battlecode.doc.costlymethod
      */
-    public int getGlobalCheese();
+    int getGlobalCheese();
 
     /**
      * Returns the amount of cheese the robot has access to.
@@ -139,7 +139,7 @@ public interface RobotController {
      *
      * @battlecode.doc.costlymethod
      */
-    public int getAllCheese();
+    int getAllCheese();
 
     /**
      * Returns the amount of dirt that this robot's team has.
@@ -1035,4 +1035,4 @@ void setIndicatorLine(MapLocation startLoc, MapLocation endLoc, int red, int gre
     void setTimelineMarker(String label, int red, int green, int blue);
 }
 // TODO: update bytecode costs, particularly for new methods + methods that got
-// renamed from last year
+// renamed from last year

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

@@ -74,11 +74,11 @@ public MapLocation[] getAllTypeLocations(MapLocation center) {
         return locs;
     }
 
-    UnitType(int health, int size, int visionConeRadius, int visionConeAngle, int actionCooldown,
+    UnitType(int health, int size, int visionConeRadiusSquared, int visionConeAngle, int actionCooldown,
             int movementCooldown, int bytecodeLimit) {
         this.health = health;
         this.size = size;
-        this.visionConeRadiusSquared = visionConeRadius;
+        this.visionConeRadiusSquared = visionConeRadiusSquared;
         this.visionConeAngle = visionConeAngle;
         this.actionCooldown = actionCooldown;
         this.movementCooldown = movementCooldown;

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

@@ -239,6 +239,7 @@ private void assertCanPlaceDirt(MapLocation loc) throws GameActionException {
         assertIsRobotType(this.robot.getType());
         // Use unit action radius as the allowed range for the action
         assertCanActLocation(loc, GameConstants.BUILD_DISTANCE_SQUARED);
+        assertIsActionReady();
 
         // state checks :
         if (this.gameWorld.getTeamInfo().getDirt(this.robot.getTeam()) <= 0)
@@ -259,6 +260,7 @@ private void assertCanRemoveDirt(MapLocation loc) throws GameActionException {
         assertIsRobotType(this.robot.getType());
         assertIsActionReady();
         assertCanActLocation(loc, GameConstants.BUILD_DISTANCE_SQUARED);
+        assertIsActionReady();
 
         if ((this.robot.getType().isBabyRatType()
                 || this.robot.getType().isRatKingType()) && (this.getAllCheese() < GameConstants.DIG_DIRT_CHEESE_COST))
@@ -314,6 +316,7 @@ private void assertCanPlaceTrap(MapLocation loc, TrapType trapType) throws GameA
         assertIsRobotType(this.robot.getType());
         assertIsActionReady();
         assertCanActLocation(loc, GameConstants.BUILD_DISTANCE_SQUARED);
+        assertIsActionReady();
 
         if (trapType == TrapType.CAT_TRAP && !this.gameWorld.isCooperation)
             throw new GameActionException(CANT_DO_THAT, "Can't place new cat traps in backstabbing mode!");
@@ -875,9 +878,11 @@ private void assertCanBuildRat(MapLocation loc) throws GameActionException {
         assertNotNull(loc);
         assertCanActLocation(loc, GameConstants.BUILD_ROBOT_RADIUS_SQUARED);
         assertIsActionReady();
+
         if (!this.robot.getType().isRatKingType()) {
             throw new GameActionException(CANT_DO_THAT, "Only rat kings can spawn other rats!");
         }
+
         int cost = getCurrentRatCost();
 
         if (this.gameWorld.getTeamInfo().getCheese(this.robot.getTeam()) < cost) {
@@ -906,11 +911,11 @@ public boolean canBuildRat(MapLocation loc) {
     @Override
     public void buildRat(MapLocation loc) throws GameActionException {
         assertCanBuildRat(loc);
+        int cost = getCurrentRatCost();
+        this.robot.addCheese(-cost);
         this.robot.addActionCooldownTurns(GameConstants.BUILD_ROBOT_COOLDOWN);
         this.gameWorld.spawnRobot(UnitType.BABY_RAT, loc, this.getDirection(), this.robot.getChirality(),
                 this.robot.getTeam());
-        int cost = getCurrentRatCost();
-        this.robot.addCheese(-cost);
         InternalRobot robotSpawned = this.gameWorld.getRobot(loc);
         this.gameWorld.getMatchMaker().addSpawnAction(robotSpawned.getID(), loc, this.robot.getDirection(),
                 this.robot.getChirality(), getTeam(), UnitType.BABY_RAT);