Merge pull request #88 from battlecode/master

hannah-y-gao · web-flow · commit 41886cbbcc0a · 2026-01-19T10:51:54.000-05:00
Fix cat damage counter
diff --git a/engine/src/main/battlecode/world/GameWorld.java b/engine/src/main/battlecode/world/GameWorld.java
@@ -602,7 +602,7 @@ public void triggerTrap(Trap trap, InternalRobot robot) {
 
         robot.setMovementCooldownTurns(type.stunTime);
         if (type == TrapType.CAT_TRAP && robot.getType().isCatType()) {
-            this.teamInfo.addDamageToCats(trap.getTeam(), type.damage);
+            this.teamInfo.addDamageToCats(trap.getTeam(), Math.min(type.damage, robot.getHealth()));
         }
 
         if (trap.getType() != TrapType.CAT_TRAP) {
diff --git a/engine/src/main/battlecode/world/InternalRobot.java b/engine/src/main/battlecode/world/InternalRobot.java
@@ -614,11 +614,12 @@ public void bite(MapLocation loc, int cheeseConsumed) {
 
                 this.gameWorld.getMatchMaker().addBiteAction(targetRobot.ID);
 
-                targetRobot.addHealth(-damage);
                 if (targetRobot.getType() == UnitType.CAT) {
-                    this.gameWorld.getTeamInfo().addDamageToCats(team, damage);
+                    this.gameWorld.getTeamInfo().addDamageToCats(team, Math.min(damage, targetRobot.getHealth()));
                 }
 
+                targetRobot.addHealth(-damage);
+
                 if (targetRobot.getType() != UnitType.CAT) {
                     this.gameWorld.isCooperation = false;
                 }
diff --git a/specs/specs.pdf b/specs/specs.pdf

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ public void triggerTrap(Trap trap, InternalRobot robot) {`
`602`	`602`
`603`	`603`	`robot.setMovementCooldownTurns(type.stunTime);`
`604`	`604`	`if (type == TrapType.CAT_TRAP && robot.getType().isCatType()) {`
`605`		`- this.teamInfo.addDamageToCats(trap.getTeam(), type.damage);`
	`605`	`+ this.teamInfo.addDamageToCats(trap.getTeam(), Math.min(type.damage, robot.getHealth()));`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`if (trap.getType() != TrapType.CAT_TRAP) {`
Original file line number	Diff line number	Diff line change
`@@ -614,11 +614,12 @@ public void bite(MapLocation loc, int cheeseConsumed) {`
`614`	`614`
`615`	`615`	`this.gameWorld.getMatchMaker().addBiteAction(targetRobot.ID);`
`616`	`616`
`617`		`- targetRobot.addHealth(-damage);`
`618`	`617`	`if (targetRobot.getType() == UnitType.CAT) {`
`619`		`- this.gameWorld.getTeamInfo().addDamageToCats(team, damage);`
	`618`	`+ this.gameWorld.getTeamInfo().addDamageToCats(team, Math.min(damage, targetRobot.getHealth()));`
`620`	`619`	`}`
`621`	`620`
	`621`	`+ targetRobot.addHealth(-damage);`
	`622`	`+`
`622`	`623`	`if (targetRobot.getType() != UnitType.CAT) {`
`623`	`624`	`this.gameWorld.isCooperation = false;`
`624`	`625`	`}`