Merge branch 'develop' into feature/construction

Author: Tynarus

package-lock.json

@@ -35,7 +35,7 @@
         "bigi": "^1.4.2",
         "js-yaml": "^3.13.1",
         "json5": "^2.1.3",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.21",
         "quadtree-lib": "^1.0.9",
         "rxjs": "^7.0.0",
         "source-map-support": "^0.5.19",

package.json

@@ -1,4 +1,8 @@
-const characterDesignPacket = (player, packet) => {
+import { Player } from '@engine/world/actor/player/player';
+import { PacketData } from '@engine/net/inbound-packets';
+
+
+const characterDesignPacket = (player: Player, packet: PacketData) => {
     const { buffer } = packet;
 
     // @TODO verify validity of selections
@@ -32,7 +36,7 @@ const characterDesignPacket = (player, packet) => {
     };
 
     player.updateFlags.appearanceUpdateRequired = true;
-    player.player.interfaceState.closeAllSlots();
+    player.interfaceState.closeAllSlots();
 };
 
 export default {

src/game-engine/net/inbound-packets/character-design-packet.js renamed to src/game-engine/net/inbound-packets/character-design-packet.ts

@@ -131,7 +131,9 @@ export class TaskExecutor<T> {
         this.running = false;
         this.intervalSubscription?.unsubscribe();
 
-        await this.task?.onComplete(this, this.iteration);
+        if(this.task?.onComplete) {
+            await this.task.onComplete(this, this.iteration);
+        }
 
         this.session = null;
     }

src/game-engine/world/action/hooks/task.ts

@@ -15,6 +15,7 @@ import { Player } from '@engine/world/actor/player/player';
 import { ActionCancelType, ActionPipeline } from '@engine/world/action';
 import { LandscapeObject } from '@runejs/filestore';
 
+
 /**
  * Handles an actor within the game world.
  */
@@ -93,7 +94,6 @@ export abstract class Actor {
      */
     public async waitForPathing(target: Position | LandscapeObject): Promise<void>;
     public async waitForPathing(target: Position | LandscapeObject): Promise<void> {
-        console.log(target);
         if(this.position.withinInteractionDistance(target)) {
             return;
         }
@@ -131,6 +131,10 @@ export abstract class Actor {
     }
 
     public async moveBehind(target: Actor): Promise<boolean> {
+        if(this.position.level !== target.position.level) {
+            return false;
+        }
+
         const distance = Math.floor(this.position.distanceBetween(target.position));
         if(distance > 16) {
             this.clearFaceActor();
@@ -153,6 +157,10 @@ export abstract class Actor {
     }
 
     public async moveTo(target: Actor): Promise<boolean> {
+        if(this.position.level !== target.position.level) {
+            return false;
+        }
+
         const distance = Math.floor(this.position.distanceBetween(target.position));
         if(distance > 16) {
             this.clearFaceActor();
@@ -172,7 +180,11 @@ export abstract class Actor {
         this.metadata['following'] = target;
 
         this.moveBehind(target);
-        const subscription = target.walkingQueue.movementEvent.subscribe(async () => this.moveBehind(target));
+        const subscription = target.walkingQueue.movementEvent.subscribe(() => {
+            if(!this.moveBehind(target)) {
+                this.actionsCancelled.next(null);
+            }
+        });
 
         this.actionsCancelled.pipe(
             filter(type => type !== 'pathing-movement'),

src/game-engine/world/actor/actor.ts

@@ -654,6 +654,8 @@ export class Player extends Actor {
         const newChunk = world.chunkManager.getChunkForWorldPosition(newPosition);
 
         if(!oldChunk.equals(newChunk)) {
+            oldChunk.removePlayer(this);
+            newChunk.addPlayer(this);
             this.metadata['updateChunk'] = { newChunk, oldChunk };
 
             if(updateRegion) {

src/game-engine/world/actor/player/player.ts

@@ -97,7 +97,8 @@ export function syncTrackedActors(packet: Packet, playerPosition: Position, appe
         }
 
         if(exists && nearbyActors.findIndex(m => m.actor.equals(trackedActor)) !== -1
-                && trackedActor.position.withinViewDistance(playerPosition)) {
+                && trackedActor.position.withinViewDistance(playerPosition)
+                && !trackedActor.metadata['teleporting']) {
             appendMovement(trackedActor, packet);
             appendUpdateMaskData(trackedActor);
             existingTrackedActors.push(trackedActor);

src/game-engine/world/actor/player/sync/actor-sync.ts

@@ -1,10 +1,11 @@
-import { buttonActionHandler } from '@engine/world/action/button.action';
+import { ButtonAction, buttonActionHandler, ButtonActionHook } from '@engine/world/action/button.action';
 import { Player } from '@engine/world/actor/player/player';
 import { Position } from '@engine/world/position';
 import { animationIds } from '@engine/world/config/animation-ids';
 import { soundIds } from '@engine/world/config/sound-ids';
 import { gfxIds } from '@engine/world/config/gfx-ids';
 import { loopingEvent } from '@engine/game-server';
+import { TaskExecutor } from '@engine/world/action';
 
 enum Teleports {
     Home = 591,
@@ -22,57 +23,61 @@ const buttonIds: number[] = [
     591, // Home Teleport
 ];
 
-function homeTeleport(player: Player): void {
-    let elapsedTicks = 0;
+function homeTeleport(player: Player, elapsedTicks: number): boolean {
+    if (elapsedTicks === 0) {
+        player.playAnimation(animationIds.homeTeleportDraw);
+        player.playGraphics({ id: gfxIds.homeTeleportDraw, delay: 0, height: 0 });
+        player.outgoingPackets.playSound(soundIds.homeTeleportDraw, 10);
+    } else if (elapsedTicks === 7) {
+        player.playAnimation(animationIds.homeTeleportSit);
+        player.playGraphics({ id: gfxIds.homeTeleportFullDrawnCircle, delay: 0, height: 0 });
+        player.outgoingPackets.playSound(soundIds.homeTeleportSit, 10);
+    } else if (elapsedTicks === 12) {
+        player.playAnimation(animationIds.homeTeleportPullOutAndReadBook);
+        player.playGraphics({ id: gfxIds.homeTeleportPullOutBook, delay: 0, height: 0 });
+        player.outgoingPackets.playSound(soundIds.homeTeleportPullOutBook, 10);
+    } else if (elapsedTicks === 16) {
+        player.playAnimation(animationIds.homeTeleportReadBookAndGlowCircle);
+        player.playGraphics({ id: gfxIds.homeTeleportCircleGlow, delay: 0, height: 0 });
+        player.outgoingPackets.playSound(soundIds.homeTeleportCircleGlowAndTeleport, 10);
+    } else if (elapsedTicks === 20) {
+        player.playAnimation(animationIds.homeTeleport);
+        player.playGraphics({ id: gfxIds.homeTeleport, delay: 0, height: 0 });
+    } else if (elapsedTicks === 22) {
+        player.teleport(new Position(3218, 3218));
+        return true;
+    }
 
-    const loop = loopingEvent({ player });
-    loop.event.subscribe(() => {
-        if (elapsedTicks === 0) {
-            player.playAnimation(animationIds.homeTeleportDraw);
-            player.playGraphics({ id: gfxIds.homeTeleportDraw, delay: 0, height: 0 });
-            player.outgoingPackets.playSound(soundIds.homeTeleportDraw, 10);
-        }
-        if (elapsedTicks === 7) {
-            player.playAnimation(animationIds.homeTeleportSit);
-            player.playGraphics({ id: gfxIds.homeTeleportFullDrawnCircle, delay: 0, height: 0 });
-            player.outgoingPackets.playSound(soundIds.homeTeleportSit, 10);
-        }
-        if (elapsedTicks === 12) {
-            player.playAnimation(animationIds.homeTeleportPullOutAndReadBook);
-            player.playGraphics({ id: gfxIds.homeTeleportPullOutBook, delay: 0, height: 0 });
-            player.outgoingPackets.playSound(soundIds.homeTeleportPullOutBook, 10);
-        }
-        if (elapsedTicks === 16) {
-            player.playAnimation(animationIds.homeTeleportReadBookAndGlowCircle);
-            player.playGraphics({ id: gfxIds.homeTeleportCircleGlow, delay: 0, height: 0 });
-            player.outgoingPackets.playSound(soundIds.homeTeleportCircleGlowAndTeleport, 10);
-        }
-        if (elapsedTicks === 20) {
-            player.playAnimation(animationIds.homeTeleport);
-            player.playGraphics({ id: gfxIds.homeTeleport, delay: 0, height: 0 });
-        }
-        if (elapsedTicks === 22) {
-            player.teleport(new Position(3218, 3218));
-            loop.cancel();
-            return;
-        }
-        elapsedTicks++;
-    });
+    return false;
 }
 
-export const handler: buttonActionHandler = (details) => {
-    const { player, buttonId } = details;
+export const activate = (task: TaskExecutor<ButtonAction>, elapsedTicks: number = 0) => {
+    const { player, buttonId } = task.actionData;
+
+    let completed: boolean = false;
 
     switch (buttonId) {
         case Teleports.Home:
-            homeTeleport(player);
+            completed = homeTeleport(player, elapsedTicks);
             break;
     }
+
+    if(completed) {
+        task.stop();
+    }
 };
 
 export default {
     pluginId: 'rs:magic_teleports',
     hooks: [
-        { type: 'button', widgetId: 192, buttonIds: buttonIds, handler }
+        {
+            type: 'button',
+            widgetId: 192,
+            buttonIds: buttonIds,
+            task: {
+                activate,
+                interval: 1
+            }
+        } as ButtonActionHook
     ]
 };