Fix differentiation of wall and floor items

src/interfaces/IFurnitureData.ts

@@ -4,7 +4,10 @@ import { furnitureDataTransformers } from "../util/furnitureDataTransformers";
 export interface IFurnitureData {
   getRevisionForType(type: string): Promise<number | undefined>;
   getInfo(type: string): Promise<FurnitureInfo | undefined>;
-  getTypeById(id: FurnitureId): Promise<string | undefined>;
+  getTypeById(
+    id: FurnitureId,
+    type: "wall" | "floor"
+  ): Promise<string | undefined>;
   getInfoForFurniture(
     furniture: IFurniture
   ): Promise<FurnitureInfo | undefined>;

src/interfaces/IFurnitureLoader.ts

@@ -6,5 +6,5 @@ export interface IFurnitureLoader {
 }
 
 export type FurnitureFetch =
-  | { kind: "id"; id: FurnitureId }
+  | { kind: "id"; id: FurnitureId; placementType: "wall" | "floor" }
   | { kind: "type"; type: string };

src/objects/FurnitureData.ts

@@ -16,7 +16,11 @@ type IdToTypeMap = {
 };
 
 export class FurnitureData implements IFurnitureData {
-  private data: Promise<{ typeToInfo: FurnitureMap; idToType: IdToTypeMap }>;
+  private data: Promise<{
+    typeToInfo: FurnitureMap;
+    floorIdToType: IdToTypeMap;
+    wallIdToType: IdToTypeMap;
+  }>;
 
   constructor(private getFurniData: () => Promise<string>) {
     this.data = this.prepareData();
@@ -27,22 +31,34 @@ export class FurnitureData implements IFurnitureData {
     const parsed = await parseStringPromise(furniDataString);
 
     const typeToInfo: FurnitureMap = {};
-    const idToType: IdToTypeMap = {};
+    const floorIdToType: IdToTypeMap = {};
+    const wallIdToType: IdToTypeMap = {};
 
-    const register = (data: any[]) => {
+    const register = (data: any[], furnitureType: "floor" | "wall") => {
       data.forEach((element) => {
         const type = element.$.classname;
         const id = element.$.id;
 
         typeToInfo[type] = formatFurnitureData(element);
-        idToType[id] = type;
+
+        if (furnitureType === "floor") {
+          if (floorIdToType[id] != null)
+            throw new Error(`Floor furniture with id ${id} already exists`);
+
+          floorIdToType[id] = type;
+        } else if (furnitureType === "wall") {
+          if (wallIdToType[id] != null)
+            throw new Error(`Wall furniture with id ${id} already exists`);
+
+          wallIdToType[id] = type;
+        }
       });
     };
 
-    register(parsed.furnidata.roomitemtypes[0].furnitype);
-    register(parsed.furnidata.wallitemtypes[0].furnitype);
+    register(parsed.furnidata.roomitemtypes[0].furnitype, "wall");
+    register(parsed.furnidata.wallitemtypes[0].furnitype, "floor");
 
-    return { typeToInfo, idToType };
+    return { typeToInfo, floorIdToType, wallIdToType };
   }
 
   static create(resourcePath: string = "") {
@@ -62,9 +78,13 @@ export class FurnitureData implements IFurnitureData {
     return data.typeToInfo[type];
   }
 
-  async getTypeById(id: FurnitureId): Promise<string | undefined> {
+  async getTypeById(
+    id: FurnitureId,
+    placementType: "wall" | "floor"
+  ): Promise<string | undefined> {
     const data = await this.data;
-    const type = data.idToType[id];
+    const type =
+      placementType != "floor" ? data.floorIdToType[id] : data.wallIdToType[id];
 
     if (type == null) return;
 
@@ -73,7 +93,10 @@ export class FurnitureData implements IFurnitureData {
 
   async getInfoForFurniture(furniture: IFurniture) {
     if (furniture.id != null) {
-      const type = await this.getTypeById(furniture.id);
+      const type = await this.getTypeById(
+        furniture.id,
+        furniture.placementType
+      );
 
       if (type != null) {
         return this.getInfo(type);

src/objects/furniture/FloorFurniture.tsx

@@ -32,6 +32,8 @@ export class FloorFurniture
   private _animation?: string;
   private _highlight: boolean = false;
 
+  public readonly placementType = "wall";
+
   private _onClick: HitEventHandler | undefined;
   private _onDoubleClick: HitEventHandler | undefined;
 
@@ -96,7 +98,7 @@ export class FloorFurniture
     }
 
     this._baseFurniture = new BaseFurniture(
-      getFurnitureFetch(options),
+      getFurnitureFetch(options, "floor"),
       options.direction,
       options.animation
     );

src/objects/furniture/FurnitureLoader.ts

@@ -56,7 +56,10 @@ export class FurnitureLoader implements IFurnitureLoader {
     let typeWithColor: string;
 
     if (fetch.kind === "id") {
-      const type = await this.options.furnitureData.getTypeById(fetch.id);
+      const type = await this.options.furnitureData.getTypeById(
+        fetch.id,
+        fetch.placementType
+      );
       if (type == null)
         throw new Error("Couldn't determine type for furniture.");
 

src/objects/furniture/IFurniture.ts

@@ -10,6 +10,7 @@ export interface IFurniture extends IFurnitureEventHandlers {
   direction: number;
   animation: string | undefined;
   highlight: boolean | undefined;
+  placementType: "wall" | "floor";
 }
 
 export type IFurnitureBehavior<T extends IFurniture = IFurniture> = {

src/objects/furniture/WallFurniture.tsx

@@ -21,6 +21,8 @@ export class WallFurniture extends RoomObject implements IFurniture {
   private _direction: number;
   private _highlight: boolean = false;
 
+  public readonly placementType = "wall";
+
   constructor(
     options: {
       roomX: number;
@@ -43,7 +45,7 @@ export class WallFurniture extends RoomObject implements IFurniture {
     this._direction = options.direction;
 
     this._baseFurniture = new BaseFurniture(
-      getFurnitureFetch(options),
+      getFurnitureFetch(options, "wall"),
       options.direction,
       options.animation,
       (direction) => getMaskId(direction, this.roomX, this.roomY)

src/objects/furniture/util/getFurnitureFetch.ts

@@ -2,14 +2,17 @@ import { FurnitureId } from "../../../interfaces/IFurnitureData";
 import { FurnitureFetch } from "../../../interfaces/IFurnitureLoader";
 import { FurnitureFetchInfo } from "../FurnitureFetchInfo";
 
-export function getFurnitureFetch(data: FurnitureFetchInfo): FurnitureFetch {
+export function getFurnitureFetch(
+  data: FurnitureFetchInfo,
+  placementType: "wall" | "floor"
+): FurnitureFetch {
   if (data.id != null && data.type != null)
     throw new Error(
       "Both `id` and `type` specified. Please supply only one of the two."
     );
 
   if (data.id != null) {
-    return { kind: "id", id: data.id };
+    return { kind: "id", id: data.id, placementType };
   }
 
   if (data.type != null) {

storybook/stories/Furniture.stories.ts

@@ -1,4 +1,4 @@
-import { FloorFurniture, Room } from "@jankuss/shroom";
+import { FloorFurniture, Room, WallFurniture } from "@jankuss/shroom";
 import { createShroom } from "./common/createShroom";
 import { action } from "@storybook/addon-actions";
 
@@ -216,3 +216,44 @@ export function MultipleFurnitures() {
     application.stage.addChild(room);
   });
 }
+
+export function DifferentFetchTypes() {
+  return createShroom(({ application, shroom }) => {
+    const room = Room.create(shroom, {
+      tilemap: `
+       xxxxxxxxxxx
+       x0000000000
+       x0000000000
+       x0000000000
+       x0000000000
+       x0000000000
+       x0000000000
+       x0000000000
+       x0000000000
+      `,
+    });
+
+    room.x = application.screen.width / 2 - room.roomWidth / 2;
+    room.y = application.screen.height / 2 - room.roomHeight / 2;
+
+    const wallFurniture = new WallFurniture({
+      id: 4054,
+      direction: 2,
+      roomX: 1,
+      roomY: 1,
+      roomZ: 0,
+    });
+    const floorFurniture = new FloorFurniture({
+      id: 4054,
+      direction: 2,
+      roomX: 1,
+      roomY: 1,
+      roomZ: 0,
+    });
+
+    room.addRoomObject(wallFurniture);
+    room.addRoomObject(floorFurniture);
+
+    application.stage.addChild(room);
+  });
+}