Merge branch 'engine-release' of github.com:battlecode/battlecode26 into engine-release

Author: hannah-y-gao

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

@@ -743,7 +743,7 @@ public void hitGround() {
 
     public void hitTarget(boolean isSecondMove) {
         int damage = GameConstants.THROW_DAMAGE
-                - GameConstants.THROW_DAMAGE_PER_TILE * (2 * this.remainingThrowDuration + (isSecondMove ? 0 : 1));
+                + GameConstants.THROW_DAMAGE_PER_TILE * (2 * this.remainingThrowDuration + (isSecondMove ? 0 : 1));
 
         if (this.gameWorld.getRobot(this.getLocation().add(this.thrownDir)) != null) {
             InternalRobot robot = this.gameWorld.getRobot(this.getLocation().add(this.thrownDir));

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

@@ -829,10 +829,16 @@ public void move(Direction d) throws GameActionException {
                 // kill this rat
                 crushedRobot.addHealth(-crushedRobot.getHealth());
             }
-            processTrapsAtLocation(newLoc);
+            // processTrapsAtLocation(newLoc);
         }
 
         this.robot.translateLocation(d.dx, d.dy);
+
+        for (int i = 0; i < curLocs.length; i++) {
+            MapLocation newLoc = curLocs[i].add(d);
+            processTrapsAtLocation(newLoc);
+        }
+
         this.robot.addMovementCooldownTurns(d);
 
     }
@@ -944,6 +950,10 @@ private void assertCanAttackRat(MapLocation loc, int cheeseConsumed) throws Game
         assertIsActionReady();
         // Attack is limited to vision radius
         assertCanActLocation(loc, this.getType().getVisionRadiusSquared());
+        if (!this.getLocation().isAdjacentTo(loc)) {
+            throw new GameActionException(CANT_DO_THAT, "Rats can only attack adjacent squares!");
+        }
+
         if (!this.gameWorld.isPassable(loc))
             throw new GameActionException(CANT_DO_THAT, "Rats cannot attack squares with walls or dirt on them!");