Merge pull request #58 from battlecode/engine-bugfix-1

Bug fixes and naming convention fixes for engine

Author: compiler64

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

@@ -822,11 +822,12 @@ public interface RobotController {
      * for increasing bite strength
      *
      * @param loc the target location to attack
+     * @param cheeseAmount amount of cheese to spend on the attack
      * @throws GameActionException if conditions for attacking are not satisfied
      *
      * @battlecode.doc.costlymethod
      */
-    void attack(MapLocation loc, int cheese) throws GameActionException;
+    void attack(MapLocation loc, int cheeseAmount) throws GameActionException;
 
     // ***********************************
     // ****** COMMUNICATION METHODS ******

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

@@ -425,12 +425,12 @@ public void setIndicatorString(String string) {
     }
 
     /**
-     * Sets the location of the robot.
+     * Sets the location of the robot by translating it.
      * 
      * @param dx # amount to translate in x direction
      * @param dy # amount to translate in y direction
      */
-    public void setLocation(int dx, int dy) {
+    public void translateLocation(int dx, int dy) {
         MapLocation[] beforeLocs = this.getAllPartLocations();
         for (MapLocation partLoc : beforeLocs) {
             this.gameWorld.removeRobot(partLoc);
@@ -777,8 +777,9 @@ public void hitGround() {
 
         this.gameWorld.getMatchMaker().addDamageAction(this.ID, damage);
 
-        if (this.health > 0)
+        if (this.health > 0) {
             this.gameWorld.addRobot(this.location, this);
+        }
 
         setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
         setActionCooldownTurns(this.actionCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
@@ -815,10 +816,6 @@ public void travelFlying(boolean isSecondMove) {
             return;
         }
 
-        System.out
-                .println("Robot flyingggg: " + this.ID + " " + this.thrownDir + " " + this.health + " " + isSecondMove);
-        // use the internal location
-
         MapLocation newLoc = this.location.add(this.thrownDir);
 
         if (!this.gameWorld.getGameMap().onTheMap(newLoc)) {
@@ -837,8 +834,7 @@ public void travelFlying(boolean isSecondMove) {
             return;
         }
 
-        MapLocation nextLocation = new MapLocation(this.thrownDir.dx, this.thrownDir.dy);
-        this.setInternalLocationOnly(nextLocation);
+        this.setInternalLocationOnly(newLoc);
     }
 
     /**
@@ -944,23 +940,30 @@ public void pounce(int[] delta) {
         int dy = delta[1];
 
         MapLocation[] oldLocs = this.getAllPartLocations();
+
         for (MapLocation partLoc : oldLocs) {
             // shift location by dx, dy
             MapLocation translatedLoc = partLoc.translate(dx, dy);
             InternalRobot crushedRobot = this.gameWorld.getRobot(translatedLoc);
+
             if (crushedRobot != null && (crushedRobot.getID() != this.ID)) {
                 // destroy robot
                 crushedRobot.addHealth(-crushedRobot.getHealth());
             }
         }
 
         // actually translate the cat
-        this.setLocation(dx, dy);
+        this.translateLocation(dx, dy);
+
+        MapLocation[] newLocs = this.getAllPartLocations();
+
+        for (MapLocation partLoc : newLocs) {
+            this.controller.processTrapsAtLocation(partLoc);
+        }
 
         // incur double the movement cooldown
         this.addMovementCooldownTurns(this.dir);
         this.addMovementCooldownTurns(this.dir);
-
     }
 
     public MapLocation getCatCornerByChirality(){

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

@@ -797,6 +797,7 @@ public void processTrapsAtLocation(MapLocation loc) {
             if (trap.getTeam() == this.robot.getTeam() || wrongTrapType) {
                 continue;
             }
+            
             this.gameWorld.triggerTrap(trap, robot);
 
         }
@@ -820,7 +821,7 @@ public void move(Direction d) throws GameActionException {
             processTrapsAtLocation(newLoc);
         }
 
-        this.robot.setLocation(d.dx, d.dy);
+        this.robot.translateLocation(d.dx, d.dy);
         this.robot.addMovementCooldownTurns(d);
 
     }
@@ -934,11 +935,11 @@ private void assertCanAttackRat(MapLocation loc, int cheeseConsumed) throws Game
             throw new GameActionException(CANT_DO_THAT, "Rats cannot attack squares with walls or dirt on them!");
 
         if (this.gameWorld.getTeamInfo().getCheese(this.getTeam()) + this.getAllCheese() < cheeseConsumed) {
-            throw new RuntimeException("Not enough cheese to bite!");
+            throw new GameActionException(CANT_DO_THAT, "Not enough cheese to bite!");
         }
 
         if (this.getType() == UnitType.CAT) {
-            throw new RuntimeException("Unit must be a baby rat or rat king to bite!");
+            throw new GameActionException(CANT_DO_THAT, "Unit must be a baby rat or rat king to bite!");
         }
     }
 
@@ -980,7 +981,7 @@ public boolean canAttack(MapLocation loc) {
     @Override
     public boolean canAttack(MapLocation loc, int cheeseConsumed) {
         try {
-            assertCanAttack(loc, 0);
+            assertCanAttack(loc, cheeseConsumed);
             return true;
         } catch (GameActionException e) {
             return false;
@@ -1203,10 +1204,10 @@ public void assertCanThrowRat(Direction dir) throws GameActionException {
         if (!this.robot.isCarryingRobot())
             throw new GameActionException(CANT_DO_THAT, "This rat is not carrying any rat!");
         if (!this.gameWorld.getGameMap().onTheMap(nextLoc)) {
-            throw new RuntimeException("Cannot throw outside of map!");
+            throw new GameActionException(CANT_DO_THAT, "Cannot throw outside of map!");
         }
         if (!this.gameWorld.isPassable(nextLoc) || (this.gameWorld.getRobot(nextLoc) != null)) {
-            throw new RuntimeException("There must be at least 1 empty space in front the throwing rat!");
+            throw new GameActionException(CANT_DO_THAT, "There must be at least 1 empty space in front the throwing rat!");
         }
     }
 
@@ -1219,10 +1220,10 @@ public void assertCanDropRat(Direction dir) throws GameActionException {
         if (!this.robot.isCarryingRobot())
             throw new GameActionException(CANT_DO_THAT, "This rat is not carrying any rat!");
         if (!this.gameWorld.getGameMap().onTheMap(nextLoc)) {
-            throw new RuntimeException("Cannot drop outside of map!");
+            throw new GameActionException(CANT_DO_THAT, "Cannot drop outside of map!");
         }
         if (!this.gameWorld.isPassable(nextLoc) || (this.gameWorld.getRobot(nextLoc) != null)) {
-            throw new RuntimeException("Can only drop rats into empty spaces!");
+            throw new GameActionException(CANT_DO_THAT, "Can only drop rats into empty spaces!");
         }
     }
 
@@ -1263,9 +1264,9 @@ public void assertCanCarryRat(MapLocation loc) throws GameActionException {
         assertIsActionReady();
 
         if (!this.robot.getType().isThrowingType()) {
-            throw new RuntimeException("Unit must be a rat to grab other rats");
+            throw new GameActionException(CANT_DO_THAT, "Unit must be a rat to grab other rats");
         } else if (this.robot.isCarryingRobot()) {
-            throw new RuntimeException("Already carrying a rat");
+            throw new GameActionException(CANT_DO_THAT, "Already carrying a rat");
         } 
         // Must be a rat-type
         if (!this.robot.getType().isBabyRatType()) {