Finally fixing object orientation issues with constructed map regions

Author: Tynarus

src/game-engine/config/index.ts

@@ -19,14 +19,15 @@ import { Quest } from '@engine/world/actor/player/quest';
 import { ItemSpawn, loadItemSpawnConfigurations } from '@engine/config/item-spawn-config';
 import { loadSkillGuideConfigurations, SkillGuide } from '@engine/config/skill-guide-config';
 import { loadMusicRegionConfigurations, MusicTrack } from '@engine/config/music-regions-config';
-import { loadXteaRegionFiles, XteaRegion } from '@runejs/filestore';
+import { LandscapeObject, loadXteaRegionFiles, ObjectConfig, XteaRegion } from '@runejs/filestore';
 
 require('json5/lib/register');
 
 
 
 export let itemMap: { [key: string]: ItemDetails };
 export let itemIdMap: { [key: number]: string };
+export let objectMap: { [key: number]: ObjectConfig };
 export let itemPresetMap: ItemPresetConfiguration;
 export let npcMap: { [key: string]: NpcDetails };
 export let npcIdMap: { [key: number]: string };
@@ -65,6 +66,9 @@ export async function loadGameConfigurations(): Promise<void> {
 
     shopMap = await loadShopConfigurations('data/config/shops/');
     skillGuides = await loadSkillGuideConfigurations('data/config/skill-guides/');
+
+    objectMap = {};
+
     logger.info(`Loaded ${musicRegions.length} music regions, ${Object.keys(itemMap).length} items, ${itemSpawns.length} item spawns, ` +
         `${Object.keys(npcMap).length} npcs, ${npcSpawns.length} npc spawns, ${Object.keys(shopMap).length} shops and ${skillGuides.length} skill guides.`);
 }
@@ -170,6 +174,21 @@ export const findNpc = (npcKey: number | string): NpcDetails | null => {
 };
 
 
