Fix: Shops, Examines, Objects

- Sarah's Farming Shop (Falador farm) stock corrections
- Harry's Fishing Shop (Catherby) stock corrections
- Warrior's Guild Food Shop name correction 
- Brian's Archery Supplies (Rimmington) stock correction
- Wydin's Food Store (Port Sarim) name correction
- Gerrant's Fishy Business (Port Sarim) stock correction
- move the spawnpoint of Gerrant a bit further into the shop, and make him walk
- Grum's Gold Exchange (Port Sarim) name correction
- Grum's Gold Exchange/Jewellery Shop (Port Sarim) stock correction
- Brian's Battleaxe Bazaar (Port Sarim) stock correction
- Betty's Magic Emporium (Port Sarim) stock correction
- Wayne's Chains (Falador) stock correction
- Herquin's Gems (Falador) name correction
- Flynn's Mace Market (Falador) name correction
- Flynn's Mace Market (Falador) shop stock correction
- Cassie's Shield Shop (Falador) name correction
- Cassie's Shield Shop (Falador) stock correction
- The Garden Centre (Falador) stock correction
- Kalphite Queen now properly poisonous
- Hironymous Avlafrim's Gnomish Supplies shop added for the fourth time, STAY IN THE JSON DAMMIT
- Jail Guard now has correct death animation
- witches house player dialogue typo hetty (What do i need -> What do I need)
- romeo and juliet father lawrence dialogue typo (Sermon -> sermon)
- apothecary dialogue typo fixes
- Brian (Rimmington) (ID 1860) examine added
- Rommik (Rimmington) (ID: 585) examine added
- POH portal (ID: 15748) examine added
- Hetty's wardrobes (ID: 37051) examine added
- Hetty (ID 307) examine added
- Da Vinci (ID 336) examine added
- Taria (ID: 2336) examine added

Server/data/configs/npc_configs.json

@@ -4486,6 +4486,23 @@
     "range_level": "1",
     "attack_level": "25"
   },
