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

Author: ColemanDuPlessie

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
 

client/src/playback/Actions.ts

@@ -195,13 +195,13 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             if (target.beingCarried) {
                 // drop the target
                 // const carrier = round.bodies.getById(target.carrierRobot!)
-                if(target.carrierRobot !== undefined) {
+                if(target.carrierRobot !== undefined && round.bodies.hasId(target.carrierRobot)) {
                     const carrier = round.bodies.getById(target.carrierRobot)
                     carrier.carriedRobot = undefined
                 }
-                target.size = 1
                 target.beingCarried = false
                 target.carrierRobot = undefined
+                target.size = 1
             } else {
                 // pick up the target
                 src.carriedRobot = target.id
@@ -210,8 +210,8 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
                 target.beingCarried = true
 
                 target.lastPos = { ...target.pos }
-                // target.pos = { x: src.pos.x + RatNapAction.OFFSET.x, y: src.pos.y + RatNapAction.OFFSET.y }
                 target.size = 0.6
+                // target.pos = { x: src.pos.x + RatNapAction.OFFSET.x, y: src.pos.y + RatNapAction.OFFSET.y }  
             }
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
@@ -576,7 +576,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
                 carrier.carriedRobot = undefined
             }
             body.carrierRobot = undefined
-            body.beingCarried = false
             body.size = 1
             // body.pos = { ...endLoc }
         }

client/src/playback/Bodies.ts