+export const findObject = (objectId: number): ObjectConfig | null => {
+    if(!objectMap[objectId]) {
+        const object = filestore.objectStore.getObject(objectId);
+        if(!object) {
+            return null;
+        }
+
+        objectMap[objectId] = object;
+        return object;
+    } else {
+        return objectMap[objectId];
+    }
+};
+
+
 export const findShop = (shopKey: string): Shop | null => {
     if(!shopKey) {
         return null;

src/game-engine/world/index.ts

@@ -10,7 +10,7 @@ import TravelLocations from '@engine/world/config/travel-locations';
 import { Actor } from '@engine/world/actor/actor';
 import { schedule } from '@engine/world/task';
 import { parseScenerySpawns } from '@engine/world/config/scenery-spawns';
-import { findItem, findNpc, itemSpawns, npcSpawns } from '@engine/config';
+import { findItem, findNpc, findObject, itemSpawns, npcSpawns } from '@engine/config';
 import { NpcDetails } from '@engine/config/npc-config';
 import { WorldInstance } from '@engine/world/instances';
 import { Direction } from '@engine/world/direction';
@@ -155,6 +155,12 @@ export class World {
             return null;
         }
 
+        const objectConfig = findObject(objectId);
+
+        if(!objectConfig) {
+            return null;
+        }
+
         const objectChunk = this.chunkManager.getChunkForWorldPosition(objectPosition);
         const mapChunk = world.chunkManager.getChunkForWorldPosition(map.renderPosition);
 
@@ -174,12 +180,10 @@ export class World {
         const mapTemplateWorldY = tileY;
         const mapTemplateChunk = world.chunkManager.getChunkForWorldPosition(new Position(mapTemplateWorldX, mapTemplateWorldY, objectPosition.level));
 
-        const templateLocalX = getTemplateLocalX(tileOrientation, objectLocalX, objectLocalY);
-        const templateLocalY = getTemplateLocalY(tileOrientation, objectLocalX, objectLocalY);
-
-        if(actor instanceof Player) {
-            actor.sendMessage(`Tile Orientation ${tileOrientation}, Local ${templateLocalX},${templateLocalY}`);
-        }
+        const templateLocalX = getTemplateLocalX(tileOrientation, objectLocalX, objectLocalY,
+            objectConfig?.rendering?.sizeX || 1, objectConfig?.rendering?.sizeY || 1);
+        const templateLocalY = getTemplateLocalY(tileOrientation, objectLocalX, objectLocalY,
+            objectConfig?.rendering?.sizeX || 1, objectConfig?.rendering?.sizeY || 1);
 
         const templateObjectPosition = new Position(mapTemplateWorldX + templateLocalX,
             mapTemplateWorldY + templateLocalY, objectPosition.level);
@@ -198,8 +202,6 @@ export class World {
             rotation -= 4;
         }
 
-        console.log(realObject.orientation, rotation);
-
         realObject.orientation = rotation;
 
         return realObject || null;

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

@@ -325,7 +325,7 @@ export class CollisionMap {
         occupantX -= this._insetX;
         occupantY -= this._insetY;
 
-        if(rotation == 1 || rotation == 3) {
+        if(rotation === 1 || rotation === 3) {
             const off = width;
             width = height;
             height = off;

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

@@ -51,71 +51,87 @@ export interface ConstructedRegion {
 
 
 
-export const getTemplateRotatedX = (orientation: number, localX: number, localY: number): number => {
+
+export const getTemplateRotatedX = (orientation: number, localX: number, localY: number,
+                                    sizeX: number = 1, sizeY: number = 1): number => {
+    if(orientation === 1 || orientation === 3) {
+        const i = sizeX;
+        sizeX = sizeY;
+        sizeY = i;
+    }
+
     if(orientation === 0) {
         return localX;
     }
     if(orientation === 1) {
-        if(localX === 7) {
-            return localY;
-        } else {
-            return 7 - localY;
-        }
+        return 7 - (localY - sizeY + 1);
     }
     if(orientation === 2) {
-        if(localY === 0) {
-            return localX;
-        } else {
-            return 7 - localX;
-        }
+        return 7 - (localX + sizeX + 1);
     }
     return localY;
 };
 
-export const getTemplateRotatedY = (orientation: number, localX: number, localY: number): number => {
+export const getTemplateRotatedY = (orientation: number, localX: number, localY: number,
+                                    sizeX: number = 1, sizeY: number = 1): number => {
+    if(orientation === 1 || orientation === 3) {
+        const i = sizeX;
+        sizeX = sizeY;
+        sizeY = i;
+    }
+
     if(orientation === 0) {
         return localY;
     }
     if(orientation === 1) {
         return localX;
     }
     if(orientation === 2) {
-        return 7 - localY;
+        return 7 - (localY + sizeY + 1);
     }
-    return 7 - localX;
+    return 7 - (localX - sizeX + 1);
 };
 
 
-export const getTemplateLocalX = (orientation: number, localX: number, localY: number): number => {
+
+
+
+
+
+export const getTemplateLocalX = (orientation: number, localX: number, localY: number,
+                                  sizeX: number = 1, sizeY: number = 1): number => {
+    if(orientation === 2) {
+        const i = sizeX;
+        sizeX = sizeY;
+        sizeY = i;
+    }
+
     if(orientation === 0) {
         return localX;
+    } else if(orientation === 1) {
+        return 7 - (localY + sizeY) + 1;
+    } else if(orientation === 2) {
+        return 7 - (localX + sizeX) + 1;
+    } else { // 3
+        return localY;
     }
-    if(orientation === 1) {
-        if(localX === 7) {
-            return localY;
-        } else {
-            return 7 - localY;
-        }
-    }
+};
+
+export const getTemplateLocalY = (orientation: number, localX: number, localY: number,
+                                  sizeX: number = 1, sizeY: number = 1): number => {
     if(orientation === 2) {
-        if(localY === 0) {
-            return localX;
-        } else {
-            return 7 - localX;
-        }
+        const i = sizeX;
+        sizeX = sizeY;
+        sizeY = i;
     }
-    return localY;
-};
 
-export const getTemplateLocalY = (orientation: number, localX: number, localY: number): number => {
     if(orientation === 0) {
         return localY;
-    }
-    if(orientation === 1) {
+    } else if(orientation === 1) {
         return localX;
+    } else if(orientation === 2) {
+        return 7 - (localY + sizeY) + 1;
+    } else { // 3
+        return 7 - (localX + sizeX) + 1;
     }
-    if(orientation === 2) {
-        return 7 - localY;
-    }
-    return 7 - localX;
 };

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

@@ -14,24 +14,24 @@ const openHouse = (player: Player): void => {
     const house = new House();
 
     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 parlor0 = new Room('parlor');
+    const parlor90 = new Room('parlor', 1);
+    const parlor180 = new Room('parlor', 2);
+    const parlor270 = 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 === 5 && y === 6) {
-                house.rooms[0][x][y] = firstParlor;
+                house.rooms[0][x][y] = parlor0;
+            } else if(x === 6 && y === 7) {
+                house.rooms[0][x][y] = parlor90;
             } else if(x === 7 && y === 6) {
-                house.rooms[0][x][y] = secondParlor;
+                house.rooms[0][x][y] = parlor180;
             } else if(x === 6 && y === 5) {
-                house.rooms[0][x][y] = thirdParlor;
-            } else if(x === 6 && y === 7) {
-                house.rooms[0][x][y] = fourthParlor;
+                house.rooms[0][x][y] = parlor270;
             } else {
                 house.rooms[0][x][y] = emptySpace;
             }
@@ -82,23 +82,16 @@ const doorHotspot = async (objectInteraction: ObjectInteractionAction): Promise<
         return;
     }
 
-    const objectLocalX = position.x % 8;
-    const objectLocalY = position.y % 8;
-
     // Standard home outer door ids: closed[13100, 13101], open[13102, 13103]
 
     player.personalInstance.spawnGameObject({
         x: position.x,
         y: position.y,
         level: position.level,
         orientation: object.orientation,
-        objectId: 13103,
+        objectId: 13100,
         type: object.type
     });
-
-    player.sendMessage(`Template Local = ${getTemplateRotatedX(object.orientation, objectLocalX, objectLocalY)},${getTemplateRotatedY(object.orientation, objectLocalX, objectLocalY)}`);
-
-    player.sendMessage(`Object Local ${objectLocalX},${objectLocalY} - rotation ${object.orientation}`);
 };