add python support for picking up arbitrary amount of cheese, and make cheese picked up by rat king be cheese transferred

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:

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:

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/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/RobotControllerImpl.java

@@ -473,7 +473,12 @@ public void pickUpCheese(MapLocation loc) throws GameActionException {
         this.gameWorld.addCheese(loc, -amountCheeseAvail);
         this.robot.addCheese(amountCheeseAvail);
         this.gameWorld.getMatchMaker().addCheesePickUpAction(loc);
-        this.gameWorld.getTeamInfo().addCheeseCollected(this.getTeam(), amountCheeseAvail);
+        this.gameWorld.getTeamInfo().addCheeseCollected(getTeam(), amountCheeseAvail);
+
+        if (getType() == UnitType.RAT_KING) {
+            this.gameWorld.getMatchMaker().addCheeseTransferAction(robot.getID(), amountCheeseAvail);
+            this.gameWorld.getTeamInfo().addCheeseTransferred(getTeam(), amountCheeseAvail);
+        }
     }
 
     @Override
@@ -488,7 +493,12 @@ public void pickUpCheese(MapLocation loc, int pickUpAmount) throws GameActionExc
         this.gameWorld.addCheese(loc, -pickUpAmount);
         this.robot.addCheese(pickUpAmount);
         this.gameWorld.getMatchMaker().addCheesePickUpAction(loc);
-        this.gameWorld.getTeamInfo().addCheeseCollected(this.getTeam(), pickUpAmount);
+        this.gameWorld.getTeamInfo().addCheeseCollected(getTeam(), pickUpAmount);
+
+        if (getType() == UnitType.RAT_KING) {
+            this.gameWorld.getMatchMaker().addCheeseTransferAction(robot.getID(), pickUpAmount);
+            this.gameWorld.getTeamInfo().addCheeseTransferred(getTeam(), pickUpAmount);
+        }
     }
 
     @Override