Merge remote-tracking branch 'origin/schema'

Author: TheApplePieGod

client/src/playback/Actions.ts

@@ -393,7 +393,11 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             // add a trap to map
             const body = round.bodies.getById(this.robotId)
 
-            round.map.trapData[this.actionData.loc()] = 1 + body.team.id // 1 for team 0, 2 for team 1
+            if (this.actionData.isRatTrapType()) {
+                round.map.ratTrapData[this.actionData.loc()] = 1 + body.team.id // 1 for team 0, 2 for team 1
+            } else {
+                round.map.catTrapData[this.actionData.loc()] = 1 + body.team.id // 1 for team 0, 2 for team 1
+            }
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             // place trap animation
@@ -403,11 +407,17 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             const isEndpoint = factor == 0 || factor == 1
             const size = isEndpoint ? 1 : Math.max(factor * 1.5, 0.3)
             const alpha = isEndpoint ? 1 : (factor < 0.5 ? factor : 1 - factor) * 2
+            let imgPath: string
+            if (this.actionData.isRatTrapType()) {
+                imgPath = 'icons/rat_trap.png'
+            } else {
+                imgPath = 'icons/cat_trap.png'
+            }
 
             ctx.globalAlpha = alpha
             ctx.shadowBlur = 4
             ctx.shadowColor = 'black'
-            renderUtils.renderCenteredImageOrLoadingIndicator(ctx, getImageIfLoaded('icons/trap.png'), coords, size)
+            renderUtils.renderCenteredImageOrLoadingIndicator(ctx, getImageIfLoaded(imgPath), coords, size)
             ctx.shadowBlur = 0
             ctx.shadowColor = ''
             ctx.globalAlpha = 1
@@ -416,13 +426,15 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
     [schema.Action.RemoveTrap]: class RemoveTrapAction extends Action<schema.RemoveTrap> {
         apply(round: Round): void {
             // remove a trap from map
-            round.map.trapData[this.actionData.loc()] = 0
+            round.map.ratTrapData[this.actionData.loc()] = 0
+            round.map.catTrapData[this.actionData.loc()] = 0
         }
     },
     [schema.Action.TriggerTrap]: class TriggerTrapAction extends Action<schema.TriggerTrap> {
         apply(round: Round): void {
             // remove trap from map
-            round.map.trapData[this.actionData.loc()] = 0 // remove trap
+            round.map.ratTrapData[this.actionData.loc()] = 0 // remove trap
+            round.map.catTrapData[this.actionData.loc()] = 0 // remove trap
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             // trap triggering animation

client/src/playback/Bodies.ts

@@ -660,7 +660,7 @@ export class Body {
             `${this.robotType === schema.RobotType.RAT ? 'Cheese: ' + this.cheese : ''}`,
             `Move Cooldown: ${this.moveCooldown}`,
             `Action Cooldown: ${this.actionCooldown}`,
-            `Turning Cooldown: ${this.turningCooldown}`,
+            `${this.robotType !== schema.RobotType.CAT ? 'Turning Cooldown: ' + this.turningCooldown : ''}`,
             `Bytecodes Used: ${this.bytecodesUsed}${
                 this.bytecodesUsed >= this.metadata.bytecodeLimit() ? ' <EXCEEDED!>' : ''
             }`

client/src/playback/Brushes.ts

@@ -131,7 +131,7 @@ const makeEditorActionData = (
         case schema.Action.DieAction:
             return { id: () => targetId, dieType: () => 0 }
         case schema.Action.PlaceTrap:
-            return { loc: () => loc, team: () => 0 }
+            return { isRatTrapType: () => true, loc: () => loc, team: () => 0 }
         case schema.Action.PlaceDirt:
             return { loc: () => loc }
         case schema.Action.RatAttack:

client/src/playback/Map.ts

@@ -39,7 +39,8 @@ export class CurrentMap {
     public readonly staticMap: StaticMap
     public readonly dirt: Int8Array
     public readonly markers: [Int8Array, Int8Array] // Each team has markers
-    public readonly trapData: Int8Array
+    public readonly ratTrapData: Int8Array
+    public readonly catTrapData: Int8Array
     public readonly cheeseData: Int8Array
     public readonly resourcePatterns: ResourcePatternData[]
 
@@ -62,7 +63,8 @@ export class CurrentMap {
             this.cheeseData = new Int8Array(from.cheese)
             this.markers = [new Int8Array(this.width * this.height), new Int8Array(this.width * this.height)]
             this.resourcePatterns = []
-            this.trapData = new Int8Array(this.width * this.height)
+            this.ratTrapData = new Int8Array(this.width * this.height)
+            this.catTrapData = new Int8Array(this.width * this.height)
         } else {
             // Create current map from current map (copy)
 
@@ -73,7 +75,8 @@ export class CurrentMap {
 
             // Assumes ResourcePatternData is immutable
             this.resourcePatterns = [...from.resourcePatterns]
-            this.trapData = new Int8Array(from.trapData)
+            this.ratTrapData = new Int8Array(from.ratTrapData)
+            this.catTrapData = new Int8Array(from.catTrapData)
         }
     }
 
@@ -173,11 +176,20 @@ export class CurrentMap {
                     )
                 }
 
-                const trap = this.trapData[schemaIdx]
-                if (trap) {
+                const ratTrap = this.ratTrapData[schemaIdx]
+                if (ratTrap) {
                     renderUtils.renderCenteredImageOrLoadingIndicator(
                         ctx,
-                        getImageIfLoaded('icons/trap.png'),
+                        getImageIfLoaded('icons/rat_trap.png'),
+                        coords,
+                        1.0
+                    )
+                }
+                const catTrap = this.catTrapData[schemaIdx]
+                if (catTrap) {
+                    renderUtils.renderCenteredImageOrLoadingIndicator(
+                        ctx,
+                        getImageIfLoaded('icons/cat_trap.png'),
                         coords,
                         1.0
                     )