Fixing object interaction rotations on custom maps

Author: Tynarus

src/game-engine/world/index.ts

@@ -92,7 +92,7 @@ export class World {
                 return { object: templateMapObject, cacheOriginal: true };
             }
 
-            return null;
+            return { object: null, cacheOriginal: false };
         }
 
         let cacheOriginal = true;
@@ -161,10 +161,7 @@ export class World {
         const chunkIndexX = objectChunk.position.x - (mapChunk.position.x - 2);
         const chunkIndexY = objectChunk.position.y - (mapChunk.position.y - 2);
 
-        const centerOffsetX = map.centerOffsetX || 0;
-        const centerOffsetY = map.centerOffsetY || 0;
-
-        const objectTile = map.tileData[actor.position.level][chunkIndexX + centerOffsetX][chunkIndexY + centerOffsetY];
+        const objectTile = map.tileData[actor.position.level][chunkIndexX][chunkIndexY];
 
         const tileX = objectTile >> 14 & 0x3ff;
         const tileY = objectTile >> 3 & 0x7ff;

src/game-engine/world/map/region.ts

@@ -33,29 +33,27 @@ export interface ConstructedMap {
 
 
 export const getRotatedObjectX = (orientation: number, localX: number, localY: number): number => {
-    orientation &= 0x3;
     if(orientation === 0) {
         return localX;
     }
     if(orientation === 1) {
-        return localY;
+        return 7 + -localY;
     }
     if(orientation === 2) {
         return -localX + 7;
     }
-    return 7 + -localY;
+    return localY;
 };
 
 export const getRotatedObjectY = (orientation: number, localX: number, localY: number): number => {
-    orientation &= 0x3;
     if(orientation === 0) {
         return localY;
     }
     if(orientation === 1) {
-        return 7 + -localX;
+        return localX;
     }
     if(orientation === 2) {
         return -localY + 7;
     }
-    return localX;
+    return 7 + -localX;
 };

src/plugins/skills/construction/construction.plugin.ts

@@ -13,14 +13,23 @@ const openHouse = (player: Player): void => {
 
     const gardenPortal = new Room('garden_1');
     const firstParlor = new Room('parlor');
+    const secondParlor = new Room('parlor', 1);
+    const thirdParlor = new Room('parlor', 2);
+    const fourthParlor = new Room('parlor', 3);
     const emptySpace = new Room('empty_grass');
 
     for(let x = 0; x < MAP_SIZE; x++) {
         for(let y = 0; y < MAP_SIZE; y++) {
             if(x === 6 && y === 6) {
                 house.rooms[0][x][y] = gardenPortal;
-            } else if((x === 7 && y === 6) || (x === 6 && y === 7) || (x === 5 && y === 6)) {
+            } else if(x === 5 && y === 6) {
                 house.rooms[0][x][y] = firstParlor;
+            } else if(x === 7 && y === 6) {
+                house.rooms[0][x][y] = secondParlor;
+            } else if(x === 6 && y === 5) {
+                house.rooms[0][x][y] = thirdParlor;
+            } else if(x === 6 && y === 7) {
+                house.rooms[0][x][y] = fourthParlor;
             }
         }
     }