@@ -432,9 +432,6 @@ export class Body {
     }
 
     public draw(match: Match, ctx: CanvasRenderingContext2D): void {
-        const OFFSET = { x: .35, y: 0 } // to center the rat on the tile
-        const ratnapped = this.robotType === schema.RobotType.RAT && this.beingCarried
-
         const pos = this.getInterpolatedCoords(match)
 
         const renderCoords = renderUtils.getRenderCoords(pos.x, pos.y, match.currentRound.map.staticMap.dimension)

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

@@ -133,6 +133,13 @@ public class GameConstants {
     /** The maximum distance from a robot for building traps or dirt */
     public static final int BUILD_DISTANCE_SQUARED = 2;
 
+    /**
+     * The maximum distance squared a rat king can attack, measured from the king's center.
+     * All rats (including rat kings) can only attack adjacent squares,
+     * and the rat king is 3x3, so this is 8.
+     */
+    public static final int RAT_KING_ATTACK_DISTANCE_SQUARED = 8;
+
     /** The maximum number of rounds a message will exist for */
     public static final int MESSAGE_ROUND_DURATION = 5;
 

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

@@ -168,7 +168,7 @@ public final boolean isWithinDistanceSquared(MapLocation location, int distanceS
      * @param facingDir       the direction robot is facing (if Center, ignores
      *                        theta argument and uses a 360 degree vision cone)
      * @param theta           the angle of the vision cone in degrees
-     * @param useTopRight     true if the top right coordinate of this location (not
+     * @param useBottomLeft     true if the bottom left coordinate of this location (not
      *                        the "location" argument) should be used (for 2x2
      *                        robots)
      * @return true if the given location is within distanceSquared to this one;
@@ -177,7 +177,7 @@ public final boolean isWithinDistanceSquared(MapLocation location, int distanceS
      * @battlecode.doc.costlymethod
      */
     public final boolean isWithinDistanceSquared(MapLocation location, int distanceSquared, Direction facingDir,
-            double theta, boolean useTopRight) {
+            double theta, boolean useBottomLeft) {
 
         // prevent division by 0 error
         if (this.equals(location)) {
@@ -186,12 +186,12 @@ public final boolean isWithinDistanceSquared(MapLocation location, int distanceS
 
         double adjustment = 1e-3;
 
-        boolean isValidDistance = useTopRight ? this.bottomLeftDistanceSquaredTo(location) <= distanceSquared
+        boolean isValidDistance = useBottomLeft ? this.bottomLeftDistanceSquaredTo(location) <= distanceSquared
                 : this.distanceSquaredTo(location) <= distanceSquared;
 
         // calculate angle (degrees) between facingDir and direction to location
-        double dx = location.x - (useTopRight ? (this.x + 0.5) : this.x);
-        double dy = location.y - (useTopRight ? (this.y + 0.5) : this.y);
+        double dx = location.x - (useBottomLeft ? (this.x + 0.5) : this.x);
+        double dy = location.y - (useBottomLeft ? (this.y + 0.5) : this.y);
 
         boolean isValidAngle;
         if (facingDir == Direction.CENTER) { //

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

@@ -44,7 +44,8 @@ public class GameWorld {
     private final TeamInfo teamInfo;
     private final ObjectInfo objectInfo;
     private boolean hasRunCheeseMinesThisRound; // whether we've run the cheese mines yet
-
+    private HashSet<Integer> hasTraveledIDs; // ids of robots that have traveled this ronud
+    
     private int[] currentNumberUnits = { 0, 0 };
 
     private Map<Team, ProfilerCollection> profilerCollections;
@@ -172,7 +173,8 @@ public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker match
 
         // Write match header at beginning of match
         this.matchMaker.makeMatchHeader(this.gameMap);
-
+        
+        this. hasTraveledIDs = new HashSet<>();
         this.allCheeseMinesByLoc = gm.getCheeseMineArray();
         this.cheeseMines = new ArrayList<CheeseMine>();
         this.cheeseMineLocs = new CheeseMine[numSquares];
@@ -746,6 +748,14 @@ public MapLocation[] getAllLocationsWithinConeRadiusSquaredWithoutMap(MapLocatio
         return returnLocations.toArray(new MapLocation[returnLocations.size()]);
     }
 
+
+    public void addHasTraveledRobot(int id){
+        this.hasTraveledIDs.add(id);
+    }
+    public boolean getHasTraveledRobot(int id){
+        return this.hasTraveledIDs.contains(id);
+    }
+
     /**
      * @return all of the locations on the grid
      */
@@ -877,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);
@@ -958,6 +968,7 @@ public void processEndOfRound() {
             this.matchMaker.addTeamInfo(t, this.teamInfo.getCheeseTransferred(t), this.teamInfo.getDamageToCats(t), this.teamInfo.getNumRatKings(t), this.teamInfo.getNumBabyRats(t), this.teamInfo.getDirt(t), this.getTrapCount(TrapType.RAT_TRAP, t), this.getTrapCount(TrapType.CAT_TRAP, t));
         }
         this.teamInfo.processEndOfRound();
+        hasTraveledIDs.clear();
 
         this.getMatchMaker().endRound();
 

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

@@ -588,11 +588,12 @@ public void bite(MapLocation loc, int cheeseConsumed) {
                     damage += (int) Math.ceil(Math.sqrt(cheeseConsumed));
                 }
 
+                this.gameWorld.getMatchMaker().addBiteAction(targetRobot.ID);
+
                 targetRobot.addHealth(-damage);
                 if (targetRobot.getType() == UnitType.CAT) {
                     this.gameWorld.getTeamInfo().addDamageToCats(team, damage);
                 }
-                this.gameWorld.getMatchMaker().addBiteAction(this.getID());
 
                 if (targetRobot.getType() != UnitType.CAT) {
                     this.gameWorld.isCooperation = false;
@@ -616,7 +617,6 @@ public void scratch(MapLocation loc) {
 
     public void grabRobot(MapLocation loc) {
         this.robotBeingCarried = this.gameWorld.getRobot(loc);
-        System.out.println("Robot " + this.ID + " grabbed robot " + this.robotBeingCarried);
         this.robotBeingCarried.getGrabbed(this); // Notify the grabbed robot that it has been picked up
         this.gameWorld.getMatchMaker().addRatNapAction(this.robotBeingCarried.getID());
 
@@ -673,7 +673,12 @@ private void getGrabbed(InternalRobot grabber) {
     }
 
     public void throwRobot() {
+        this.gameWorld.getMatchMaker().endTurn(this.ID, this.health, this.cheeseAmount, this.movementCooldownTurns,
+                this.actionCooldownTurns, this.turningCooldownTurns, this.bytecodesUsed, this.location, this.dir, this.gameWorld.isCooperation);
         this.robotBeingCarried.getThrown(this.dir);
+        this.gameWorld.getMatchMaker().endTurn(this.robotBeingCarried.ID, this.robotBeingCarried.health, this.robotBeingCarried.cheeseAmount, this.robotBeingCarried.movementCooldownTurns,
+                this.robotBeingCarried.actionCooldownTurns, this.robotBeingCarried.turningCooldownTurns, this.robotBeingCarried.bytecodesUsed, this.robotBeingCarried.location, this.robotBeingCarried.dir, this.gameWorld.isCooperation);
+        this.gameWorld.addHasTraveledRobot(this.robotBeingCarried.getID());
         this.gameWorld.getMatchMaker().addThrowAction(this.robotBeingCarried.getID(),
                 this.getLocation().add(this.dir));
         this.robotBeingCarried = null;
@@ -687,7 +692,6 @@ private void getThrown(Direction dir) {
         this.remainingThrowDuration = 4;
 
         this.setInternalLocationOnly(this.getLocation());
-        this.gameWorld.removeRobot(this.getLocation());
 
         this.travelFlying(true);
         this.travelFlying(false);
@@ -708,8 +712,10 @@ public void getDropped(MapLocation loc) {
 
         this.gameWorld.getMatchMaker().addRatNapAction(this.getID());
 
-        if (this.getHealth() > 0)
+        if (this.getHealth() > 0){
             this.gameWorld.addRobot(this.getLocation(), this);
+            this.controller.processTrapsAtLocation(this.location);
+        }
         else
             this.gameWorld.destroyRobot(this.getID());
     }
@@ -727,6 +733,10 @@ public void hitGround() {
 
         if (this.health > 0) {
             this.gameWorld.addRobot(this.location, this);
+            this.controller.processTrapsAtLocation(this.location);
+        }
+        else{
+            this.gameWorld.destroyRobot(this.getID());
         }
 
         setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.HIT_GROUND_COOLDOWN);
@@ -748,9 +758,14 @@ public void hitTarget(boolean isSecondMove) {
         this.remainingThrowDuration = 0;
 
         this.addHealth(-damage);
-        if (this.health > 0){
+        if (this.health > 0) {
             this.gameWorld.addRobot(this.location, this);
+            this.controller.processTrapsAtLocation(this.location);
         }
+        else{
+            this.gameWorld.destroyRobot(this.getID());
+        }
+
         setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
         setActionCooldownTurns(this.actionCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
         setTurningCooldownTurns(this.turningCooldownTurns + GameConstants.HIT_TARGET_COOLDOWN);
@@ -776,7 +791,6 @@ public void travelFlying(boolean isSecondMove) {
             this.addHealth(-this.getHealth()); // rat dies :(
             // put cat to sleep
             this.gameWorld.getRobot(newLoc).sleepTimeRemaining = GameConstants.CAT_SLEEP_TIME;
-            this.gameWorld.getMatchMaker().addCatFeedAction(this.getID());
             return;
         } else if (this.gameWorld.getRobot(newLoc) != null || !this.gameWorld.isPassable(newLoc)) {
             this.hitTarget(isSecondMove);
@@ -1083,8 +1097,10 @@ public void processBeginningOfTurn() {
             if (this.remainingThrowDuration == 0) { // max throw time reached
                 this.hitGround();
             } else {
-                this.travelFlying(false);
-                this.travelFlying(true); // This will call hitTarget or hitGround if we hit something
+                if (!this.gameWorld.getHasTraveledRobot(this.ID)){
+                    this.travelFlying(false);
+                    this.travelFlying(true); // This will call hitTarget or hitGround if we hit something
+                }
             }
         }
 
@@ -1113,13 +1129,11 @@ public void processEndOfTurn() {
         }
 
         // cat algo
-
-        if (this.type == UnitType.CAT) {
-            if (this.sleepTimeRemaining > 0) {
-                this.sleepTimeRemaining -= 1;
-                return;
-            }
-
+        if (this.type == UnitType.CAT && this.sleepTimeRemaining > 0){
+            this.gameWorld.getMatchMaker().addCatFeedAction(this.getID());
+            this.sleepTimeRemaining -= 1;
+        }
+        else if (this.type == UnitType.CAT) {
             int[] pounceTraj = null;
 
             switch (this.catState) {
@@ -1196,11 +1210,9 @@ public void processEndOfTurn() {
                         if (isStuck){
                             if (this.controller.canTurn()) {
                                 try {
-                                    Direction newDirection = this.dir.rotateRight();
-                                    if (this.chirality == 0) this.controller.turn(newDirection);
-                                    else this.controller.turn(this.gameWorld.flipDirBySymmetry(newDirection));
-                                } catch (GameActionException e) {
-                                }
+                                    if (this.chirality == 0) this.controller.turn(this.dir.rotateRight());
+                                    else this.controller.turn(this.dir.rotateLeft());
+                                } catch (GameActionException e) {}
                             }
                         }
                     }
@@ -1225,8 +1237,7 @@ public void processEndOfTurn() {
                     } else if (this.controller.canMove(this.dir)) {
                         try {
                             this.controller.move(this.dir);
-                        } catch (GameActionException e) {
-                        }
+                        } catch (GameActionException e) {}
                     } else {
                         boolean isStuck = true;
                         for (MapLocation partLoc : this.getAllPartLocations()) {
@@ -1253,9 +1264,8 @@ else if (this.controller.canAttack(nextLoc)) {
                             if (isStuck){
                                 if (this.controller.canTurn()) {
                                     try {
-                                        Direction newDirection = this.dir.rotateRight();
-                                        if (this.chirality == 0) this.controller.turn(newDirection);
-                                        else this.controller.turn(this.gameWorld.flipDirBySymmetry(newDirection));
+                                        if (this.chirality == 0) this.controller.turn(this.dir.rotateRight());
+                                        else this.controller.turn(this.dir.rotateLeft());
                                     } catch (GameActionException e) {
                                         continue;
                                     }
@@ -1353,13 +1363,10 @@ else if (this.controller.canAttack(nextLoc)) {
                                 } catch (GameActionException e) {
                                     continue;
                                 }
-
-                            }
-                            else if (this.controller.canAttack(nextLoc)) {
+                            } else if (this.controller.canAttack(nextLoc)) {
                                 try {
-                                    Direction newDirection = this.dir.rotateRight();
-                                    if (this.chirality == 0) this.controller.turn(newDirection);
-                                    else this.controller.turn(this.gameWorld.flipDirBySymmetry(newDirection));
+                                    if (this.chirality == 0) this.controller.turn(this.dir.rotateRight());
+                                    else this.controller.turn(this.dir.rotateLeft());
                                 } catch (GameActionException e) {
                                     continue;
                                 }
@@ -1368,11 +1375,9 @@ else if (this.controller.canAttack(nextLoc)) {
 
                         if (isStuck){
                             try {
-                                Direction newDirection = this.dir.rotateRight();
-                                if (this.chirality == 0) this.controller.turn(newDirection);
-                                else this.controller.turn(this.gameWorld.flipDirBySymmetry(newDirection));
-                            } catch (GameActionException e) {
-                            }
+                                if (this.chirality == 0) this.controller.turn(this.dir.rotateRight());
+                                else this.controller.turn(this.dir.rotateLeft());
+                            } catch (GameActionException e) {}
                         }
                     }
                     break;