Add:

Spencer Carlson · Spencer Carlson · commit 3d6b539eb54e · 2021-06-23T15:22:16.000-07:00
Witch's Potion quest.
Optional QuestRequirement for NPC drops.
NPCs required to complete quest (Betty, Hetty in Port Sarim, rats).

Modify:
DropTable to be an array of objects instead of an array of arrays
diff --git a/data/config/items/equipment/hats.json b/data/config/items/equipment/hats.json
@@ -0,0 +1,26 @@
+{
+    "rs:wizard_hat_(blue)": {
+        "game_id": 579,
+        "weight": 0.453,
+        "equipment_data": {
+            "offensive_bonuses": {
+                "magic": 2
+            },
+            "skill_bonuses": {
+                "magic": 2
+            }
+        }
+    },
+    "rs:wizard_hat_(black)": {
+        "game_id": 1017,
+        "weight": 0.453,
+        "equipment_data": {
+            "offensive_bonuses": {
+                "magic": 2
+            },
+            "skill_bonuses": {
+                "magic": 2
+            }
+        }
+    }
+}
diff --git a/data/config/items/quests/witchs-potions.json b/data/config/items/quests/witchs-potions.json
@@ -0,0 +1,7 @@
+{
+    "rs:rats_tail": {
+        "game_id": 300,
+        "tradable": false,
+        "weight": 0.003
+    }
+}
diff --git a/data/config/items/skills/cooking.json b/data/config/items/skills/cooking.json
@@ -0,0 +1,11 @@
+{
+    "rs:raw_rat_meat": {
+        "game_id": 2134
+    },
+    "rs:cooked_meat": {
+        "game_id": 2142
+    },
+    "rs:burnt_meat": {
+        "game_id": 2146
+    }
+}
diff --git a/data/config/items/skills/herblore/ingredients.json b/data/config/items/skills/herblore/ingredients.json
@@ -0,0 +1,5 @@
+{
+    "rs:eye_of_newt": {
+        "game_id": 221
+    }
+}
diff --git a/data/config/npc-spawns/portsarim/port-sarim-general.json b/data/config/npc-spawns/portsarim/port-sarim-general.json
@@ -0,0 +1,24 @@
+[
+    {
+        "npc": "rs:betty",
+        "spawn_x": 3012,
+        "spawn_y": 3259,
+        "movement_radius": 5
+    },
+    {
+        "npc": "rs:Giant_rat",
+        "spawn_level": 0,
+        "spawn_x": 2995,
+        "spawn_y": 3191,
+        "movement_radius": 6,
+        "face": "WEST"
+    },
+    {
+        "npc": "rs:Giant_rat_2",
+        "spawn_level": 0,
+        "spawn_x": 2999,
+        "spawn_y": 3194,
+        "movement_radius": 6,
+        "face": "WEST"
+    }
+]
diff --git a/data/config/npc-spawns/rimmington/rimmington.json b/data/config/npc-spawns/rimmington/rimmington.json
@@ -0,0 +1,42 @@
+[
+    {
+        "npc": "rs:hetty",
+        "spawn_x": 2968,
+        "spawn_y": 3205,
+        "spawn_level": 0,
+        "movement_radius": 4,
+        "face": "SOUTH"
+    },
+    {
+        "npc": "rs:rat",
+        "spawn_x": 2953,
+        "spawn_y": 3204,
+        "spawn_level": 0,
+        "movement_radius": 4,
+        "face": "EAST"
+    },
+    {
+        "npc": "rs:rat",
+        "spawn_x": 2955,
+        "spawn_y": 3202,
+        "spawn_level": 0,
+        "movement_radius": 4,
+        "face": "NORTH"
+    },
+    {
+        "npc": "rs:rat",
+        "spawn_x": 2959,
+        "spawn_y": 3204,
+        "spawn_level": 0,
+        "movement_radius": 4,
+        "face": "SOUTH"
+    },
+    {
+        "npc": "rs:rat",
+        "spawn_x": 2958,
+        "spawn_y": 3202,
+        "spawn_level": 0,
+        "movement_radius": 4,
+        "face": "WEST"
+    }
+]
diff --git a/data/config/npcs/general.json b/data/config/npcs/general.json
@@ -0,0 +1,18 @@
+{
+    "rs:rat": {
+        "game_id": 47,
+        "drop_table": [
+            { "itemKey": "rs:rats_tail",           "frequency": "always",   "amount": 1,
+                "amountMax": 1,
+                "questRequirement": {
+                    "questId": "rs:witchs_potion",
+                    "stage": 50
+                }
+            },
+            { "itemKey": "rs:bones", "frequency": "always", "amount": 1 }
+        ],
+        "skills": {
+            "hitpoints": 1
+        }
+    }
+}
diff --git a/data/config/npcs/port-sarim.json b/data/config/npcs/port-sarim.json
@@ -0,0 +1,19 @@
+{
+    "rs:betty": {
+        "game_id": 583
+    },
+    "rs:Giant_rat": {
+        "game_id": 86,
+        "drop_table": [
+            { "itemKey": "rs:bones", "frequency": "always", "amount": 1 },
+            { "itemKey": "rs:raw_rat_meat", "frequency": "always", "amount": 1 }
+        ]
+    },
+    "rs:Giant_rat_2": {
+        "game_id": 4924,
+        "drop_table": [
+            { "itemKey": "rs:bones", "frequency": "always", "amount": 1 },
+            { "itemKey": "rs:raw_rat_meat", "frequency": "always", "amount": 1 }
+        ]
+    }
+}
diff --git a/data/config/npcs/rimmington.json b/data/config/npcs/rimmington.json
@@ -0,0 +1,5 @@
+{
+    "rs:hetty": {
+        "game_id": 307
+    }
+}
diff --git a/data/config/shops/portsarim/bettys-magic-emporium.json b/data/config/shops/portsarim/bettys-magic-emporium.json
@@ -0,0 +1,20 @@
+{
+    "rs:bettys_magic_emporium": {
+        "name": "Betty's Magic Emporium",
+        "shop_buy_rate": 0.60,
+        "rate_modifier": 0.01,
+        "stock": [
+            [ "rs:air_rune", 5000 ],
+            [ "rs:earth_rune", 5000 ],
+            [ "rs:fire_rune", 5000 ],
+            [ "rs:water_rune", 5000 ],
+            [ "rs:body_rune", 5000 ],
+            [ "rs:mind_rune", 5000 ],
+            [ "rs:eye_of_newt", 300 ],
+            [ "rs:death_rune", 250 ],
+            [ "rs:chaos_rune", 250 ],
+            [ "rs:wizard_hat_(black)", 1 ],
+            [ "rs:wizard_hat_(blue)", 1 ]
+        ]
+    }
+}
diff --git a/src/game-engine/config/npc-config.ts b/src/game-engine/config/npc-config.ts
@@ -4,6 +4,7 @@ import { filestore } from '@engine/game-server';
 import _ from 'lodash';
 import { NpcConfig } from '@runejs/filestore';
 import { logger } from '@runejs/core';
