Merge branch 'master' into engine-release

Author: compiler64

engine/src/crossplay_python/battlecode26/crossplay.py

@@ -91,40 +91,41 @@ class CrossPlayMethod(Enum):
     RC_REMOVE_CAT_TRAP = 67
     RC_CAN_PICK_UP_CHEESE = 68
     RC_PICK_UP_CHEESE = 69
-    RC_CAN_ATTACK = 70
-    RC_CAN_ATTACK__LOC_INT = 71
-    RC_ATTACK = 72
-    RC_ATTACK__LOC_INT = 73
-    RC_SQUEAK = 74
-    RC_READ_SQUEAKS = 75
-    RC_WRITE_SHARED_ARRAY = 76
-    RC_READ_SHARED_ARRAY = 77
-    RC_CAN_TRANSFER_CHEESE = 78
-    RC_TRANSFER_CHEESE = 79
-    RC_THROW_RAT = 80
-    RC_CAN_THROW_RAT = 81
-    RC_DROP_RAT = 82
-    RC_CAN_DROP_RAT = 83
-    RC_CAN_CARRY_RAT = 84
-    RC_CARRY_RAT = 85
-    RC_DISINTEGRATE = 86
-    RC_RESIGN = 87
-    RC_SET_INDICATOR_STRING = 88
-    RC_SET_INDICATOR_DOT = 89
-    RC_SET_INDICATOR_LINE = 90
-    RC_SET_TIMELINE_MARKER = 91
-    RC_CAN_TURN__DIR = 92
-    ML_DISTANCE_SQUARED_TO = 93
-    ML_BOTTOM_LEFT_DISTANCE_SQUARED_TO = 94
-    ML_IS_WITHIN_DISTANCE_SQUARED = 95
-    ML_IS_WITHIN_DISTANCE_SQUARED__LOC_INT_DIR_DOUBLE = 96
-    ML_IS_WITHIN_DISTANCE_SQUARED__LOC_INT_DIR_DOUBLE_BOOLEAN = 97
-    ML_IS_ADJACENT_TO = 98
-    ML_DIRECTION_TO = 99
-    UT_GET_ALL_TYPE_LOCATIONS = 100
-    LOG = 101
-    THROW_GAME_ACTION_EXCEPTION = 102
-    THROW_EXCEPTION = 103
+    RC_PICK_UP_CHEESE__LOC_INT = 70
+    RC_CAN_ATTACK = 71
+    RC_CAN_ATTACK__LOC_INT = 72
+    RC_ATTACK = 73
+    RC_ATTACK__LOC_INT = 74
+    RC_SQUEAK = 75
+    RC_READ_SQUEAKS = 76
+    RC_WRITE_SHARED_ARRAY = 77
+    RC_READ_SHARED_ARRAY = 78
+    RC_CAN_TRANSFER_CHEESE = 79
+    RC_TRANSFER_CHEESE = 80
+    RC_THROW_RAT = 81
+    RC_CAN_THROW_RAT = 82
+    RC_DROP_RAT = 83
+    RC_CAN_DROP_RAT = 84
+    RC_CAN_CARRY_RAT = 85
+    RC_CARRY_RAT = 86
+    RC_DISINTEGRATE = 87
+    RC_RESIGN = 88
+    RC_SET_INDICATOR_STRING = 89
+    RC_SET_INDICATOR_DOT = 90
+    RC_SET_INDICATOR_LINE = 91
+    RC_SET_TIMELINE_MARKER = 92
+    RC_CAN_TURN__DIR = 93
+    ML_DISTANCE_SQUARED_TO = 94
+    ML_BOTTOM_LEFT_DISTANCE_SQUARED_TO = 95
+    ML_IS_WITHIN_DISTANCE_SQUARED = 96
+    ML_IS_WITHIN_DISTANCE_SQUARED__LOC_INT_DIR_DOUBLE = 97
+    ML_IS_WITHIN_DISTANCE_SQUARED__LOC_INT_DIR_DOUBLE_BOOLEAN = 98
+    ML_IS_ADJACENT_TO = 99
+    ML_DIRECTION_TO = 100
+    UT_GET_ALL_TYPE_LOCATIONS = 101
+    LOG = 102
+    THROW_GAME_ACTION_EXCEPTION = 103
+    THROW_EXCEPTION = 104
 
 
 class CrossPlayObjectType(Enum):

engine/src/crossplay_python/battlecode26/wrappers.py

