Merge branch 'develop' into development

Author: src

.gitignore

@@ -22,3 +22,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+/.vs

data/config/xteas/468.json

@@ -0,0 +1,28 @@
+[
+    {
+        "archive": 5,
+        "group": 33,
+        "name_hash": -1155051794,
+        "name": "l29_79",
+        "mapsquare": 7503,
+        "key": [
+            -205505693,
+            -1069477933,
+            -1042446848,
+            -93348110
+        ]
+    },
+    {
+        "archive": 5,
+        "group": 35,
+        "name_hash": -1154396392,
+        "name": "l30_79",
+        "mapsquare": 7759,
+        "key": [
+            -1255219039,
+            -277284099,
+            1886972034,
+            -723091074
+        ]
+    }
+]

src/game-engine/config/index.ts

@@ -19,19 +19,21 @@ 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 {
     loadStrongholdOfSecurityQuizData,
     StrongholdOfSecurityQuiz,
     StrongholdOfSecurityQuizQuestion
 } from '@engine/config/stronghold-of-security-quiz-config';
 import { BookData, loadStrongholdOfSecurityBookData } from '@engine/config/sectioned-book-config';
+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 };
@@ -75,6 +77,8 @@ export async function loadGameConfigurations(): Promise<void> {
     shopMap = await loadShopConfigurations('data/config/shops/');
     skillGuides = await loadSkillGuideConfigurations('data/config/skill-guides/');
     logger.info(`Loaded ${strongholdOfSecurityQuizData.questions.length} Stronghold of Security questions.`);
+
+    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.`);
 }
@@ -180,6 +184,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/net/inbound-packets.ts

@@ -39,14 +39,19 @@ export async function loadPackets(): Promise<Map<number, InboundPacket>> {
 export function handlePacket(player: Player, packetId: number, packetSize: number, buffer: ByteBuffer): boolean {
     const incomingPacket = incomingPackets.get(packetId);
 
-    if (!incomingPacket) {
+    if(!incomingPacket) {
         logger.info(`Unknown packet ${packetId} with size ${packetSize} received.`);
         return false;
     }
 
     new Promise<void>(resolve => {
-        incomingPacket.handler(player, { packetId, packetSize, buffer });
+        try {
+            incomingPacket.handler(player, { packetId, packetSize, buffer });
+        } catch(error) {
+            logger.error(`Error handling inbound packet ${packetId} with size ${packetSize}`);
+            logger.error(error);
+        }
         resolve();
-    }).catch(error => logger.error(`Error handling inbound packet ${packetId} with size ${packetSize}: ${error}`));
+    });
     return true;
 }

src/game-engine/net/inbound-packets/object-interaction-packet.js

@@ -0,0 +1,123 @@
+import { logger } from '@runejs/core';
+
+import { filestore, world } from '@engine/game-server';
+import { Position } from '@engine/world/position';
+import { getVarbitMorphIndex } from '@engine/util/varbits';
+import { PacketData } from '@engine/net/inbound-packets';
+import { Player, Rights } from '@engine/world/actor/player/player';
+
+
+interface ObjectInteractionData {
+    objectId: number;
+    x: number;
+    y: number;
+}
+
+type objectInteractionPacket = (packet: PacketData) => ObjectInteractionData;
+
+
+const option1: objectInteractionPacket = packet => {
+    const { buffer } = packet;
+    const objectId = buffer.get('short', 'u');
+    const y = buffer.get('short', 'u');
+    const x = buffer.get('short', 'u', 'le');
+    return { objectId, x, y };
+};
+
+const option2: objectInteractionPacket = packet => {
+    const { buffer } = packet;
+    const x = buffer.get('short', 'u', 'le');
+    const y = buffer.get('short', 'u', 'le');
+    const objectId = buffer.get('short', 'u', 'le');
+    return { objectId, x, y };
+};
+
+const option3: objectInteractionPacket = packet => {
+    const { buffer } = packet;
+    const y = buffer.get('short', 'u');
+    const objectId = buffer.get('short', 'u');
+    const x = buffer.get('short', 'u');
+    return { objectId, x, y };
+};
+
+const option4: objectInteractionPacket = packet => {
+    const { buffer } = packet;
+    const x = buffer.get('short', 'u', 'le');
+    const objectId = buffer.get('short', 'u', 'le');
+    const y = buffer.get('short', 'u', 'le');
+    return { objectId, x, y };
+};
+
+const option5: objectInteractionPacket = packet => {
+    const { buffer } = packet;
+    const objectId = buffer.get('short', 'u');
+    const y = buffer.get('short', 'u', 'le');
+    const x = buffer.get('short', 'u', 'le');
+    return { objectId, x, y };
+};
+
+
+const objectInteractionPackets: { [key: number]: { packetDef: objectInteractionPacket, index: number } } = {
+    30:  { packetDef: option1, index: 0 },
+    164: { packetDef: option2, index: 1 },
+    183: { packetDef: option3, index: 2 },
+    229: { packetDef: option4, index: 3 },
+    62:  { packetDef: option5, index: 4 },
+};
+
+
+const objectInteractionPacket = (player: Player, packet: PacketData) => {
+    const { packetId } = packet;
+
+    const { objectId, x, y } = objectInteractionPackets[packetId].packetDef(packet);
+    const level = player.position.level;
+    const objectPosition = new Position(x, y, level);
+    const { object: landscapeObject, cacheOriginal } = world.findObjectAtLocation(player, objectId, objectPosition);
+    if(!landscapeObject) {
+        if(player.rights === Rights.ADMIN) {
+            player.sendMessage(`Custom object ${objectId} @[${objectPosition.key}]`);
+        }
+        return;
+    }
+
+    let objectConfig = filestore.configStore.objectStore.getObject(objectId);
+    if (objectConfig.configChangeDest) {
+        let morphIndex = -1;
+        if(objectConfig.varbitId === -1) {
+            if(objectConfig.configId !== -1) {
+                morphIndex = player.metadata['configs'] && player.metadata['configs'][objectConfig.configId] ?
+                    player.metadata['configs'][objectConfig.configId] : 0;
+            }
+        } else {
+            morphIndex = getVarbitMorphIndex(objectConfig.varbitId, player.metadata['configs']);
+        }
+        if(morphIndex !== -1) {
+            objectConfig = filestore.configStore.objectStore.getObject(objectConfig.configChangeDest[morphIndex]);
+        }
+    }
+
+    const actionIdx = objectInteractionPackets[packetId].index;
+    let optionName = `action-${actionIdx + 1}`;
+    if(objectConfig.options && objectConfig.options.length >= actionIdx) {
+        if(!objectConfig.options[actionIdx]) {
+            // Invalid action
+            logger.error(`1: Invalid object ${objectId} option ${actionIdx + 1}, options: ${JSON.stringify(objectConfig.options)}`);
+            return;
+        }
+
+        optionName = objectConfig.options[actionIdx];
+    } else {
+        // Invalid action
+        logger.error(`2: Invalid object ${objectId} option ${actionIdx + 1}, options: ${JSON.stringify(objectConfig.options)}`);
+        return;
+    }
+
+    player.actionPipeline.call('object_interaction', player, landscapeObject, objectConfig, objectPosition, optionName.toLowerCase(), cacheOriginal);
+};
+
+
+export default Object.keys(objectInteractionPackets).map(opcode => ({
+    opcode: parseInt(opcode, 10),
+    size: 6,
+    handler: objectInteractionPacket
+}));

src/game-engine/net/inbound-packets/object-interaction-packet.ts

@@ -1,4 +1,8 @@
-const widgetInteractionPacket = (player, packet) => {
+import { Player } from '@engine/world/actor/player/player';
+import { PacketData } from '@engine/net/inbound-packets';
+
+
+const widgetInteractionPacket = (player: Player, packet: PacketData) => {
     const { buffer } = packet;
     const childId = buffer.get('short');
     const widgetId = buffer.get('short');