throw fix

Author: xqlcn

client/src/playback/Actions.ts

@@ -103,7 +103,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             // chomping animation
             const src = match.currentRound.bodies.getById(this.robotId) // cat
-            if (!src) return
             // const target = match.currentRound.bodies.getById(this.actionData.id()) // rat being eaten
             const coords = renderUtils.getRenderCoords(src.pos.x, src.pos.y, match.map.dimension, true)
             const random1 = ((src.pos.x * 491 + src.pos.y * 603 + match.currentRound.roundNumber * 343) / 100) % 1 // https://xkcd.com/221/
@@ -193,8 +192,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             const src = round.bodies.getById(this.robotId)
             const target = round.bodies.getById(this.actionData.id()) // rat getting napped
 
-            if (!target) return
-            
             if (target.beingCarried) {
                 // drop the target
                 const carrier = round.bodies.getById(target.carrierRobot!)
@@ -216,10 +213,7 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             //target rat moves onto src rat, circle around carried group thing
-            const src = match.currentRound.bodies.getById(this.robotId)
-            
-            if (!src) return
-            
+            const src = match.currentRound.bodies.getById(this.robotId) 
             const srcCoords = renderUtils.getRenderCoords(src.pos.x, src.pos.y, match.map.dimension, true)
             const t = match.getInterpolationFactor()
             const bump = Math.sin(t * Math.PI * 8) * 0.03
@@ -316,7 +310,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         apply(round: Round): void {
             // remove cheese from map and increment body cheese count
             const body = round.bodies.getById(this.robotId)
-            if (!body) return
             const amt = round.map.cheeseData[this.actionData.loc()]
             round.map.cheeseData[this.actionData.loc()] = 0
             body.cheese += amt
@@ -325,7 +318,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             // cheese pickup animation
             const map = match.currentRound.map
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             const coords = renderUtils.getRenderCoords(body.pos.x, body.pos.y, map.dimension, false)
             const factor = match.getInterpolationFactor()
             const isEndpoint = factor == 0 || factor == 1
@@ -438,15 +430,13 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         apply(round: Round): void {
             // maybe move cat to target loc
             const body = round.bodies.getById(this.robotId)
-            if (!body) return
             const startPos = round.map.indexToLocation(this.actionData.startLoc())
             const endPos = round.map.indexToLocation(this.actionData.endLoc())
             console.log('pounce from', startPos, 'to', endPos)
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             // cat pouncing animation
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             const startPos = match.map.indexToLocation(this.actionData.startLoc())
             const endPos = match.map.indexToLocation(this.actionData.endLoc())
             const startCoords = renderUtils.getRenderCoords(startPos.x, startPos.y, match.map.dimension, true)
@@ -477,7 +467,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         }
         finish(round: Round): void {
             const body = round.bodies.getById(this.robotId)
-            if (!body) return
             body.textureOverride = false
         }
     },
@@ -532,7 +521,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             // trap triggering animation
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             // const pos = match.map.indexToLocation(this.actionData.loc())
             const pos = body.getInterpolatedCoords(match)
             const coords = renderUtils.getRenderCoords(pos.x, pos.y, match.map.dimension, true)
@@ -579,7 +567,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         apply(round: Round): void {
             // maybe move rat to target loc
             const body = round.bodies.getById(this.robotId)
-            if (!body) return
             const endLoc = round.map.indexToLocation(this.actionData.loc())
             if( body.carriedRobot !== undefined ) {
                 const carrier = round.bodies.getById(body.carriedRobot)
@@ -588,18 +575,17 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             body.carrierRobot = undefined
             body.beingCarried = false
             body.size = 1
-            body.pos = { ...endLoc }
+            // body.pos = { ...endLoc }
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             const pos = body.getInterpolatedCoords(match)
             const coords = renderUtils.getRenderCoords(pos.x, pos.y, match.map.dimension, true)
             const interp = match.getInterpolationFactor()
 
             const from = pos
             const to = match.currentRound.map.indexToLocation(this.actionData.loc())
-            console.log('throw from', from, 'to', to)
+
             const dx = to.x - from.x
             const dy = to.y - from.y
             const mag = Math.hypot(dx, dy)
@@ -646,12 +632,10 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
         apply(round: Round): void {
             // promote body in-place to RatKing while preserving ID/state
             const body = round.bodies.getById(this.robotId)
-            if (!body) return
             body.promoteTo(schema.RobotType.RAT_KING)
         }
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             const pos = body.getInterpolatedCoords(match)
             const coords = renderUtils.getRenderCoords(pos.x, pos.y, match.map.dimension, true)
 
@@ -700,7 +684,6 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
 
         draw(match: Match, ctx: CanvasRenderingContext2D): void {
             const body = match.currentRound.bodies.getById(this.robotId)
-            if (!body) return
             const renderCoords = renderUtils.getRenderCoords(
                 body.pos.x,
                 body.pos.y,