Merge branch 'master' into 'master'

ix: Keldagrim Stonemason, Dagannoth and more misc fixes

See merge request 2009scape/2009scape!104

Server/data/configs/item_configs.json

@@ -101022,7 +101022,7 @@
   },
   {
     "ge_buy_limit": "100",
-    "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)",
+    "examine": "A handy way to get around.",
     "durability": null,
     "low_alchemy": "8416",
     "high_alchemy": "12624",
@@ -101038,6 +101038,7 @@
   {
     "ge_buy_limit": "100",
     "grand_exchange_price": "29700",
+	"examine": "Swap this note at any bank for the equivalent item.",	
     "durability": null,
     "name": "Combat bracelet(4)",
     "tradeable": "true",
@@ -101045,7 +101046,7 @@
     "id": "11119"
   },
   {
-    "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)",
+    "examine": "A handy way to get around.",
     "grand_exchange_price": "1",
     "durability": null,
     "name": "Combat bracelet(3)",
@@ -101059,6 +101060,7 @@
     "equipment_slot": "9"
   },
   {
+ 	"examine": "Swap this note at any bank for the equivalent item.",
     "durability": null,
     "name": "Combat bracelet(3)",
     "tradeable": "true",
@@ -101066,7 +101068,7 @@
     "id": "11121"
   },
   {
-    "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)",
+    "examine": "A handy way to get around.",
     "grand_exchange_price": "1",
     "durability": null,
     "name": "Combat bracelet(2)",
@@ -101080,6 +101082,7 @@
     "equipment_slot": "9"
   },
   {
+	"examine": "Swap this note at any bank for the equivalent item.",
     "durability": null,
     "name": "Combat bracelet(2)",
     "tradeable": "true",
@@ -101087,7 +101090,7 @@
     "id": "11123"
   },
   {
-    "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)",
+    "examine": "A handy way to get around.",
     "grand_exchange_price": "1",
     "durability": null,
     "name": "Combat bracelet(1)",
@@ -101101,6 +101104,7 @@
     "equipment_slot": "9"
   },
   {
+	"examine": "Swap this note at any bank for the equivalent item.",  
     "durability": null,
     "name": "Combat bracelet(1)",
     "tradeable": "true",
@@ -101109,7 +101113,7 @@
   },
   {
     "ge_buy_limit": "100",
-    "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)",
+    "examine": "You will need to recharge the bracelet at the Legends Guild.",
     "durability": null,
     "low_alchemy": "8416",
     "high_alchemy": "12624",
@@ -101125,6 +101129,7 @@
   {
     "ge_buy_limit": "100",
     "grand_exchange_price": "29000",
+	"examine": "Swap this note at any bank for the equivalent item.",	
     "durability": null,
     "name": "Combat bracelet",
     "tradeable": "true",

Server/data/configs/npc_configs.json

@@ -23520,44 +23520,45 @@
     "attack_level": "47"
   },
   {
-    "examine": "A spiny horror from the ocean depths...",
+    "examine": "A horror from the ocean depths...",
     "melee_animation": "1343",
-    "attack_speed": "6",
+    "attack_speed": "4",
     "respawn_delay": "60",
     "defence_animation": "1340",
-    "slayer_exp": "100",
+    "slayer_exp": "120",
     "death_animation": "1342",
     "name": "Dagannoth",
-    "defence_level": "60",
+    "defence_level": "71",
     "safespot": null,
-    "lifepoints": "95",
+    "lifepoints": "120",
-    "strength_level": "90",
+    "strength_level": "70",
     "id": "2455",
     "aggressive": "true",
     "clue_level": "1",
     "range_level": "1",
     "projectile": "294",
-    "attack_level": "90"
+    "attack_level": "68"
   },
   {
-    "examine": "It's an NPC.",
+    "examine": "A horror from the ocean depths...",
     "combat_style": "1",
     "melee_animation": "1343",
+    "attack_speed": "4",	
     "respawn_delay": "60",
     "defence_animation": "1340",
     "slayer_exp": "0",
     "death_animation": "1342",
     "name": "Dagannoth",
-    "defence_level": "60",
+    "defence_level": "50",
     "safespot": null,
     "lifepoints": "70",
-    "strength_level": "90",
+    "strength_level": "70",
     "id": "2456",
     "aggressive": "true",
     "clue_level": "1",
-    "range_level": "90",
+    "range_level": "70",
     "projectile": "294",
-    "attack_level": "90"
+    "attack_level": "68"
   },
   {
     "examine": "A fearsome magical creature from the deep..",

Server/data/configs/object_configs.json

@@ -20271,6 +20271,14 @@
     "ids": "14003",
     "examine": "Why do I never take time to look at the grass?"
   },
+  {
+    "ids": "15477",
+    "examine": "Home sweet home?"
+  },
+  {
+    "ids": "15480",
+    "examine": "Home sweet home?"
+  },    
   {
     "ids": "15748",
     "examine": "Home sweet home?"

Server/data/configs/shops.json

@@ -2087,12 +2087,21 @@
     "title": "Gnomic Supplies",
     "stock": "{1931,inf}-{1929,inf}-{1937,inf}-{2313,inf}-{1887,inf}-{590,inf}-{1735,inf}-{1951,inf}-{1969,inf}-{1949,inf}"
   },
+  {
+    "npcs": "4248",
+    "high_alch": "0",
+    "currency": "995",
+    "general_store": "false",
+    "id": "236",  
+    "title": "Keldagrim Stonemason",
+    "stock": "{3420,500}-{8786,30}-{8784,30}-{8788,30}"
+  },
   {
     "npcs": "4856",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",
-    "id": "236",
+    "id": "237",
     "title": "Lovecraft's Tackle",
     "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}"
   }