[DRAFT] Quest: Romeo & Juliet

data/config/items/quests/romeo-and-juliet.json

@@ -0,0 +1,8 @@
+{
+    "rs:juliet_letter": {
+        "game_id": 755,
+        "tradable": false,
+        "examine": "A message from Juliet to Romeo.",
+        "weight": 0.02
+    }
+}

data/config/npc-spawns/varrock/varrock-general.json

@@ -35,6 +35,58 @@
         "spawn_y": 3424,
         "movement_radius": 4
     },
+    {
+        "npc": "rs:draul_leptoc",
+        "spawn_x": 3162,
+        "spawn_y": 3435,
+        "movement_radius": 4
+    },
+    {
+        "npc": "rs:father_lawrence",
+        "spawn_x": 3254,
+        "spawn_y": 3485,
+        "movement_radius": 2
+    },
+    {
+        "npc": "rs:martina_scorsby",
+        "spawn_x": 3256,
+        "spawn_y": 3481,
+        "movement_radius": 0,
+        "face": "NORTH"
+    },
+    {
+        "npc": "rs:jeremy_clerksin",
+        "spawn_x": 3253,
+        "spawn_y": 3477,
+        "movement_radius": 0,
+        "face": "NORTH"
+    },
+    {
+        "npc": "rs:apothecary",
+        "spawn_x": 3196,
+        "spawn_y": 3404,
+        "movement_radius": 3
+    },
+    {
+        "npc": "rs:man",
+        "spawn_x": 3153,
+        "spawn_y": 3429,
+        "movement_radius": 4
+    },
+    {
+        "npc": "rs:phillipa",
+        "spawn_x": 3163,
+        "spawn_y": 3430,
+        "spawn_level": 1,
+        "movement_radius": 5
+    },
+    {
+        "npc": "rs:juliet",
+        "spawn_x": 3158,
+        "spawn_y": 3425,
+        "spawn_level": 1,
+        "movement_radius": 1
+    },
     {
         "npc": "rs:varrock_shop_keeper",
         "spawn_x": 3214,

data/config/npcs/varrock.json

@@ -29,6 +29,33 @@
     "rs:romeo": {
         "game_id": 639
     },
+    "rs:draul_leptoc": {
+        "game_id": 3324
+    },
+    "rs:phillipa": {
+        "game_id": 3325
+    },
+    "rs:juliet": {
+        "game_id": 3323,
+        "variations": [
+            {
+                "suffix": "visible",
+                "game_id": 637
+            }
+        ]
+    },
+    "rs:apothecary": {
+        "game_id": 638
+    },
+    "rs:father_lawrence": {
+        "game_id": 640
+    },
+    "rs:martina_scorsby": {
+        "game_id": 3326
+    },
+    "rs:jeremy_clerksin": {
+        "game_id": 3327
+    },
     "rs:varrock_shop_keeper": {
         "game_id": 520
     },

data/config/widgets.json5

@@ -87,5 +87,6 @@
         christmas: 23,
         killcount: 24
     },
-    whatWouldYouLikeToSpin: 459
+    whatWouldYouLikeToSpin: 459,
+    fade: 115
 }

src/game-engine/config/index.ts

@@ -40,7 +40,7 @@ export let skillGuides: SkillGuide[] = [];
 export let xteaRegions: { [key: number]: XteaRegion };
 
 export const musicRegionMap = new Map<number, number>();