+import { QuestRequirement } from '@engine/world/action';
 
 
 export interface NpcSkills {
@@ -26,7 +27,13 @@ export interface NpcCombatAnimations {
     death?: number;
 }
 
-export type DropTable = [ [ string, string, number, number? ] ];
+export interface DropTable {
+    itemKey: string;
+    frequency: string;
+    amount?: number;
+    amountMax?: number;
+    questRequirement?: QuestRequirement;
+}
 
 export interface NpcPresetConfiguration {
     [key: string]: NpcServerConfig;
@@ -52,7 +59,7 @@ export interface NpcServerConfig {
         suffix: string;
     } & NpcServerConfig];
     animations?: NpcCombatAnimations;
-    drop_table?: DropTable;
+    drop_table?: DropTable[];
     metadata: { [key: string]: unknown };
 }
 
@@ -69,7 +76,7 @@ export class NpcDetails extends NpcConfig {
     offensiveStats?: OffensiveStats;
     defensiveStats?: DefensiveBonuses;
     combatAnimations?: NpcCombatAnimations;
-    dropTable?: DropTable;
+    dropTable?: DropTable[] = [];
     metadata: { [key: string]: unknown } = {};
 
     public constructor(defaultValues: { [key: string]: any }) {
@@ -102,8 +109,10 @@ export function translateNpcServerConfig(npcKey: string, config: NpcServerConfig
     });
 }
 
