From 1cfd58528b0e0eaf2d06d617866f163541400ccd Mon Sep 17 00:00:00 2001
From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com>
Date: Fri, 10 Sep 2021 01:53:53 +0000
Subject: [PATCH] Fix: Taverley Dungeon QA Pass 6

---
 Server/data/configs/item_configs.json | 23 ++++++++++++++++-------
 Server/data/configs/npc_configs.json  |  5 +++++
 Server/data/configs/npc_spawns.json   | 12 ++++++------
 Server/data/configs/shops.json        |  9 +++++++++
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json
index fb8f3f93c..cf4f3d1cd 100644
--- a/Server/data/configs/item_configs.json
+++ b/Server/data/configs/item_configs.json
@@ -44598,11 +44598,12 @@
   {
     "shop_price": "400",
     "ge_buy_limit": "100",
-    "examine": "A sturdy steel lantern casting a bright beam.",
+    "examine": "You need to add a lens before you can use it.",
     "grand_exchange_price": "88",
     "durability": null,
     "name": "Bullseye lantern",
     "low_alchemy": "168",
+    "tradeable": "true",
     "high_alchemy": "252",
     "weight": "1",
     "archery_ticket_price": "0",
@@ -44621,13 +44622,14 @@
     "requirements": "{11,49}",
     "shop_price": "400",
     "ge_buy_limit": "100",
-    "examine": "A sturdy steel lantern casting a bright beam.",
-    "grand_exchange_price": "158",
+    "examine": "You need to add lamp oil before you can use it.",
     "durability": null,
-    "name": "Bullseye lantern",
     "low_alchemy": "168",
     "high_alchemy": "252",
     "weight": "1",
+    "grand_exchange_price": "158",
+    "name": "Bullseye lantern",
+    "tradeable": "true",
     "archery_ticket_price": "0",
     "id": "4546"
   },
@@ -44644,13 +44646,14 @@
     "requirements": "{11,49}",
     "shop_price": "400",
     "ge_buy_limit": "100",
-    "examine": "A sturdy steel lantern casting a bright beam.",
-    "grand_exchange_price": "1345",
+    "examine": "A sturdy steel lantern.",
     "durability": null,
-    "name": "Bullseye lantern",
     "low_alchemy": "168",
     "high_alchemy": "252",
     "weight": "1",
+    "grand_exchange_price": "1345",
+    "name": "Bullseye lantern",
+    "tradeable": "true",
     "archery_ticket_price": "0",
     "id": "4548"
   },
@@ -44670,6 +44673,7 @@
     "durability": null,
     "name": "Bullseye lantern",
     "low_alchemy": "168",
+    "tradeable": "false",
     "high_alchemy": "252",
     "weight": "1",
     "archery_ticket_price": "0",
@@ -139441,5 +139445,10 @@
     "id": "14652",
     "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
     "equipment_slot": "12"
+  },
+  {
+    "examine": "A chunk of rock.",
+    "name": "Rock",
+    "id": "1480"
   }
 ]
\ No newline at end of file
diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json
index 17def98b5..76e6b1a15 100644
--- a/Server/data/configs/npc_configs.json
+++ b/Server/data/configs/npc_configs.json
@@ -274205,5 +274205,10 @@
     "examine": "Nice hat.",
     "name": "Thormac",
     "id": "389"
+  },
+  {
+    "examine": "An evil priest.",
+    "name": "Necrovarus",
+    "id": "1684"
   }
 ]
