Merge branch 'master' into 'master'

Add: Dwarven Rock Cake

See merge request 2009scape/2009scape!209

Server/data/configs/ground_spawns.json

@@ -519,6 +519,14 @@
     "item_id": "5008",
     "loc_data": "{1,3230,9609,0,300}"
   },
+  {
+    "item_id": "7510",
+    "loc_data": "{1,2867,9875,0,300}"
+  },
+  {
+    "item_id": "1913",
+    "loc_data": "{1,2863,9875,0,300}-{1,2861,9878,0,300}"
+  },  
   {
     "item_id": "4619",
     "loc_data": "{1,2713,4913,0,2}"

Server/data/configs/item_configs.json

@@ -72317,7 +72317,7 @@
     "id": "7508"
   },
   {
-    "examine": "Hot: A strange looking cake. Cooled: Cool and heavy as a brick. Only for dwarf consumption.",
+    "examine": "Red hot and glowing, ouch! Only for dwarf consumption.",
     "durability": null,
     "name": "Dwarven rock cake",
     "weight": "8.5",
@@ -72325,7 +72325,7 @@
     "id": "7509"
   },
   {
-    "examine": "Hot: A strange looking cake. Cooled: Cool and heavy as a brick. Only for dwarf consumption.",
+    "examine": "Cool and heavy as a brick. Only for dwarf consumption.",
     "durability": null,
     "name": "Dwarven rock cake",
     "weight": "8.5",

Server/data/configs/npc_configs.json

@@ -2372,19 +2372,20 @@
     "slayer_task": "29",
     "melee_animation": "99",
     "range_animation": "0",
+    "attack_speed": "6",	
     "defence_animation": "0",
     "weakness": "6",
     "slayer_exp": "16",
     "magic_animation": "0",
     "death_animation": "102",
     "name": "Dwarf",
-    "defence_level": "28",
+    "defence_level": "16",
     "safespot": null,
-    "lifepoints": "40",
+    "lifepoints": "26",
-    "strength_level": "28",
+    "strength_level": "16",
     "id": "120",
     "range_level": "1",
-    "attack_level": "28"
+    "attack_level": "15"
   },
   {
     "slayer_exp": "16",
@@ -297930,5 +297931,10 @@
     "examine": "Come by! Come by!",
     "name": "Sheepdog",
     "id": "7256"
+  },
+  {
+    "examine": "The sandwich lady.",
+    "name": "Sandwich lady",
+    "id": "3117"
   }
 ]

Server/data/configs/npc_spawns.json

@@ -391,6 +391,10 @@
     "npc_id": "119",
     "loc_data": "{3248,3794,0,1,1}-{2925,9766,0,1,7}-{2921,9758,0,1,3}-{2935,9770,0,1,1}-{2935,9761,0,1,0}-{3029,10313,0,1,4}-{3028,10309,0,1,4}-{3033,10311,0,1,6}-{3035,10309,0,1,1}-{3035,10313,0,1,1}-{3244,3797,0,1,3}-{3245,3790,0,1,4}-{3239,3781,0,1,5}-{3253,3791,0,1,1}-{3245,3802,0,1,1}-{3250,3808,0,1,3}-{3246,3800,0,1,6}-{3246,3795,0,1,2}"
   },
+  {
+    "npc_id": "120",
+    "loc_data": "{2874,9880,0,1,0}-{2861,9874,0,1,0}-{2863,9874,0,1,0}-{2866,9874,0,1,0}-{2865,9877,0,1,0}-{2864,9877,0,1,0}-{2861,9877,0,1,0}-{2867,9877,0,1,0}-{2867,9879,0,1,0}"
+  },  
   {
     "npc_id": "122",
     "loc_data": "{2996,9574,0,1,6}-{3007,9579,0,1,7}-{3001,9580,0,1,4}-{3018,9580,0,1,3}-{3021,9585,0,1,4}-{3024,9582,0,1,4}-{2507,3726,0,1,2}-{2523,3724,0,1,3}-{2535,9556,0,1,4}"