prohibit placing oob in map editor

Author: xqlcn

client/src/playback/Bodies.ts

@@ -99,10 +99,8 @@ export default class Bodies {
 
         return body
     }
+
     checkBodyCollisionAtLocation(type: schema.RobotType, pos: Vector): boolean {
-        const bodyClass = BODY_DEFINITIONS[type] ?? assert.fail(`Body type ${type} not found in BODY_DEFINITIONS`)
-        const tempBody = new bodyClass(this.game, pos, this.game.getTeamByID(1), 0)
-        const bodySize = tempBody.size
         const occupiedSpaces: Vector[] = []
 
         for (const otherBody of this.bodies.values()) {
@@ -154,6 +152,34 @@ export default class Bodies {
         return false
     }
 
+    checkBodyOutofBoundsAtLocation(type: schema.RobotType, pos: Vector): boolean {
+        const map = this.game.currentMatch?.map
+        if(!map) return false
+
+        const dimension = map.dimension
+        const occupiedSpaces: Vector[] = []
+
+        if (type == schema.RobotType.RAT) {
+            if(!map.inBounds(pos.x, pos.y)) return false
+        }
+        if (type == schema.RobotType.CAT) {
+            for (let xoff = 0; xoff <= 1; xoff++) {
+                for (let yoff = 0; yoff <= 1; yoff++) {
+                    if(!map.inBounds(pos.x+xoff, pos.y+yoff)) return false
+                }
+            }
+        }
+        if (type == schema.RobotType.RAT_KING) {
+            for (let xoff = -1; xoff <= 1; xoff++) {
+                for (let yoff = -1; yoff <= 1; yoff++) {
+                    if(!map.inBounds(pos.x+xoff, pos.y+yoff)) return false
+                }
+            }
+        }
+        
+        return true
+    }
+
     markBodyAsDead(id: number): void {
         const body = this.getById(id)
         body.dead = true

client/src/playback/Brushes.ts

@@ -546,7 +546,12 @@ export class CatBrush extends SymmetricMapEditorBrush<StaticMap> {
         const add = (x: number, y: number, team: Team) => {
             const pos = { x, y }
 
-            if (this.bodies.checkBodyCollisionAtLocation(schema.RobotType.CAT, pos)) return null
+            if (
+                this.bodies.checkBodyCollisionAtLocation(schema.RobotType.CAT, pos)||
+                !this.bodies.checkBodyOutofBoundsAtLocation(schema.RobotType.CAT, pos)
+            ) {
+                return null
+            }
 
             const id = this.bodies.getNextID()
             this.bodies.spawnBodyFromValues(id, schema.RobotType.CAT, team, pos, 0, robotOne ? 0 : 1)
@@ -650,7 +655,8 @@ export class RatKingBrush extends SymmetricMapEditorBrush<StaticMap> {
             const pos = { x, y }
             if (
                 this.bodies.getBodyAtLocation(x, y) ||
-                this.bodies.checkBodyCollisionAtLocation(schema.RobotType.RAT_KING, pos)
+                this.bodies.checkBodyCollisionAtLocation(schema.RobotType.RAT_KING, pos) ||
+                !this.bodies.checkBodyOutofBoundsAtLocation(schema.RobotType.RAT_KING, pos)
             ) {
                 return null
             }