Feat/tick queue

data/config/item-spawns/test-area.json

@@ -0,0 +1,10 @@
+[
+    {
+        "item": "rs:bronze_axe",
+        "amount": 1,
+        "spawn_x": 2713,
+        "spawn_y": 9807,
+        "instance": "global",
+        "respawn": 25
+    }
+]

data/config/items/logs.json

@@ -70,10 +70,6 @@
         "extends": "rs:log",
         "game_id": 1513
     },
-    "rs:magic_pyre_logs": {
-        "extends": "rs:log",
-        "game_id": 1513
-    },
     "rs:bark": {
         "game_id": 3239,
         "examine": "Bark from a hollow tree.",

data/config/npc-spawns/test-area/test-shops.json

@@ -0,0 +1,9 @@
+[
+    {
+        "npc": "rs:dromunds_cat",
+        "spawn_x": 2712,
+        "spawn_y": 9806,
+        "movement_radius": 0,
+        "face": "SOUTH"
+    }
+]

data/config/npcs/general.json

@@ -17,5 +17,8 @@
         "skills": {
             "hitpoints": 1
         }
+    },
+    "rs:dromunds_cat": {
+        "game_id": 2140
     }
 }

data/config/scenery-spawns.yaml

@@ -72,3 +72,47 @@
   type: 10
   orientation: 1
   # End lumby castle roof bank construction objects
+  # Test area objects
+- objectId: 1276
+  x: 2711
+  y: 9807
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 1281
+  x: 2710
+  y: 9809
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 1308
+  x: 2711
+  y: 9812
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 1307
+  x: 2711
+  y: 9814
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 1309
+  x: 2710
+  y: 9816
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 1306
+  x: 2711
+  y: 9819
+  level: 0
+  type: 10
+  orientation: 1
+- objectId: 4483
+  x: 2713
+  y: 9805
+  level: 0
+  type: 10
+  orientation: 4
+  # End test area

data/config/shops/test-area/test-shop.json

@@ -0,0 +1,40 @@
+{
+    "rs:test_shop": {
+        "name": "Testing Shop",
+        "shop_sell_rate": 1.0,
+        "shop_buy_rate": 1.0,
+        "rate_modifier": 0.03,
+        "stock": [
+            {
+                "itemKey": "rs:logs",
+                "amount": 100,
+                "restock": 25000
+            },
+            {
+                "itemKey": "rs:oak_logs",
+                "amount": 100,
+                "restock": 25000
+            },
+            {
+                "itemKey": "rs:willow_logs",
+                "amount": 100,
+                "restock": 25000
+            },
+            {
+                "itemKey": "rs:maple_logs",
+                "amount": 100,
+                "restock": 25000
+            },
+            {
+                "itemKey": "rs:yew_logs",
+                "amount": 100,
+                "restock": 25000
+            },
+            {
+                "itemKey": "rs:magic_logs",
+                "amount": 100,
+                "restock": 25000
+            }
+        ]
+    }
+}

package.json

@@ -34,7 +34,13 @@
         "type": "git",
         "url": "git+ssh://[email protected]/runejs/server.git"
     },
-    "keywords": ["runejs", "runescape", "typescript", "game server", "game engine"],
+    "keywords": [
+        "runejs",
+        "runescape",
+        "typescript",
+        "game server",
+        "game engine"
+    ],
     "author": "Tynarus",
     "license": "GPL-3.0",
     "bugs": {
@@ -73,5 +79,6 @@
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.7.3"
-    }
+    },
+    "packageManager": "[email protected]+sha256.e4fc5f94867cd0b492fb0a644f14e7b47c4387bc75d46b56e86db6d0f1a6cb97"
 }

src/engine/action/pipe/task/walk-to-actor-plugin-task.ts

@@ -61,9 +61,9 @@ export class WalkToActorPluginTask<
     /**
      * Executed every tick to check if the player has arrived yet and calls the plugins if so.
      */
