Merge branch 'master' into engine-release

compiler64 · compiler64 · commit 7f5673a9235f · 2026-01-11T08:35:04.000-05:00
diff --git a/engine/src/main/battlecode/world/RobotControllerImpl.java b/engine/src/main/battlecode/world/RobotControllerImpl.java
@@ -966,7 +966,7 @@ private void assertCanAttackRat(MapLocation loc, int cheeseConsumed) throws Game
 
         MapLocation myLoc = this.getLocation();
 
-        if (!myLoc.isAdjacentTo(loc) || myType.isRatKingType() && myLoc.distanceSquaredTo(loc) > GameConstants.RAT_KING_ATTACK_DISTANCE_SQUARED) {
+        if (!myLoc.isAdjacentTo(loc) && !(myType.isRatKingType() && myLoc.distanceSquaredTo(loc) <= GameConstants.RAT_KING_ATTACK_DISTANCE_SQUARED)) {
             throw new GameActionException(CANT_DO_THAT, "Rats can only attack adjacent squares!");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@ private void assertCanAttackRat(MapLocation loc, int cheeseConsumed) throws Game`
`966`	`966`
`967`	`967`	`MapLocation myLoc = this.getLocation();`
`968`	`968`
`969`		`- if (!myLoc.isAdjacentTo(loc) \|\| myType.isRatKingType() && myLoc.distanceSquaredTo(loc) > GameConstants.RAT_KING_ATTACK_DISTANCE_SQUARED) {`
	`969`	`+ if (!myLoc.isAdjacentTo(loc) && !(myType.isRatKingType() && myLoc.distanceSquaredTo(loc) <= GameConstants.RAT_KING_ATTACK_DISTANCE_SQUARED)) {`
`970`	`970`	`throw new GameActionException(CANT_DO_THAT, "Rats can only attack adjacent squares!");`
`971`	`971`	`}`
`972`	`972`