-export const widgets: { [key: string]: any } = require('../../../data/config/widgets.json5');
+export const widgets = require('../../../data/config/widgets.json5');
 
 export async function loadCoreConfigurations(): Promise<void> {
     xteaRegions = await loadXteaRegionFiles('data/config/xteas');

src/game-engine/config/minimap-state.ts

@@ -0,0 +1,4 @@
+export enum MinimapState {
+    NORMAL = 0,
+    BLACK = 2
+}

src/game-engine/config/quest-config.ts

@@ -2,7 +2,6 @@ import { Player } from '@engine/world/actor/player/player';
 import { Npc } from '@engine/world/actor/npc/npc';
 import { npcInteractionActionHandler } from '@engine/world/action/npc-interaction.action';
 import { logger } from '@runejs/core';
-import { handleTutorial } from '@plugins/quests/goblin-diplomacy-tutorial/goblin-diplomacy-quest.plugin';
 
 
 export type QuestKey = number | 'complete';
@@ -12,7 +11,7 @@ export type QuestStageHandler = {
 };
 
 export type QuestDialogueHandler = {
-    [key in QuestKey]?: (player: Player, npc: Npc) => void | Promise<void>;
+    [key in QuestKey]?: ((player: Player, npc: Npc) => void | Promise<void>) | number;
 };
 
 export type QuestJournalHandler = {
@@ -45,20 +44,19 @@ export class PlayerQuest {
 export function questDialogueActionFactory(questId: string, npcDialogueHandler: QuestDialogueHandler): npcInteractionActionHandler {
     return async({ player, npc }) => {
         const quest = player.getQuest(questId);
-        if(!quest) {
-            return;
+        const progress = quest.progress;
+
+        let dialogueHandler = npcDialogueHandler[progress];
+        if (dialogueHandler != null && typeof dialogueHandler === 'number') {
+            dialogueHandler = npcDialogueHandler[dialogueHandler]
         }
 
-        const progress = quest.progress;
-        const dialogueHandler = npcDialogueHandler[progress];
-        if(dialogueHandler) {
+        if (dialogueHandler != null && typeof dialogueHandler === 'function') {
             try {
                 await dialogueHandler(player, npc);
             } catch(e) {
                 logger.error(e);
             }
-
-            await handleTutorial(player);
         }
     };
 }

src/game-engine/net/inbound-packets/walk-packet.js

@@ -1,6 +1,11 @@
 const walkPacket = (player, packet) => {
     const { buffer, packetSize, packetId } = packet;
 
+    // Don't add to the walking queue if busy. If this poses problems, feel free to move it somewhere else.
+    if (player.busy) {
+        return;
+    }
+
     let size = packetSize;
     if(packetId === 236) {
         size -= 14;

src/game-engine/net/outbound-packets.ts

@@ -11,6 +11,7 @@ import { Npc } from '@engine/world/actor/npc/npc';
 import { stringToLong } from '@engine/util/strings';
 import { LandscapeObject } from '@runejs/filestore';
 import { xteaRegions } from '@engine/config';
+import { MinimapState } from '@engine/config/minimap-state';
 import { world } from '@engine/game-server';
 import { ConstructedChunk, ConstructedRegion } from '@engine/world/map/region';
 
@@ -51,6 +52,12 @@ export class OutboundPackets {
         this.queue(packet);
     }
 
+    public setMinimapState(minimapState: MinimapState): void {
+        const packet = new Packet(235);
+        packet.put(minimapState);
+        this.queue(packet);
+    }
+
     public updateSocialSettings(): void {
         const packet = new Packet(196);
         packet.put(this.player.settings.publicChatMode || 0);
@@ -232,16 +239,6 @@ export class OutboundPackets {
         this.queue(packet);
     }
 
-    // Text dialogs = 356, 359, 363, 368, 374
-    // Item dialogs = 519
-    // Statements (no click to continue) = 210, 211, 212, 213, 214
-    public showChatboxWidget(widgetId: number): void {
-        const packet = new Packet(208);
-        packet.put(widgetId, 'SHORT');
-
-        this.queue(packet);
-    }
-
     public setWidgetNpcHead(widgetId: number, childId: number, modelId: number): void {
         const packet = new Packet(160);
         packet.put(modelId, 'SHORT', 'LITTLE_ENDIAN');
@@ -298,11 +295,11 @@ export class OutboundPackets {
         this.queue(packet);
     }
 
-    public setWidgetModelRotationAndZoom(widgetId: number, childId: number, rotationX: number, rotationY: number, zoom: number): void {
+    public setWidgetModelRotationAndZoom(widgetId: number, childId: number, rotationY: number, rotationX: number, zoom: number): void {
         const packet = new Packet(142);
-        packet.put(rotationX, 'SHORT');
-        packet.put(zoom, 'SHORT', 'LITTLE_ENDIAN');
         packet.put(rotationY, 'SHORT');
+        packet.put(zoom, 'SHORT', 'LITTLE_ENDIAN');
+        packet.put(rotationX, 'SHORT');
         packet.put(widgetId << 16 | childId, 'INT', 'LITTLE_ENDIAN');
 
         this.queue(packet);
@@ -487,7 +484,24 @@ export class OutboundPackets {
         this.queue(packet);
     }
 
-    public showChatDialogue(widgetId: number): void {
+    /**
+     * Show or replace dialogue in the chatbox slot, resetting all the other slots client-side
+     * This widget will close when walking
+     * @param widgetId The widget ID
+     */
+    public showChatboxWidget(widgetId: number): void {
+        const packet = new Packet(208);
+        packet.put(widgetId, 'SHORT');
+
+        this.queue(packet);
+    }
+
+    /**
+     * Show permanent widget in the dialogue slot that preserves all widgets, even previously opened chatbox widgets
+     * This widget will NOT close when walking
+     * @param widgetId The widget ID
+     */
+    public showPermanentDialogueWidget(widgetId: number): void {
         const packet = new Packet(185);
         packet.put(widgetId, 'SHORT');
         this.queue(packet);