Merge branch 'schema' of github.com:battlecode/battlecode26 into engine-release

Author: hannah-y-gao

client/icons/icon.icns

@@ -94,11 +94,11 @@ export const GamePage: React.FC<Props> = React.memo((props) => {
     }
 
     const isGameModeCooperation =
-        !!round &&
+        (round ?? true) &&
         !!game &&
         (() => {
-            const t0 = round.stat.getTeamStat(game.teams[0])?.gameModeCooperation ?? true
-            const t1 = round.stat.getTeamStat(game.teams[1])?.gameModeCooperation ?? true
+            const t0 = round?.stat.getTeamStat(game.teams[0])?.gameModeCooperation ?? true
+            const t1 = round?.stat.getTeamStat(game.teams[1])?.gameModeCooperation ?? true
             return t0 && t1
         })()
 

client/icons/icon.ico

@@ -72,6 +72,8 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
         ratKingPercent = teamStat.ratKingPercent
     }
 
+    const formatPercent = (val: number) => (val * 100).toFixed(1).toString() + '%'
+
     const teamName = TEAM_COLOR_NAMES[teamIdx].toLowerCase()
     return (
         <div className="flex flex-col items-center">
@@ -80,15 +82,15 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
                     <div className="w-[30px] h-[30px] mr-5">
                         <img style={{ transform: 'scale(1.5)' }} src={imageSource(`icons/cheese_64x64.png`)} />
                     </div>
-                    <div>Count:</div>
+                    <div>Amount:</div>
                     <div className="ml-1">
                         <b>{cheeseAmount}</b>
                     </div>
                 </div>
                 <div className="flex items-center w-[145px]">
                     <div>Percent:</div>
                     <div className="ml-1">
-                        <b>{cheesePercent}</b>
+                        <b>{formatPercent(cheesePercent)}</b>
                     </div>
                 </div>
             </div>
@@ -97,15 +99,15 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
                     <div className="w-[30px] h-[30px] mr-5">
                         <img style={{ transform: 'scale(1.5)' }} src={imageSource(`robots/cat/cat_0.png`)} />
                     </div>
-                    <div>Count:</div>
+                    <div>Damage:</div>
                     <div className="ml-1">
                         <b>{catDamageAmount}</b>
                     </div>
                 </div>
                 <div className="flex items-center w-[145px]">
                     <div>Percent:</div>
                     <div className="ml-1">
-                        <b>{catDamagePercent}</b>
+                        <b>{formatPercent(catDamagePercent)}</b>
                     </div>
                 </div>
             </div>
@@ -125,7 +127,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
                 <div className="flex items-center w-[145px]">
                     <div>Percent:</div>
                     <div className="ml-1">
-                        <b>{ratKingPercent}</b>
+                        <b>{formatPercent(ratKingPercent)}</b>
                     </div>
                 </div>
             </div>

client/icons/icon.png

@@ -188,6 +188,9 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             // move the target onto the source adjust target's size using scale factor
             const src = round.bodies.getById(this.robotId)
             const target = round.bodies.getById(this.actionData.id()) // rat getting napped
+            
+            target.carriedRobot = undefined
+            src.carriedRobot = target.id
 
             target.lastPos = { ...target.pos }
             target.pos = { x: src.pos.x + RatNapAction.OFFSET.x, y: src.pos.y + RatNapAction.OFFSET.y }

client/src/components/sidebar/game/game.tsx

@@ -363,6 +363,7 @@ export class Body {
     public moveCooldown: number = 0
     public actionCooldown: number = 0
     public turningCooldown: number = 0
+    public carriedRobot: number | undefined = undefined  // id of carried robot
     public bytecodesUsed: number = 0
     public cheese: number = 0
 
@@ -687,6 +688,7 @@ export class Body {
             `Move Cooldown: ${this.moveCooldown}`,
             `Action Cooldown: ${this.actionCooldown}`,
             `${this.robotType !== schema.RobotType.CAT ? 'Turning Cooldown: ' + this.turningCooldown : ''}`,
+            `${this.carriedRobot !== undefined ? 'Carrying: ' + this.carriedRobot : ''}`,
             `Bytecodes Used: ${this.bytecodesUsed}${
                 this.bytecodesUsed >= this.metadata.bytecodeLimit() ? ' <EXCEEDED!>' : ''
             }`

client/src/components/sidebar/game/team-table.tsx

@@ -492,8 +492,13 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
             if (body && body.robotType === schema.RobotType.CAT) {
                 this.lastSelectedCat = selectedBodyID
                 lastSelectedCatLoc = this.bodies.getById(this.lastSelectedCat)?.pos
+            } else {
+                this.lastSelectedCat = -1
+                lastSelectedCatLoc = null
             }
         }
+        
+        // console.log(`last selected cat: ${this.lastSelectedCat}`)
 
         if (fields.catOrWaypointMode.value === 1) {
             // Waypoint mode

client/src/playback/Actions.ts

@@ -11,7 +11,7 @@ const EMPTY_ROBOT_COUNTS: Record<schema.RobotType, number> = {
 }
 
 export class TeamRoundStat {
-    gameModeCooperation: boolean = false
+    gameModeCooperation: boolean = true
     cheeseAmount: number = 0
     cheesePercent: number = 0
     catDamageAmount: number = 0
@@ -87,7 +87,7 @@ export default class RoundStat {
                 const teamStat = this.teams.get(team) ?? assert.fail(`team ${i} not found in team stats in round`)
 
                 teamStat.cheeseAmount = delta.teamCheeseTransferred(i) ?? assert.fail('missing cheese amount')
-                teamStat.cheesePercent = teamStat.cheeseAmount / totalCheese
+                teamStat.cheesePercent = totalCheese ? teamStat.cheeseAmount / totalCheese : 0
                 teamStat.catDamageAmount = delta.teamCatDamage(i) ?? assert.fail('missing cat damage amount')
                 teamStat.catDamagePercent = totalCatDamage ? teamStat.catDamageAmount / totalCatDamage : 0
                 teamStat.ratKingCount = delta.teamAliveRatKings(i) ?? assert.fail('missing rat king count')