Merge pull request #89 from battlecode/choose-pickup-cheese-amount

overloaded pickup cheese method

Author: compiler64

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

@@ -792,6 +792,18 @@ public interface RobotController {
      */
     void pickUpCheese(MapLocation loc) throws GameActionException;
 
+    /**
+     * Picks up the (non-negative) specified amount of cheese
+     * from the given location.
+     * 
+     * @param loc the location to pick up cheese from
+     * @param pickUpAmount the amount of cheese to pick up
+     * @throws GameActionException
+     * 
+     * @battlecode.doc.costlymethod
+     */
+    void pickUpCheese(MapLocation loc, int pickUpAmount) throws GameActionException;
+
     // ****************************
     // ***** ATTACK / HEAL ********
     // ****************************

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

@@ -476,6 +476,21 @@ public void pickUpCheese(MapLocation loc) throws GameActionException {
         this.gameWorld.getTeamInfo().addCheeseCollected(this.getTeam(), amountCheeseAvail);
     }
 
+    @Override
+    public void pickUpCheese(MapLocation loc, int pickUpAmount) throws GameActionException {
+        assertCanPickUpCheese(loc);
+        int amountCheeseAvail = this.gameWorld.getCheeseAmount(loc);
+
+        // bound pickup amount above by the amount of cheese available and below by 0
+        // (can't pick up negative amounts of cheese)
+        pickUpAmount = Math.max(Math.min(pickUpAmount, amountCheeseAvail), 0);
+
+        this.gameWorld.addCheese(loc, -pickUpAmount);
+        this.robot.addCheese(pickUpAmount);
+        this.gameWorld.getMatchMaker().addCheesePickUpAction(loc);
+        this.gameWorld.getTeamInfo().addCheeseCollected(this.getTeam(), pickUpAmount);
+    }
+
     @Override
     public boolean canSenseLocation(MapLocation loc) {
         try {