@@ -243,8 +243,11 @@ def on_the_map(loc: MapLocation) -> bool:
         return _wait(_m.RC_ON_THE_MAP, [loc])
 
     @staticmethod
-    def pick_up_cheese(loc: MapLocation) -> None:
-        _wait(_m.RC_PICK_UP_CHEESE, [loc])
+    def pick_up_cheese(loc: MapLocation, amount: int = ...) -> None:
+        if amount is ...:
+            _wait(_m.RC_PICK_UP_CHEESE, [loc])
+        else:
+            _wait(_m.RC_PICK_UP_CHEESE__LOC_INT, [loc, amount])
 
     @staticmethod
     def place_cat_trap(loc: MapLocation) -> None:
@@ -341,11 +344,15 @@ def sense_robot_at_location(loc: MapLocation) -> RobotInfo:
     @staticmethod
     def set_indicator_dot(loc: MapLocation, r: int, g: int, b: int) -> None:
         _wait(_m.RC_SET_INDICATOR_DOT, [loc, r, g, b])
-    
+
     @staticmethod
     def set_indicator_string(text: str) -> None:
         _wait(_m.RC_SET_INDICATOR_STRING, [text])
-    
+
+    @staticmethod
+    def set_indicator_line(startLoc: MapLocation, endLoc: MapLocation, r: int, g: int, b: int) -> None:
+        _wait(_m.RC_SET_INDICATOR_LINE, [startLoc, endLoc, r, g, b])
+
     @staticmethod
     def set_timeline_marker(text: str, r: int, g: int, b: int) -> None:
         _wait(_m.RC_SET_TIMELINE_MARKER, [text, r, g, b])

engine/src/crossplay_python/python_docs.md

@@ -1,5 +1,5 @@
 # Battlecode 2026 Python Documentation
-v1.1.5
+v1.2.1
 
 ## Getting Started
 
@@ -228,7 +228,11 @@ class RobotController:
     def on_the_map(loc: MapLocation) -> bool:
         pass
 
-    def pick_up_cheese(loc: MapLocation) -> None:
+    def pick_up_cheese(loc: MapLocation, amount: int = ...) -> None:
+        """
+        Calling this function with only the first argument makes the rat
+        pick up the maximum amount of cheese possible.
+        """
         pass
 
     def place_cat_trap(loc: MapLocation) -> None:
@@ -296,6 +300,9 @@ class RobotController:
     def set_indicator_string(text: str) -> None:
         pass
 
+    def set_indicator_line(startLoc: MapLocation, endLoc: MapLocation, r: int, g: int, b: int) -> None:
+        pass
+
     def set_timeline_marker(text: str, r: int, g: int, b: int) -> None:
         pass
 
@@ -467,7 +474,7 @@ class TrapType(Enum):
     """
     RAT_TRAP = (30, 50, 20, 15, 25, 2)
     CAT_TRAP = (10, 100, 20, 10, 10, 2)
-    NONE = (0, 0, 0, 0, 0, 0, 0)
+    NONE = (0, 0, 0, 0, 0, 0)
 
     def ordinal(self) -> int:
         """

engine/src/crossplay_python/setup.py

@@ -26,5 +26,5 @@
       ],
       python_requires='>=3.12, <3.13',
       zip_safe=False,
-      version='1.1.5',
+      version='1.2.1',
 )

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