-    public execute(): void {
+    public async execute(): Promise<void> {
         // call super to manage waiting for the movement to complete
-        super.execute();
+        await super.execute();
 
         // check if the player has arrived yet
         const other = this.other;

src/engine/action/pipe/task/walk-to-object-plugin-task.ts

@@ -3,6 +3,7 @@ import type { ItemOnObjectAction } from '@engine/action/pipe/item-on-object.acti
 import type { ObjectInteractionAction } from '@engine/action/pipe/object-interaction.action';
 import { ActorLandscapeObjectInteractionTask } from '@engine/task/impl/actor-landscape-object-interaction-task';
 import type { Player } from '@engine/world/actor/player/player';
+import { Position } from '@engine/world/position';
 import type { LandscapeObject } from '@runejs/filestore';
 
 /**
@@ -35,38 +36,49 @@ export class WalkToObjectPluginTask<TAction extends ObjectAction> extends ActorL
     private data: ObjectActionData<TAction>;
 
     constructor(plugins: ObjectActionHook<TAction>[], player: Player, landscapeObject: LandscapeObject, data: ObjectActionData<TAction>) {
+        const rendering = data.objectConfig?.rendering;
+        let sizeX = rendering?.sizeX || 1;
+        let sizeY = rendering?.sizeY || 1;
+
+        // Get the object's facing direction (0-3 maps to WNES array) TODO: verify
+        const face = rendering?.face || 0;
+
+        // If facing East or West, swap X and Y dimensions
+        if (face === 0 || face === 2) {
+            // WEST or EAST
+            [sizeX, sizeY] = [sizeY, sizeX];
+        }
         super(
             player,
             landscapeObject,
             // TODO (jkm) handle object size
             // TODO (jkm) pass orientation instead of size
-            1,
-            1,
+            sizeX,
+            sizeY,
         );
-
         this.plugins = plugins;
         this.data = data;
     }
 
-    /**
-     * Executed every tick to check if the player has arrived yet and calls the plugins if so.
-     */
-    public execute(): void {
-        // call super to manage waiting for the movement to complete
-        super.execute();
-
-        // check if the player has arrived yet
+    protected onObjectReached(): void {
         const landscapeObject = this.landscapeObject;
         const landscapeObjectPosition = this.landscapeObjectPosition;
+
         if (!landscapeObject || !landscapeObjectPosition) {
+            this.stop();
             return;
         }
 
-        // call the relevant plugins
+        // Make the actor face the center of the object
+        const objectCenter = new Position(
+            landscapeObjectPosition.x + Math.floor((this.data.objectConfig?.rendering?.sizeX || 1) / 2),
+            landscapeObjectPosition.y + Math.floor((this.data.objectConfig?.rendering?.sizeY || 1) / 2),
+            landscapeObjectPosition.level,
+        );
+        this.actor.face(objectCenter);
+
         this.plugins.forEach(plugin => {
-            if (!plugin || !plugin.handler) {
-                return;
-            }
+            if (!plugin?.handler) return;
 
             const action = {
                 player: this.actor,

src/engine/net/inbound-packets/walk.packet.ts

@@ -9,18 +9,19 @@ const walkPacket = (player: Player, packet: PacketData) => {
         size -= 14;
     }
 
-    if (!player.canMove()) {
+    // Check if player can move and isn't delayed
+    if (!player.canMove() || player.delayManager.isDelayed()) {
         return;
     }
 
     const totalSteps = Math.floor((size - 5) / 2);
-
     const firstY = buffer.get('short', 'u', 'le');
-    const runSteps = buffer.get('byte') === 1; // @TODO forced running
+    const runSteps = buffer.get('byte') === 1;
     const firstX = buffer.get('short', 'u', 'le');
 
     const walkingQueue = player.walkingQueue;
 
+    // Cancel any weak tasks since movement interrupts them
     player.actionsCancelled.next('manual-movement');
 
     walkingQueue.clear();