\ No newline at end of file
diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json
index fd60a350f..f1d0ed544 100644
--- a/Server/data/configs/npc_spawns.json
+++ b/Server/data/configs/npc_spawns.json
@@ -193,7 +193,7 @@
   },
   {
     "npc_id": "61",
-    "loc_data": "{3111, 9747, 0, 1, 5}-{3108, 9747, 0, 1, 5}-{3321,3145,0,1,3}-{3327,3131,0,1,5}-{3322,3143,0,1,3}-{3182,3878,0,1,6}-{3182,3886,0,1,7}-{3182,3888,0,1,5}-{3175,3888,0,1,4}-{3175,3879,0,1,7}-{3174,3879,0,1,3}-{3174,3882,0,1,0}-{3175,3885,0,1,3}-{3172,3876,0,1,2}-{3172,3894,0,1,1}-{3172,3885,0,1,3}-{3165,3886,0,1,3}-{3165,3896,0,1,1}-{3166,3886,0,1,1}-{3164,3893,0,1,4}-{3163,3881,0,1,4}-{3159,3889,0,1,0}-{3213,9890,0,1,5}-{3210,9886,0,1,4}-{3213,9887,0,1,1}-{3207,9880,0,1,0}-{3255,9870,0,1,4}-{3258,9872,0,1,3}-{3261,9870,0,1,4}-{3156,3248,0,1,4}-{3143,3241,0,1,4}-{3156,3249,0,1,4}-{3175,3248,0,1,7}-{3169,3260,0,1,4}-{3171,3254,0,1,5}-{3162,3246,0,1,6}-{3179,3262,0,1,1}-{3162,3226,0,1,1}-{3166,3222,0,1,1}-{3157,3229,0,1,5}-{3168,3222,0,1,4}-{3211,9622,0,1,2}-{3215,9620,0,1,4}-{3212,9618,0,1,3}-{3217,9617,0,1,3}-{3214,9620,0,1,7}-{2541,3189,0,1,3}-{2542,3187,0,1,6}-{2543,3186,0,1,4}-{2545,3183,0,1,3}-{2545,3183,0,1,3}-{2545,3182,0,1,3}-{2543,3183,0,1,0}-{2543,3182,0,1,3}-{2539,3182,0,1,0}"
+    "loc_data": "{2893,9835,0,1,0}-{2895,9828,0,1,0}-{2891,9831,0,1,0}-{3111, 9747, 0, 1, 5}-{3108, 9747, 0, 1, 5}-{3321,3145,0,1,3}-{3327,3131,0,1,5}-{3322,3143,0,1,3}-{3182,3878,0,1,6}-{3182,3886,0,1,7}-{3182,3888,0,1,5}-{3175,3888,0,1,4}-{3175,3879,0,1,7}-{3174,3879,0,1,3}-{3174,3882,0,1,0}-{3175,3885,0,1,3}-{3172,3876,0,1,2}-{3172,3894,0,1,1}-{3172,3885,0,1,3}-{3165,3886,0,1,3}-{3165,3896,0,1,1}-{3166,3886,0,1,1}-{3164,3893,0,1,4}-{3163,3881,0,1,4}-{3159,3889,0,1,0}-{3213,9890,0,1,5}-{3210,9886,0,1,4}-{3213,9887,0,1,1}-{3207,9880,0,1,0}-{3255,9870,0,1,4}-{3258,9872,0,1,3}-{3261,9870,0,1,4}-{3156,3248,0,1,4}-{3143,3241,0,1,4}-{3156,3249,0,1,4}-{3175,3248,0,1,7}-{3169,3260,0,1,4}-{3171,3254,0,1,5}-{3162,3246,0,1,6}-{3179,3262,0,1,1}-{3162,3226,0,1,1}-{3166,3222,0,1,1}-{3157,3229,0,1,5}-{3168,3222,0,1,4}-{3211,9622,0,1,2}-{3215,9620,0,1,4}-{3212,9618,0,1,3}-{3217,9617,0,1,3}-{3214,9620,0,1,7}-{2541,3189,0,1,3}-{2542,3187,0,1,6}-{2543,3186,0,1,4}-{2545,3183,0,1,3}-{2545,3183,0,1,3}-{2545,3182,0,1,3}-{2543,3183,0,1,0}-{2543,3182,0,1,3}-{2539,3182,0,1,0}"
   },
   {
     "npc_id": "62",
@@ -257,7 +257,7 @@
   },
   {
     "npc_id": "84",
-    "loc_data": "{2861,9766,0,1,7}-{2875,9776,0,1,3}-{2869,9782,0,1,3}-{2856,9779,0,1,3}-{2867,9773,0,1,0}-{2863,9780,0,1,4}-{2858,9775,0,1,4}-{2700,9481,0,0,5}-{2729,9483,0,0,5}"
+    "loc_data": "{2875,9776,0,1,0}-{2862,9776,0,1,0}-{2860,9762,0,1,0}-{2854,9780,0,1,0}-{2866,9781,0,1,0}-{2700,9481,0,0,5}-{2729,9483,0,0,5}"
   },
   {
     "npc_id": "86",
@@ -5221,7 +5221,7 @@
   },
   {
     "npc_id": "3021",
-    "loc_data": "{2815,3466,0,0,3}-{2859,3431,0,0,0}-{2933,3434,0,1,4}-{3182,3354,0,0,0}-{3087,3352,0,0,0}-{3065,3255,0,0,0}-{3192,3229,0,0,0}-{3232,3459,0,0,3}-{3451,3475,0,0,6}-{2812,3333,0,1,4}-{3007,3371,0,1,2}-{3053,3304,0,0,1}-{2663,3374,0,0,4}-{3603,3529,0,0,6}-{2474,3446,0,1,4}-{2611,3859,0,0,6}-{2434,3415,0,1,3}-{2764,3210,0,1,1}-{2940,3225,0,0,6}-{2614,3226,0,0,4}-{3315,3205,0,0,6}-{2827,3692,0,1,5}-{2666,3521,0,1,4}-{2491,3177,0,0,1}"
+    "loc_data": "{2815,3466,0,0,3}-{2859,3431,0,0,0}-{2933,3434,0,1,4}-{3182,3354,0,0,0}-{3087,3352,0,0,0}-{3065,3255,0,0,0}-{3192,3229,0,0,0}-{3232,3459,0,0,3}-{3451,3475,0,0,6}-{2812,3333,0,1,4}-{3007,3371,0,1,2}-{3053,3304,0,0,1}-{2663,3374,0,0,4}-{3603,3529,0,0,6}-{2474,3446,0,1,4}-{2611,3859,0,0,6}-{2434,3415,0,1,3}-{2764,3210,0,1,1}-{2940,3225,0,0,6}-{2614,3226,0,0,4}-{3315,3205,0,0,6}-{2666,3521,0,1,4}-{2491,3177,0,0,1}"
   },
   {
     "npc_id": "3029",
@@ -6857,15 +6857,15 @@
   },
   {
     "npc_id": "4702",
-    "loc_data": "{3084,9957,0,1,6}-{2712,9480,0,0,5}"
+    "loc_data": "{2869,9775,0,1,0}-{2853,9775,0,1,0}-{3084,9957,0,1,6}-{2712,9480,0,0,5}"
   },
   {
     "npc_id": "4703",
-    "loc_data": "{3092,9958,0,1,2}"
+    "loc_data": "{2857,9774,0,1,0}-{2860,9781,0,1,0}-{3092,9958,0,1,2}"
   },
   {
     "npc_id": "4704",
-    "loc_data": "{3160,5521,0,1,1}"
+    "loc_data": "{2863,9767,0,1,0}-{2871,9782,0,1,0}-{3160,5521,0,1,1}"
   },
   {
     "npc_id": "4705",
diff --git a/Server/data/configs/shops.json b/Server/data/configs/shops.json
index f1efa98f5..5dc6e0263 100644
--- a/Server/data/configs/shops.json
+++ b/Server/data/configs/shops.json
@@ -2140,5 +2140,14 @@
     "id": "241",
     "title": "Wishing Well",
     "stock": "{12204,10}-{12207,10}-{12210,0}-{12213,0}-{12216,0}-{12219,0}-{12222,0}-{12183,65000}-{12155,5000}"
+  },
+  {
+    "npcs": "4965",
+    "high_alch": "0",
+    "currency": "995",
+    "general_store": "false",
+    "id": "242",
+    "title": "Leprechaun Larry's Farming Supplies.",
+    "stock": "{5341,10}-{5343,10}-{5329,10}-{952,10}-{5325,10}-{5331,10}-{1925,10}-{6036,10}-{2026,10}-{1480,10}"
   }
 ]
\ No newline at end of file