diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index 55f5e08bb..fd60a350f 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -165,7 +165,7 @@ }, { "npc_id": "52", - "loc_data": "{2899,9765,0,1,1}-{2893,9768,0,1,1}-{2895,9771,0,1,6}-{2894,9781,0,1,6}-{2891,9787,0,1,2}-{2904,9798,0,1,0}-{2910,9799,0,1,4}" + "loc_data": "{2898,9764,0,1,0}-{2892,9800,0,1,0}-{2912,9808,0,1,0}" }, { "npc_id": "53", @@ -177,7 +177,7 @@ }, { "npc_id": "55", - "loc_data": "{2914,9800,0,1,2}-{2906,9804,0,1,6}-{2896,9798,0,1,0}-{2909,9906,0,1,4}" + "loc_data": "{2897,9802,0,1,0}-{2909,9906,0,1,4}" }, { "npc_id": "58", @@ -6742,6 +6742,14 @@ { "npc_id": "4660", "loc_data": "{3225,3369,0,1,3}-{3226,3371,0,1,7}-{3230,3372,0,1,0}-{3230,3370,0,1,3}-{3229,3368,0,1,1}-{3227,3367,0,1,1}" + }, + { + "npc_id": "4665", + "loc_data": "{2894,9766,0,1,0}-{2904,9797,0,1,0}-{2918,9800,0,1,0}" + }, + { + "npc_id": "4666", + "loc_data": "{2893,9769,0,1,0}-{2912,9797,0,1,0}-{2909,9807,0,1,0}" }, { "npc_id": "4670", @@ -6783,6 +6791,14 @@ "npc_id": "4680", "loc_data": "{3349,3696,0,1,5}-{3120,10080,0,1,0}" }, + { + "npc_id": "4681", + "loc_data": "{2904,9802,0,1,0}" + }, + { + "npc_id": "4682", + "loc_data": "{2896,9796,0,1,0}" + }, { "npc_id": "4685", "loc_data": "{2957,3895,0,1,4}-{3209,5552,0,1,1}-{3223,5555,0,1,4}-{3220,5548,0,1,6}-{3220,5557,0,1,4}" diff --git a/Server/data/configs/object_configs.json b/Server/data/configs/object_configs.json index 4e9f79523..a9bebc35f 100644 --- a/Server/data/configs/object_configs.json +++ b/Server/data/configs/object_configs.json @@ -20389,7 +20389,7 @@ }, { "examine": "Contains traces of summoning energy.", - "ids": "29945" + "ids": "29945,29947" }, { "examine": "I wonder what this spooky contains.", @@ -20586,5 +20586,17 @@ { "examine": "A wooden barrel for storage.", "ids": "31136" + }, + { + "examine": "A home for baby creatures.", + "ids": "32312" + }, + { + "examine": "Must have been laid by a huge bird.", + "ids": "32313" + }, + { + "examine": "Stops bits of building falling on me.", + "ids": "37451" } ] \ No newline at end of file diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java index 02bd09e84..aafb06c23 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java @@ -134,7 +134,7 @@ public final class AnimalMagnetismPlugin extends OptionHandler { player.animate(Animation.create(1652)); player.getInventory().remove(new Item(4252)); player.getInventory().add(item); - player.sendMessage("Your ectophial vial automatically refills."); + player.sendMessage("You refill the ectophial from the Ectofuntus."); } return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java index e7c19bb4c..785b52d8f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java @@ -33,7 +33,7 @@ public final class HerbCleanPlugin extends OptionHandler { } final Herbs herb = Herbs.forItem((Item) node); if (player.getSkills().getLevel(Skills.HERBLORE) < herb.getLevel()) { - player.getPacketDispatch().sendMessage("You need a herblore level " + herb.getLevel() + " to clean this herb."); + player.getPacketDispatch().sendMessage("You need level " + herb.getLevel() + " Herblore to clean the " + herb.getProduct().getName().replace("Clean", "Grimy") + "."); return true; } double exp = herb.getExperience();