fix: doors layer on stairs

server/src/map.ts

@@ -495,6 +495,8 @@ export class GameMap {
         const def = MapObjectDefs[type] as StructureDef;
 
         const structure = new Structure(this.game, type, pos, layer, ori);
+        this.game.grid.addObject(structure);
+
         layer = 0;
         for (const layerDef of def.layers) {
             const building = this.genBuilding(
@@ -508,7 +510,6 @@ export class GameMap {
             structure.layerObjIds.push(building.id);
         }
 
-        this.game.grid.addObject(structure);
         this.objectCount[type]++;
         return structure;
     }

server/src/objects/obstacle.ts

@@ -4,7 +4,7 @@ import { type ObstacleDef } from "../../../shared/defs/mapObjectsTyping";
 import { type Game } from "../game";
 import { NetConstants } from "../net/net";
 import { type ObjectsFullData, type ObjectsPartialData } from "../net/objectSerialization";
-import { type Collider } from "../../../shared/utils/coldet";
+import { coldet, type Collider } from "../../../shared/utils/coldet";
 import { collider } from "../../../shared/utils/collider";
 import { mapHelpers } from "../../../shared/utils/mapHelpers";
 import { math } from "../../../shared/utils/math";
@@ -86,6 +86,8 @@ export class Obstacle extends BaseGameObject implements FullObstacle, PartialObs
 
     layer: number;
 
+    originalLayer: number;
+
     destructible: boolean;
 
     rot: number;
@@ -100,6 +102,7 @@ export class Obstacle extends BaseGameObject implements FullObstacle, PartialObs
         this.ori = ori;
         this.scale = scale;
         this.layer = layer;
+        this.originalLayer = layer;
         this.parentBuildingId = parentBuildingId;
         this.isPuzzlePiece = !!puzzlePiece;
         this.puzzlePiece = puzzlePiece;
@@ -177,6 +180,7 @@ export class Obstacle extends BaseGameObject implements FullObstacle, PartialObs
                     break;
                 }
             }
+            this.checkLayer();
         }
 
         if (def.button) {
@@ -193,6 +197,28 @@ export class Obstacle extends BaseGameObject implements FullObstacle, PartialObs
         }
     }
 
+    checkLayer(): void {
+        let newLayer = this.originalLayer;
+        const def = MapObjectDefs[this.type] as ObstacleDef;
+        const coll = collider.createCircle(this.pos, def.door!.interactionRad + 1)
+        const objs = this.game.grid.intersectCollider(coll);
+        for (const obj of objs) {
+            if (obj.__type === ObjectType.Structure) {
+                for (const stair of obj.stairs) {
+                    if (coldet.test(coll, stair.downAabb)) {
+                        newLayer = 3;
+                    } else if (coldet.test(coll, stair.upAabb)) {
+                        newLayer = 2;
+                    }
+                }
+            }
+        }
+        if (newLayer !== this.layer) {
+            this.layer = newLayer;
+            this.setDirty();
+        }
+    }
+
     damage(amount: number, sourceType: string, _damageType: number): void {
         const def = MapObjectDefs[this.type] as ObstacleDef;
         if (this.health === 0 || !this.destructible) return;
@@ -337,6 +363,7 @@ export class Obstacle extends BaseGameObject implements FullObstacle, PartialObs
 
         this.bounds = collider.transform(def.collision, v2.create(0, 0), this.rot, 1);
         this.game.grid.updateObject(this);
+        this.checkLayer();
         this.setDirty();
     }
 }