Merge branch 'main' into public-release

battlecode · Jan 29, 2025 · 5198e0c · 5198e0c
2 parents 5236720 + 5193e53
commit 5198e0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/battlecode25/engine/game/game.py b/battlecode25/engine/game/game.py
@@ -73,6 +73,8 @@ def run_turn(robot: Robot):
             self.team_info.add_execution_time(robot.team, run_time)
             if self.team_info.get_execution_time(robot.team) >= GameConstants.MAX_TEAM_EXECUTION_TIME:
                 self.resign(robot.team)
+            if robot.disintegrated:
+                self.destroy_robot(robot.id)
 
         if self.running:
             self.round += 1

diff --git a/battlecode25/engine/game/robot.py b/battlecode25/engine/game/robot.py
@@ -30,6 +30,7 @@ def __init__(self, game: Game, id, team: Team, type: UnitType, loc: MapLocation)
         self.movement_cooldown = GameConstants.COOLDOWN_LIMIT
         self.runner = None
         self.debug = False
+        self.disintegrated = False
         self.message_buffer = MessageBuffer(GameConstants.MESSAGE_ROUND_DURATION)
         self.sent_message_count = 0
         self.has_tower_area_attacked = False

diff --git a/battlecode25/engine/game/robot_controller.py b/battlecode25/engine/game/robot_controller.py
@@ -795,7 +795,8 @@ def resign(self) -> None:
         self.game.resign(self.robot.team)
 
     def disintegrate(self) -> None:
-        self.game.destroy_robot(self.robot.id)
+        self.robot.disintegrated = True
+        self.yield_turn()
 
     # CLOCK METHODS