Merge branch 'master' of github.com:battlecode/battlecode26 into trap_changes

Author: hannah-y-gao

README.md

@@ -4,7 +4,7 @@
 
 ## Note, Competitors
 This is the development repo! You most likely won't need anything in here; do not clone this.
-Instead, follow the instructions [here](https://play.battlecode.org/bc26java/quick_start) to get started.
+Instead, follow the instructions [here](https://play.battlecode.org/bc26/quick_start) to get started.
 
 ## Repository Structure
 

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

@@ -887,11 +887,11 @@ public boolean setWinnerIfMorePoints() {
 
         for (Team team : List.of(Team.A, Team.B)) {
 
-            float proportion_rat_kings = total_num_rat_kings != 0 ? teamInfo.getNumRatKings(team) / total_num_rat_kings : 0; 
-            float proportion_cheese_transferred = total_amount_cheese_transferred != 0 ? teamInfo.getCheeseTransferred(team) / total_amount_cheese_transferred : 0;
-            float proportion_cat_damage = total_amount_cat_damage != 0 ? teamInfo.getDamageToCats(team) / total_amount_cat_damage : 0;
+            float proportion_rat_kings = total_num_rat_kings != 0 ? (float)teamInfo.getNumRatKings(team) / total_num_rat_kings : 0.0f; 
+            float proportion_cheese_transferred = total_amount_cheese_transferred != 0 ? (float)teamInfo.getCheeseTransferred(team) / total_amount_cheese_transferred : 0.0f;
+            float proportion_cat_damage = total_amount_cat_damage != 0 ? (float)teamInfo.getDamageToCats(team) / total_amount_cat_damage : 0.0f;
 
-            int points = (int) (cat_weight * 100 * (proportion_cat_damage) + king_weight * 100 * proportion_rat_kings
+            int points = (int) (cat_weight * 100 * proportion_cat_damage + king_weight * 100 * proportion_rat_kings
                     + cheese_transfer_weight * 100 * proportion_cheese_transferred);
             this.teamInfo.addPoints(team, points);
             teamPoints.add(points);

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

@@ -1148,7 +1148,9 @@ public void becomeRatKing() throws GameActionException {
         this.gameWorld.getTeamInfo().addCheese(this.getTeam(), -GameConstants.RAT_KING_UPGRADE_CHEESE_COST);
         health = Math.min(health, UnitType.RAT_KING.health);
 
-        robot.becomeRatKing(health);
+        this.gameWorld.getTeamInfo().addCheese(this.getTeam(), robot.getCheese());
+        this.robot.addCheese(-this.robot.getCheese());
+        this.robot.becomeRatKing(health);
 
 
         for (Direction d : Direction.allDirections()) {