cat waypoint visualization fix

Author: saltyquackerd

client/src/playback/Brushes.ts

@@ -476,11 +476,13 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
     public symmetricApply(x: number, y: number, fields: Record<string, MapEditorBrushField>, robotOne: boolean) {
         const isCat: boolean = fields.isCat.value
         const selectedBodyID = GameRenderer.getSelectedRobot()
+        let lastSelectedCatLoc: Vector | null = null
 
         if (selectedBodyID !== null && selectedBodyID !== undefined) {
             const body = this.bodies.bodies.get(selectedBodyID)
             if (body && body.robotType === schema.RobotType.CAT) {
                 this.lastSelectedCat = selectedBodyID
+                lastSelectedCatLoc = this.bodies.getById(this.lastSelectedCat)?.pos
             }
         }
 
@@ -491,6 +493,7 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
             if (!robotOne) {
                 const symmetricPoint = this.map.applySymmetryCat(this.bodies.getById(this.lastSelectedCat)!.pos)
                 currentCat = this.bodies.getBodyAtLocation(symmetricPoint.x, symmetricPoint.y)!.id
+                lastSelectedCatLoc = this.map.applySymmetry(lastSelectedCatLoc!)
             }
 
             // if undoing a waypoint addition
@@ -518,6 +521,9 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
                 return null
             }
 
+            if (!this.map.catWaypoints.has(currentCat)) {
+                this.map.catWaypoints.set(currentCat, [lastSelectedCatLoc!])
+            }
             this.map.catWaypoints.get(currentCat)?.push({ x, y })
 
             return () => {
@@ -535,7 +541,6 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
 
             const id = this.bodies.getNextID()
             this.bodies.spawnBodyFromValues(id, schema.RobotType.CAT, team, pos, 0, robotOne ? 0 : 1)
-            this.map.catWaypoints.set(id, [{ x: x, y: y }]) // add initial waypoint at spawn location
 
             return id
         }
@@ -580,7 +585,12 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
 
         undoFunctions.push(undo0)
 
-        const symmetryPoint = this.map.applySymmetryCat({ x: x, y: y })
+        let symmetryPoint: { x: number; y: number }
+        if (fields.catOrWaypointMode.value === 1) {
+            symmetryPoint = this.map.applySymmetry({ x: x, y: y })
+        } else {
+            symmetryPoint = this.map.applySymmetryCat({ x: x, y: y })
+        }
         if (symmetryPoint.x != x || symmetryPoint.y != y) {
             const undo1 = this.symmetricApply(symmetryPoint.x, symmetryPoint.y, fields, !robotOne)
 

client/src/playback/Map.ts

@@ -261,8 +261,8 @@ export class CurrentMap {
                 ctx.fill()
             })
             waypoints?.forEach((waypoint, idx) => {
-                let prevWaypoint = bodies.getById(selectedBodyID).pos
-                if (idx > 0) {
+                let prevWaypoint = waypoints[0]
+                if (idx > 1) {
                     prevWaypoint = waypoints[idx - 1]
                 }
                 const startCoords = renderUtils.getRenderCoords(prevWaypoint.x, prevWaypoint.y, this.dimension)