+  {
+    "examine": "An old motherly witch with a curious smile and a hooked nose.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Hetty",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "307",
+    "aggressive": "true",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
   {
     "examine": "The man in charge of the fishing guild.",
     "melee_animation": "0",
@@ -4502,6 +4519,23 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "He has a colourful personality.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Da Vinci",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "336",
+    "aggressive": "true",
+    "range_level": "1",
+    "attack_level": "1"
+  },   
   {
     "examine": "He's ready for a bet.",
     "melee_animation": "0",
@@ -5662,7 +5696,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "magic_animation": "0",
-    "death_animation": "0",
+    "death_animation": "836",
     "name": "Jail guard",
     "defence_level": "21",
     "safespot": null,
@@ -5682,7 +5716,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "magic_animation": "0",
-    "death_animation": "0",
+    "death_animation": "836",
     "name": "Jail guard",
     "defence_level": "21",
     "safespot": null,
@@ -5702,7 +5736,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "magic_animation": "0",
-    "death_animation": "0",
+    "death_animation": "836",
     "name": "Jail guard",
     "defence_level": "21",
     "safespot": null,
@@ -6872,6 +6906,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "If crafting's your thing, he's your man!",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Rommik",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "574",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
   {
     "examine": "He seems to sell tea.",
     "melee_animation": "0",
@@ -9467,7 +9517,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "magic_animation": "0",
-    "death_animation": "0",
+    "death_animation": "836",
     "name": "Jail guard",
     "defence_level": "21",
     "safespot": null,
@@ -12067,6 +12117,7 @@
     "melee_animation": "6241",
     "range_animation": "6241",
     "attack_speed": "4",
+    "poisonous": "true",	
     "magic_level": "150",
     "respawn_delay": "45",
     "defence_animation": "6232",
@@ -19192,6 +19243,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "He sells ranging equipment.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Brian",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "1866",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
   {
     "examine": "Nemarti looks ready to teach you about ranged combat.",
     "melee_animation": "0",
@@ -23082,6 +23149,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "Perhaps this gardener might look after your crops for you.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Taria",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2336",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
   {
     "examine": "Perhaps this gardener might look after your crops for you.",
     "melee_animation": "0",
@@ -24807,18 +24890,36 @@
     "attack_level": "1"
   },
   {
-    "death_animation": "836",
+    "examine": "A citizen of Rimmington.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
     "name": "Hengel",
     "defence_level": "1",
     "safespot": null,
-    "lifepoints": "7",
+    "lifepoints": "10",
-    "melee_animation": "422",
     "strength_level": "1",
     "id": "2683",
     "range_level": "1",
-    "respawn_delay": "60",
+    "attack_level": "1"
-    "attack_level": "1",
+  },
-    "defence_animation": "425"
+  {
+    "examine": "A citizen of Rimmington.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Anja",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2684",
+    "range_level": "1",
+    "attack_level": "1"
   },   
   {
     "examine": "An ugly smelly creature.",

Server/data/configs/npc_spawns.json

@@ -1469,7 +1469,7 @@
   },
   {
     "npc_id": "558",
-    "loc_data": "{3013,3221,0,1,6}"
+    "loc_data": "{3013,3225,0,1,1}"
   },
   {
     "npc_id": "559",

Server/data/configs/object_configs.json

@@ -20270,5 +20270,13 @@
   {
     "ids": "14003",
     "examine": "Why do I never take time to look at the grass?"
+  },
+  {
+    "ids": "15748",
+    "examine": "Home sweet home?"
+  },
+  {
+    "ids": "37051",
+    "examine": "I wonder what this spooky contains."
   }  
 ]

Server/data/configs/shops.json

@@ -357,7 +357,7 @@
     "general_store": "true",
     "id": "41",
     "title": "Trader Stan's Trading Post",
-    "stock": "{1931,5}-{1935,2}-{1735,2}-{1925,3}-{1923,2}-{1887,2}-{590,2}-{1755,2}-{2347,5}-{550,5}-{9003,5}-{954,2}-{946,2}-{2114,inf}-{1963,15}-{2108,10}-{4286,10}-{1785,15}-{1783,inf}-{401,inf}-{1781,10}-{301,20}-{307,20}-{1941,30}-{9629,25}-{3226,20}-{1025,5}"
+    "stock": "{1931,5}-{1935,2}-{1735,2}-{1925,3}-{1923,2}-{1887,2}-{590,2}-{1755,2}-{2347,5}-{550,5}-{9003,5}-{954,2}-{946,2}-{2114,0}-{1963,15}-{2108,10}-{4286,10}-{1785,15}-{1783,inf}-{401,inf}-{1781,10}-{301,20}-{307,20}-{1941,30}-{9629,25}-{3226,20}-{1025,5}"
   },
   {
     "npcs": "534",
@@ -397,12 +397,12 @@
   },
   {
     "npcs": "1860",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "46",
     "title": "Brian's Archery Supplies",
-    "stock": "{886,100}-{888,30}-{890,0}-{843,10}-{849,10}-{853,10}"
+    "stock": "{886,100}-{888,30}-{890,0}-{843,10}-{845,10}-{849,10}-{847,10}-{853,10}-{851,10}"
   },
   {
     "npcs": "550",
@@ -478,12 +478,12 @@
   },
   {
     "npcs": "559",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "55",
     "title": "Brian's Battleaxe Bazaar",
-    "stock": "{1375,10}-{1363,10}-{1365,10}-{1367,10}-{1369,10}-{1371,10}"
+    "stock": "{1375,4}-{1363,3}-{1365,2}-{1367,1}-{1369,1}-{1371,1}"
   },
   {
     "npcs": "562",
@@ -510,7 +510,7 @@
     "general_store": "false",
     "id": "58",
     "title": "Wayne's Chains",
-    "stock": "{1103,10}-{1101,10}-{1105,10}-{1107,10}-{1109,10}-{1111,10}"
+    "stock": "{1103,3}-{1101,2}-{1105,1}-{1107,1}-{1109,1}-{1111,1}"
   },
   {
     "npcs": "554",
@@ -622,7 +622,7 @@
   },
   {
     "npcs": "585",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "71",
@@ -658,12 +658,12 @@
   },
   {
     "npcs": "2304",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "75",
     "title": "Sarah's Farming Shop",
-    "stock": "{5376,10}-{6032,300}-{5418,10}-{5376,10}-{6036,10}-{5354,100}-{5341,10}-{5329,10}-{5343,10}-{952,10}-{5325,10}-{1925,100}-{5331,30}-{12622,10}-{5996,0}-{6006,0}-{1965,0}-{5994,0}-{5931,0}-{6000,0}-{1957,0}-{5504,0}-{5986,0}-{1982,0}-{5982,0}-{6002,0}-{5998,0}"
+    "stock": "{5376,10}-{6032,300}-{5418,10}-{6036,10}-{5354,100}-{5341,10}-{5329,10}-{5343,10}-{952,10}-{5325,10}-{1925,100}-{5331,30}-{12622,10}-{5996,0}-{6006,0}-{1965,0}-{5994,0}-{5931,0}-{6000,0}-{1957,0}-{5504,0}-{5986,0}-{1982,0}-{5982,0}-{6002,0}-{5998,0}"
   },
   {
     "npcs": "1783",
@@ -676,11 +676,11 @@
   },
   {
     "npcs": "557",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "77",
-    "title": "Wydin's Consumables Store",
+    "title": "Wydin's Food Store",
     "stock": "{1933,500}-{2132,10}-{2138,10}-{1965,10}-{1963,0}-{1951,0}-{2309,10}-{1973,10}-{1985,10}-{1982,10}-{1550,10}"
   },
   {
@@ -748,11 +748,11 @@
   },
   {
     "npcs": "4293",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "85",
-    "title": "Warriors' Guild Consumables Shop",
+    "title": "Warriors' Guild Food Shop",
     "stock": "{333,10}-{365,10}-{2289,10}-{6705,10}-{2003,10}"
   },
   {
@@ -766,11 +766,11 @@
   },
   {
     "npcs": "584",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "87",
-    "title": "Herquin's Gem",
+    "title": "Herquin's Gems",
     "stock": "{1623,0}-{1621,0}-{1619,0}-{1617,0}-{1607,0}-{1605,0}-{1603,0}-{1601,0}"
   },
   {
@@ -932,8 +932,8 @@
     "currency": "995",
     "general_store": "false",
     "id": "106",
-    "title": "Jewellery Shop",
+    "title": "Grum's Gold Exchange",
-    "stock": "{1635,0}-{1637,0}-{1639,0}-{1641,0}-{1643,0}-{1654,0}-{1656,0}-{1658,0}-{1660,0}-{1662,0}-{1673,0}-{1675,0}-{1696,0}-{1698,0}-{1700,0}-{11069,0}-{11072,0}-{11076,0}-{11085,0}-{11092,0}"
+    "stock": "{1635,0}-{1637,0}-{1639,0}-{1641,0}-{1643,0}-{1654,0}-{1656,0}-{1658,0}-{1660,0}-{1662,0}-{1692,0}-{1694,0}-{1696,0}-{1698,0}-{1700,0}-{11069,0}-{11072,0}-{11076,0}-{11085,0}-{11092,0}"
   },
   {
     "npcs": "1862",
@@ -977,8 +977,8 @@
     "currency": "995",
     "general_store": "false",
     "id": "111",
-    "title": "Mace Shop",
+    "title": "Flynn's Mace Market",
-    "stock": "{1422,10}-{1420,10}-{1424,10}-{1428,10}-{1430,10}"
+    "stock": "{1422,5}-{1420,4}-{1424,4}-{1428,3}-{1430,2}"
   },
   {
     "npcs": "1862",
@@ -991,12 +991,12 @@
   },
   {
     "npcs": "583",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "113",
     "title": "Betty's Magic Emporium",
-    "stock": "{554,3000}-{555,3000}-{556,3000}-{557,3000}-{558,100}-{559,100}-{562,30}-{560,10}-{221,150}-{579,10}-{1017,10}"
+    "stock": "{554,300}-{555,300}-{556,300}-{557,300}-{558,100}-{559,100}-{562,30}-{560,10}-{221,100}-{579,10}-{1017,10}"
   },
   {
     "npcs": "553",
@@ -1207,12 +1207,12 @@
   },
   {
     "npcs": "577",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "137",
-    "title": "Shield Shop",
+    "title": "Cassie's Shield Shop",
-    "stock": "{1171,10}-{1173,10}-{1189,10}-{1175,10}-{1191,10}-{1177,10}-{1193,10}-{1181,10}"
+    "stock": "{1171,5}-{1173,3}-{1189,3}-{1175,2}-{1191,0}-{1177,0}-{1193,0}-{1181,0}"
   },
   {
     "npcs": "209",
@@ -1275,7 +1275,7 @@
     "general_store": "false",
     "id": "144",
     "title": "Gerrant's Fishy Business",
-    "stock": "{303,10}-{307,10}-{309,10}-{311,1000}-{301,10}-{313,1000}-{314,1000}-{317,0}-{327,10}-{345,0}-{321,0}-{335,0}-{349,0}-{331,0}-{359,0}-{377,0}-{371,0}"
+    "stock": "{303,10}-{307,10}-{309,10}-{311,30}-{301,10}-{13431,10}-{313,1000}-{314,1000}-{317,0}-{327,10}-{345,0}-{321,0}-{335,0}-{349,0}-{331,0}-{359,0}-{377,0}-{371,0}"
   },
   {
     "npcs": "576",
@@ -1284,7 +1284,7 @@
     "general_store": "false",
     "id": "145",
     "title": "Harry's Fishing Shop",
-    "stock": "{303,10}-{307,10}-{311,1000}-{301,10}-{313,1000}-{305,10}-{317,0}-{327,0}-{345,0}-{353,0}-{341,0}-{321,0}-{359,0}-{377,0}-{363,0}-{371,0}-{383,0}-{7810,1000}"
+    "stock": "{303,10}-{307,10}-{311,1000}-{301,10}-{313,100}-{305,10}-{317,0}-{327,0}-{345,0}-{353,0}-{341,0}-{321,0}-{359,0}-{377,0}-{363,0}-{371,0}-{383,0}-{7810,1000}"
   },
   {
     "npcs": "5266",
@@ -1882,12 +1882,12 @@
   },
   {
     "npcs": "4251",
-    "high_alch": "0",
+    "high_alch": "1",
     "currency": "995",
     "general_store": "false",
     "id": "213",
     "title": "The Garden Centre",
-    "stock": "{8417,1000}-{8419,1000}-{8421,1000}-{8423,1000}-{8425,1000}-{8427,1000}-{8429,1000}-{8431,1000}-{8433,1000}-{8435,1000}-{8451,1000}-{8453,1000}-{8455,1000}-{8457,1000}-{8459,1000}-{8461,1000}-{8437,1000}-{8439,1000}-{8441,1000}-{8443,1000}-{8445,1000}-{8447,1000}-{8449,1000}"
+    "stock": "{8417,10}-{8419,10}-{8421,10}-{8423,10}-{8425,10}-{8427,10}-{8429,10}-{8431,1000}-{8433,10}-{8435,10}-{8451,10}-{8453,10}-{8455,10}-{8457,10}-{8459,10}-{8461,10}-{8437,10}-{8439,10}-{8441,10}-{8443,10}-{8445,10}-{8447,10}-{8449,10}"
   },
   {
     "npcs": "1972",
@@ -2079,13 +2079,13 @@
     "stock": "{1917,10}-{3803,10}-{3711,10}"
   },
   {
-    "npcs": "4248",
+    "npcs": "7420",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",
     "id": "235",
-    "title": "Keldagrim Stonemason",
+    "title": "Gnomic Supplies",
-    "stock": "{3420,500}-{8786,30}-{8784,30}-{8788,30}"
+    "stock": "{1931,inf}-{1929,inf}-{1937,inf}-{2313,inf}-{1887,inf}-{590,inf}-{1735,inf}-{1951,inf}-{1969,inf}-{1949,inf}"
   },
   {
     "npcs": "4856",

Server/src/main/java/core/game/content/dialogue/ApothecaryDialogue.java

@@ -106,7 +106,7 @@ public final class ApothecaryDialogue extends DialoguePlugin {
 	public boolean handle(int interfaceId, int buttonId) {
 		switch (stage) {
 		case 1:
-			options("Can you make a strength potion?", "Do you know a potion to mame hair fall out?", "Have you got any good potions to give away?", "Can you make a potion that makes it seem like I'm dead?");
+			options("Can you make a strength potion?", "Do you know a potion to make hair fall out?", "Have you got any good potions to give away?", "Can you make a potion that makes it seem like I'm dead?");
 			stage = 2;
 			break;
 		case 2:
@@ -224,7 +224,7 @@ public final class ApothecaryDialogue extends DialoguePlugin {
 			stage = 503;
 			break;
 		case 503:
-			interpreter.sendDialogues(npc, null, "I have all that, but i need some Cadava berries.");
+			interpreter.sendDialogues(npc, null, "I have all that, but I need some Cadava berries.");
 			stage = 504;
 			break;
 		case 504:
@@ -257,7 +257,7 @@ public final class ApothecaryDialogue extends DialoguePlugin {
 			if (!player.getInventory().add(CADAVA_POTION)) {
 				GroundItemManager.create(new GroundItem(CADAVA_POTION, player.getLocation(), player));
 			}
-			interpreter.sendItemMessage(756, "The Apothecary gives you a Cavada potion.");
+			interpreter.sendItemMessage(756, "The Apothecary gives you a Cadava potion.");
 			stage = 640;
 			break;
 		case 640:

Server/src/main/java/core/game/content/dialogue/FatherLawrenceDialogue.java

@@ -80,7 +80,7 @@ public final class FatherLawrenceDialogue extends DialoguePlugin {
 			end();
 			break;
 		case 41:
-			interpreter.sendDialogues(npc, null, "Can't you see that I'm in the middle of a Sermon?!");
+			interpreter.sendDialogues(npc, null, "Can't you see that I'm in the middle of a sermon?!");
 			stage = 42;
 			break;
 		case 42:

Server/src/main/java/core/game/content/dialogue/HettyDialogue.java

@@ -146,7 +146,7 @@ public final class HettyDialogue extends DialoguePlugin {
 			stage = 32;
 			break;
 		case 32:
-			interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "What do i need?");
+			interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "What do I need?");
 			stage = 33;
 			break;
 		case 33: