some bug fixes

Author: xqlcn

client/src/components/game/game-renderer.tsx

@@ -193,7 +193,7 @@ const ZoomableGameRenderer: React.FC<{
     // Adjust hovered tile if hovering over a body
     const hoveredBody = hoveredTile ? round?.bodies.getBodyAtLocation(hoveredTile.x, hoveredTile.y) : undefined
 
-    if (hoveredBody && hoveredTile){
+    if (hoveredBody && hoveredBody.pos && hoveredTile){
         hoveredTile = hoveredBody.pos
         if (hoveredBody.robotType == schema.RobotType.RAT_KING){
             hoveredTile = vectorAdd(hoveredTile, {x: -1, y: -1} )

client/src/components/sidebar/map-editor/MapGenerator.ts

@@ -149,13 +149,13 @@ function verifyMap(map: CurrentMap, bodies: Bodies): string {
         // Check distance from cat to other cats and cheese mines
         let body_type = undefined
         switch (body.robotType) {
-            case RobotType.CAT:
+            case schema.RobotType.CAT:
                 body_type = 'Cat'
                 break
-            case RobotType.RAT:
+            case schema.RobotType.RAT:
                 body_type = 'Rat'
                 break
-            case RobotType.RAT_KING:
+            case schema.RobotType.RAT_KING:
                 body_type = 'Rat King'
                 break
             default:

client/src/components/sidebar/map-editor/map-editor.tsx

@@ -188,8 +188,10 @@ export const MapEditorPage: React.FC<Props> = (props) => {
 
     useEffect(() => {
         if (canvasMouseDown && hoveredTile) applyBrush(hoveredTile)
-        if (canvasMouseDown && hoveredTile) {
+        // added defensive checks just in case stuff is null for some reason
+        if (canvasMouseDown && hoveredTile && typeof hoveredTile.x === 'number' && typeof hoveredTile.y === 'number') {
             // override the GameRenderer's canvas click
+            if (!canvasMouseDown || !hoveredTile) return;
             const newSelectedBody = GameRunner.match?.currentRound.bodies.getBodyAtLocation(
                 hoveredTile.x,
                 hoveredTile.y

client/src/playback/Actions.ts

@@ -104,10 +104,10 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             // chomping animation
             const src = match.currentRound.bodies.getById(this.robotId) // cat
             // 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/
-            const random2 = ((src.pos.x * 259 + src.pos.y * 429 + match.currentRound.roundNumber * 224) / 100) % 1
-            const interpolationFactor = match.getInterpolationFactor()
+            // 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/
+            // const random2 = ((src.pos.x * 259 + src.pos.y * 429 + match.currentRound.roundNumber * 224) / 100) % 1
+            // const interpolationFactor = match.getInterpolationFactor()
 
             // ctx.save()
             // ctx.globalAlpha = 0.5 - 0.5 * interpolationFactor * interpolationFactor
@@ -194,8 +194,11 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
 
             if (target.beingCarried) {
                 // drop the target
-                const carrier = round.bodies.getById(target.carrierRobot!)
-                carrier.carriedRobot = undefined
+                // const carrier = round.bodies.getById(target.carrierRobot!)
+                if(target.carrierRobot !== undefined) {
+                    const carrier = round.bodies.getById(target.carrierRobot)
+                    carrier.carriedRobot = undefined
+                }
                 target.size = 1
                 target.beingCarried = false
                 target.carrierRobot = undefined

client/src/playback/Bodies.ts

@@ -435,10 +435,8 @@ export class Body {
         const OFFSET = { x: .35, y: 0 } // to center the rat on the tile
         const ratnapped = this.robotType === schema.RobotType.RAT && this.beingCarried
 
-        if(ratnapped) this.pos.x += OFFSET.x
         const pos = this.getInterpolatedCoords(match)
-        if(ratnapped) this.pos.x -= OFFSET.x
-
+        
         const renderCoords = renderUtils.getRenderCoords(pos.x, pos.y, match.currentRound.map.staticMap.dimension)
 
         if (this.robotType == schema.RobotType.CAT) {