-export async function loadNpcConfigurations(path: string): Promise<{ npcs: { [key: string]: NpcDetails };
-    npcIds: { [key: number]: string }; npcPresets: NpcPresetConfiguration; }> {
+export async function loadNpcConfigurations(path: string): Promise<{
+    npcs: { [key: string]: NpcDetails };
+    npcIds: { [key: number]: string }; npcPresets: NpcPresetConfiguration;
+}> {
     const npcIds: { [key: number]: string } = {};
     const npcs: { [key: string]: NpcDetails } = {};
     let npcPresets: NpcPresetConfiguration = {};
@@ -113,19 +122,19 @@ export async function loadNpcConfigurations(path: string): Promise<{ npcs: { [ke
     files.forEach(npcConfigs => {
         const npcKeys = Object.keys(npcConfigs);
         npcKeys.forEach(key => {
-            if(key === 'presets') {
+            if (key === 'presets') {
                 npcPresets = { ...npcPresets, ...npcConfigs[key] };
             } else {
                 const npcConfig = npcConfigs[key] as NpcServerConfig;
-                if(!isNaN(npcConfig.game_id)) {
+                if (!isNaN(npcConfig.game_id)) {
                     npcIds[npcConfig.game_id] = key;
                     npcs[key] = {
                         ...translateNpcServerConfig(key, npcConfig),
                         ...filestore.configStore.npcStore.getNpc(npcConfig.game_id)
                     };
                 }
-                if(npcConfig.variations) {
-                    for(const variation of npcConfig.variations) {
+                if (npcConfig.variations) {
+                    for (const variation of npcConfig.variations) {
                         try {
                             const subKey = key + ':' + variation.suffix;
                             const baseItem = JSON.parse(JSON.stringify({
@@ -139,7 +148,7 @@ export async function loadNpcConfigurations(path: string): Promise<{ npcs: { [ke
                             }));
                             npcIds[variation.game_id] = subKey;
                             npcs[subKey] = _.merge(baseItem, subBaseItem);
-                        } catch(error) {
+                        } catch (error) {
                             logger.error(`Error registering npc variant ${key}_${variation.suffix}`);
                             logger.error(error);
                         }
diff --git a/src/game-engine/world/action/widget-interaction.action.ts b/src/game-engine/world/action/widget-interaction.action.ts
@@ -57,6 +57,10 @@ const widgetActionPipe = (player: Player, widgetId: number, childId: number, opt
 
     // Find all item on item action plugins that match this action
     let matchingHooks = getActionHooks<WidgetInteractionActionHook>('widget_interaction').filter(plugin => {
+        if(!plugin.widgetIds) {
+            return false;
+        }
+
         if(!questHookFilter(player, plugin)) {
             return false;
         }
@@ -72,7 +76,6 @@ const widgetActionPipe = (player: Player, widgetId: number, childId: number, opt
         if(plugin.childIds !== undefined) {
             return advancedNumberHookFilter(plugin.childIds, childId);
         }
-
         return true;
     });
 
diff --git a/src/game-engine/world/actor/dialogue.ts b/src/game-engine/world/actor/dialogue.ts
@@ -504,7 +504,6 @@ async function runDialogueAction(player: Player, dialogueAction: string | Dialog
         }
     } else if(dialogueAction.type === 'SUBTREE') {
         // Dialogue sub-tree.
-
         const action = (dialogueAction as SubDialogueTreeAction);
 
         if(dialogueAction.tag === tag) {
@@ -562,15 +561,16 @@ async function runDialogueAction(player: Player, dialogueAction: string | Dialog
                 player.outgoingPackets.setWidgetPlayerHead(widgetId, 0);
                 player.outgoingPackets.updateWidgetString(widgetId, 1, player.username);
             }
-
             player.outgoingPackets.playWidgetAnimation(widgetId, 0, animation);
 
             for(let i = 0; i < lines.length; i++) {
                 player.outgoingPackets.updateWidgetString(widgetId, 2 + i, lines[i]);
             }
+
         }
     }
 
+
     if(tag === undefined && widgetId) {
         const permanent = additionalOptions?.permanent || false;
 
@@ -582,6 +582,7 @@ async function runDialogueAction(player: Player, dialogueAction: string | Dialog
                 multi: false
             });
 
+
             const widgetClosedEvent = await player.interfaceState.widgetClosed('chatbox');
             if(widgetClosedEvent.data !== undefined) {
                 if(isOptions && typeof widgetClosedEvent.data === 'number') {
@@ -598,7 +599,6 @@ async function runDialogueAction(player: Player, dialogueAction: string | Dialog
             }
         }
     }
-
     return tag;
 }
 
diff --git a/src/game-engine/world/actor/npc/npc.ts b/src/game-engine/world/actor/npc/npc.ts
diff --git a/src/game-engine/world/actor/player/player.ts b/src/game-engine/world/actor/player/player.ts
diff --git a/src/game-engine/world/config/item-ids.ts b/src/game-engine/world/config/item-ids.ts
diff --git a/src/plugins/npcs/port-sarim/betty.plugin.ts b/src/plugins/npcs/port-sarim/betty.plugin.ts
diff --git a/src/plugins/quests/witchs-potion-quest.plugin.ts b/src/plugins/quests/witchs-potion-quest.plugin.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "rs:eye_of_newt": {
 +        "game_id": 221
 +    }
 +}