@@ -61,6 +61,9 @@ public class GameConstants {
     /** The amount of cheese each team starts with. */
     public static final int INITIAL_TEAM_CHEESE = 2500;
 
+    /** The number of rounds after a backstab after which cat traps are disabled. */
+    public static final int CAT_TRAP_ROUNDS_AFTER_BACKSTAB = 100;
+
     /** The maximum number of rat kings that a team can have. */
     public static final int MAX_NUMBER_OF_RAT_KINGS = 5;
 
@@ -219,7 +222,7 @@ public class GameConstants {
     public static final int DIG_DIRT_CHEESE_COST = 5;
 
     /** The cheese cost to place a tile of dirt */
-    public static final int PLACE_DIRT_CHEESE_COST = 3;
+    public static final int PLACE_DIRT_CHEESE_COST = 0;
 
 
     // *********************************

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/common/UnitType.java

@@ -3,7 +3,7 @@
 public enum UnitType {
     // health, size, visionConeRadiusSquared, visionConeAngle, actionCooldown, movementCooldown, bytecodeLimit
     BABY_RAT(100, 1, 20, 90, 10, 10, 17500),
-    RAT_KING(500, 3, 25, 360, 10, 40, 20000),
+    RAT_KING(600, 3, 25, 360, 10, 40, 20000),
     CAT(4000, 2, 17, 180, 30, 20, 17500);
 
     // amount of health robot initially starts with

engine/src/main/battlecode/crossplay/CrossPlay.java

@@ -510,6 +510,14 @@ private JsonNode processMessage(CrossPlayMessage message, boolean init) throws G
                 return nodeFactory.nullNode();
             }
 
+            case RC_PICK_UP_CHEESE__LOC_INT: {
+                checkParams(message, 2);
+                MapLocation loc = parseLocNode(message.params().get(0));
+                int cheeseAmount = message.params().get(1).asInt();
+                this.processingRobot.pickUpCheese(loc, cheeseAmount);
+                return nodeFactory.nullNode();
+            }
+
             case RC_PLACE_CAT_TRAP: {
                 checkParams(message, 1);
                 MapLocation loc = parseLocNode(message.params().get(0));

engine/src/main/battlecode/crossplay/CrossPlayMethod.java

@@ -76,6 +76,7 @@ public enum CrossPlayMethod {
     RC_REMOVE_CAT_TRAP,
     RC_CAN_PICK_UP_CHEESE,
     RC_PICK_UP_CHEESE,
+    RC_PICK_UP_CHEESE__LOC_INT,
     RC_CAN_ATTACK,
     RC_CAN_ATTACK__LOC_INT,
     RC_ATTACK,

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

@@ -23,7 +23,9 @@ public class GameWorld {
      * Whether we're running.
      */
     protected boolean running = true;
-    protected boolean isCooperation = true;
+    private boolean isCooperation = true;
+    private int backstabRound = -1;
+    private Team backstabber = null;
 
     protected final IDGenerator idGenerator;
     protected final GameStats gameStats;
@@ -401,6 +403,25 @@ public boolean isCooperation() {
         return this.isCooperation;
     }
 
+    public int getRoundsSinceBackstab() {
+        if (this.isCooperation) {
+            return 0;
+        } else {
+            return this.currentRound - this.backstabRound;
+        }
+    }
+
+    public boolean catTrapsAllowed(Team team) {
+        return this.isCooperation || (this.getRoundsSinceBackstab() <=
+            GameConstants.CAT_TRAP_ROUNDS_AFTER_BACKSTAB && this.backstabber != team);
+    }
+
+    public void backstab(Team backstabber) {
+        this.isCooperation = false;
+        this.backstabRound = this.currentRound;
+        this.backstabber = backstabber;
+    }
+
     public boolean getWall(MapLocation loc) {
         return this.walls[locationToIndex(loc)];
     }
@@ -601,13 +622,14 @@ public void triggerTrap(Trap trap, InternalRobot robot) {
         TrapType type = trap.getType();
 
         robot.setMovementCooldownTurns(type.stunTime);
+
         if (type == TrapType.CAT_TRAP && robot.getType().isCatType()) {
             this.teamInfo.addDamageToCats(trap.getTeam(), Math.min(type.damage, robot.getHealth()));
         }
 
         if (trap.getType() != TrapType.CAT_TRAP) {
             // initiate backstab
-            this.isCooperation = false;
+            backstab(robot.getTeam().opponent());
         }
 
         matchMaker.addTrapTriggerAction(trap.getId(), loc, triggeringTeam, type);
@@ -807,7 +829,7 @@ public boolean setWinnerIfKilledAllRatKings() {
      * @return whether all cats dead
      */
     public boolean setWinnerifAllCatsDead() {
-        if (this.getNumCats() == 0 && this.isCooperation) { // only end game if no more cats in cooperation mode
+        if (this.getNumCats() == 0 && this.isCooperation()) { // only end game if no more cats in cooperation mode
             // find out which team won via points
             if (setWinnerIfMorePoints())
                 return true;
@@ -1134,7 +1156,7 @@ public void destroyRobot(int id, boolean fromException, boolean fromDamage) {
         // check win
         if (robot.getType() == UnitType.RAT_KING && this.getTeamInfo().getNumRatKings(robot.getTeam()) == 0) {
             checkWin(robotTeam);
-        } else if (this.isCooperation && robot.getType() == UnitType.CAT && this.getNumCats() == 0) {
+        } else if (this.isCooperation() && robot.getType() == UnitType.CAT && this.getNumCats() == 0) {
             checkWin(robotTeam);
         }
     }