From 6f541049ae1789ae78b33ad007a44af71ef391e3 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Sat, 21 Mar 2020 14:10:43 -0500
Subject: [PATCH 01/12] Fixed a bug with Oziach's dialogue

---
 Server/src/plugin/quest/dragonslayer/OziachDialogue.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Server/src/plugin/quest/dragonslayer/OziachDialogue.java b/Server/src/plugin/quest/dragonslayer/OziachDialogue.java
index c0feab183..7b0565438 100644
--- a/Server/src/plugin/quest/dragonslayer/OziachDialogue.java
+++ b/Server/src/plugin/quest/dragonslayer/OziachDialogue.java
@@ -44,6 +44,7 @@ public final class OziachDialogue extends DialoguePlugin {
 	public boolean open(Object... args) {
 		npc = (NPC) args[0];
 		quest = player.getQuestRepository().getQuest("Dragon Slayer");
+		player.debug("" + quest.getStage(player));
 		switch (quest.getStage(player)) {
 		case 100:
 			npc("Aye, 'tis a fair day, my mighty dragon-slaying friend.");
@@ -94,6 +95,9 @@ public final class OziachDialogue extends DialoguePlugin {
 		case 20:
 			if (stage == -1) {
 				end();
+			} else {
+				end();
+				break;
 			}
 			break;
 		case 100:

From c4d742a3a4e3821835a24a0685bf6204041e532a Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Sat, 21 Mar 2020 15:13:01 -0500
Subject: [PATCH 02/12] Players can now correctly burn meat

---
 .../interaction/item/withobject/BurnMeatPlugin.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java
index 47f505748..b59df1072 100644
--- a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java
+++ b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java
@@ -5,8 +5,12 @@ import org.crandor.game.content.global.consumable.Food;
 import org.crandor.game.interaction.NodeUsageEvent;
 import org.crandor.game.interaction.UseWithHandler;
 import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.item.Item;
 import org.crandor.game.node.object.GameObject;
 import org.crandor.game.world.update.flag.context.Animation;
+import org.crandor.net.packet.PacketRepository;
+import org.crandor.net.packet.context.GameMessageContext;
+import org.crandor.net.packet.out.GameMessage;
 import org.crandor.plugin.InitializablePlugin;
 import org.crandor.plugin.Plugin;
 
@@ -53,11 +57,13 @@ public final class BurnMeatPlugin extends UseWithHandler {
 		final Player player = event.getPlayer();
 		final Food food = Consumables.forFood(event.getUsedItem());
 		final GameObject object = (GameObject) event.getUsedWith();
+		final Item usedItem = event.getUsedItem();
 		if (food.getBurnt() == null) {
 			player.getPacketDispatch().sendMessage("You can't burn this piece of food.");
 			return true;
 		}
-		if (player.getInventory().remove(event.getUsedItem())) {
+		if (player.getInventory().containsItem(usedItem)) {
+			player.getInventory().remove(usedItem);
 			player.lock(3);
 			player.animate(!object.getName().toLowerCase().equals("fire") ? RANGE_ANIMATION : FIRE_ANIMATION);
 			player.getInventory().add(food.getBurnt());

From 89b5228eba605684e74722f69ca793b174790d21 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Sun, 22 Mar 2020 12:34:34 -0500
Subject: [PATCH 03/12] added a command for setting quest stages

---
 .../command/DeveloperCommandPlugin.java       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Server/src/plugin/command/DeveloperCommandPlugin.java b/Server/src/plugin/command/DeveloperCommandPlugin.java
index d0fefa591..34d7a0e62 100644
--- a/Server/src/plugin/command/DeveloperCommandPlugin.java
+++ b/Server/src/plugin/command/DeveloperCommandPlugin.java
@@ -26,6 +26,7 @@ import org.crandor.game.node.entity.player.ai.resource.ResourceAIPManager;
 import org.crandor.game.node.entity.player.info.login.PlayerParser;
 import org.crandor.game.node.entity.player.link.IronmanMode;
 import org.crandor.game.node.entity.player.link.appearance.Gender;
+import org.crandor.game.node.entity.player.link.quest.Quest;
 import org.crandor.game.node.entity.player.link.skillertasks.Difficulty;
 import org.crandor.game.node.entity.state.EntityState;
 import org.crandor.game.node.item.Item;
@@ -50,6 +51,7 @@ import org.crandor.plugin.InitializablePlugin;
 import org.crandor.plugin.Plugin;
 import org.crandor.plugin.PluginManager;
 import org.crandor.tools.RandomFunction;
+import org.crandor.tools.StringUtils;
 import plugin.skill.herblore.PotionDecantingPlugin;
 
 import java.awt.*;
@@ -524,7 +526,27 @@ public final class DeveloperCommandPlugin extends CommandPlugin {
             case "roar":
                 player.getPacketDispatch().sendInterfaceConfig(762, 20, false);
                 break;
-        }
+            case "setstage":
+                if(args.length < 2) {
+                    player.getPacketDispatch().sendMessage("Syntax: setstage stage# quest name");
+                } else {
+                    int stageId = 0;
+                    stageId = toInteger(args[1]);
+                    String questName = "";
+                    for (int i = 2; i < args.length; i++) {
+                        questName += (i == 2 ? "" : " ") + args[i];
+                    }
+                    questName = StringUtils.formatDisplayName(questName);
+                    Quest quest = player.getQuestRepository().getQuest(questName);
+                    if (quest == null) {
+                        player.debug("err or: invalid quest - " + questName);
+                        return true;
+                    }
+                    player.debug("Setting quest " + questName + " to stage " + stageId);
+                    player.getQuestRepository().setStage(quest,stageId);
+                    player.getQuestRepository().syncronizeTab(player);
+                }
+            }
         return false;
     }
 

From 90cd8538e908e541555109fc8a9b66777fddef21 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Sun, 22 Mar 2020 14:04:56 -0500
Subject: [PATCH 04/12] Removed the really bad old way of awarding the mining
 bonus

---
 .../game/content/skill/free/gather/GatheringSkillPulse.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Server/src/org/crandor/game/content/skill/free/gather/GatheringSkillPulse.java b/Server/src/org/crandor/game/content/skill/free/gather/GatheringSkillPulse.java
index 18bf1ded5..bc983b197 100644
--- a/Server/src/org/crandor/game/content/skill/free/gather/GatheringSkillPulse.java
+++ b/Server/src/org/crandor/game/content/skill/free/gather/GatheringSkillPulse.java
@@ -354,11 +354,7 @@ public final class GatheringSkillPulse extends SkillPulse<GameObject> {
 		
 		if (isMining && !isMiningEssence) {
 			// Not sure what this bonus is for
-			if (isMining && player.getSavedData().getGlobalData().getStarSpriteDelay() > System.currentTimeMillis() && TimeUnit.MILLISECONDS.toMinutes(player.getSavedData().getGlobalData().getStarSpriteDelay() - System.currentTimeMillis()) >= 1425) {
-				amount += 1;
-			}
-			// Not sure what this bonus is for
-			else if (isMining && !isMiningEssence && player.getAchievementDiaryManager().getDiary(DiaryType.VARROCK).getLevel() != -1 && player.getAchievementDiaryManager().checkMiningReward(reward) && RandomFunction.random(100) <= 10) {
+			if (isMining && !isMiningEssence && player.getAchievementDiaryManager().getDiary(DiaryType.VARROCK).getLevel() != -1 && player.getAchievementDiaryManager().checkMiningReward(reward) && RandomFunction.random(100) <= 10) {
 				amount += 1;
 				player.sendMessage("Through the power of the varrock armour you receive an extra ore.");
 			}

From ced633603dcf0b6467b6824e7864a30f585a5a01 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 11:24:46 -0500
Subject: [PATCH 05/12] Added akharanu: arthritis edition

---
 Server/src/plugin/npc/other/akharanu.java  | 72 ++++++++++++++++++++++
 Tools/Arios Editor/Arios Editor.iml        | 27 ++++++++
 Tools/Cache Editor/DragonkkCacheReader.iml | 27 ++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 Server/src/plugin/npc/other/akharanu.java
 create mode 100644 Tools/Arios Editor/Arios Editor.iml
 create mode 100644 Tools/Cache Editor/DragonkkCacheReader.iml

diff --git a/Server/src/plugin/npc/other/akharanu.java b/Server/src/plugin/npc/other/akharanu.java
new file mode 100644
index 000000000..4fc673a08
--- /dev/null
+++ b/Server/src/plugin/npc/other/akharanu.java
@@ -0,0 +1,72 @@
+package plugin.npc.other;
+
+import org.crandor.cache.def.impl.NPCDefinition;
+import org.crandor.game.content.dialogue.DialoguePlugin;
+import org.crandor.game.content.dialogue.FacialExpression;
+import org.crandor.game.node.entity.npc.NPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.world.update.flag.context.Animation;
+import org.crandor.plugin.InitializablePlugin;
+
+@InitializablePlugin
+public class akharanu extends DialoguePlugin {
+    public akharanu() {};
+    public akharanu(Player player){super(player);}
+    @Override
+    public DialoguePlugin newInstance(Player player){return new akharanu(player);}
+    public boolean open(Object... args){
+        npc("Hello, there, friend!");
+        stage = 0;
+        return true;
+    }
+    @Override
+    public boolean handle(int componentId, int buttonId){
+        switch(stage){
+            case 0:
+                player.getDialogueInterpreter().sendOptions("Select one","Why are you, errr, so stiff?","Do you sell anything?");
+                stage++;
+                break;
+            case 1:
+                switch(buttonId){
+                    case 1:
+                        player("Why are you, errr, so stiff?");
+                        stage++;
+                        break;
+                    case 2:
+                        player("Do you sell anything?");
+                        stage = 8;
+                        break;
+                }
+                break;
+            case 2:
+                npc(FacialExpression.HALF_GUILTY,"I have extremely severe arthritis. It really sucks.");
+                stage++;
+                break;
+            case 3:
+                player("Oh. Well I'm sorry to hear that.");
+                stage++;
+                break;
+            case 4:
+                npc("Yes, thank you for your concern.");
+                stage++;
+                break;
+            case 5:
+                end();
+                break;
+            case 8:
+                player("Do you sell anything?");
+                stage++;
+                break;
+            case 9:
+                npc("Why, yes I do!");
+                stage++;
+                break;
+            case 10:
+                end();
+                new NPC(1688).openShop(player);
+                break;
+        }
+        return true;
+    }
+    public int[] getIds() {return new int[] {1688};}
+}
diff --git a/Tools/Arios Editor/Arios Editor.iml b/Tools/Arios Editor/Arios Editor.iml
new file mode 100644
index 000000000..b086c86ee
--- /dev/null
+++ b/Tools/Arios Editor/Arios Editor.iml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <libelement value="jar://$MODULE_DIR$/data/libs/mysql-connector-java-5.1.30-bin.jar!/" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="module-library">
+      <library name="mysql-connector-java-5.1.30-bin.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/data/libs/mysql-connector-java-5.1.30-bin.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/Tools/Cache Editor/DragonkkCacheReader.iml b/Tools/Cache Editor/DragonkkCacheReader.iml
new file mode 100644
index 000000000..f4d2feea1
--- /dev/null
+++ b/Tools/Cache Editor/DragonkkCacheReader.iml	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <libelement value="jar://$MODULE_DIR$/substance-5.3.jar!/" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library name="substance-5.3.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/substance-5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file

From 8f2b7ff9e148c6a99a75fad63c68f871d06df548 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 17:24:15 -0500
Subject: [PATCH 06/12] Added automated fill option for bone grinder

---
 .../plugin/zone/phasmatys/PhasmatysZone.java  | 136 ++++++++++++++++--
 1 file changed, 123 insertions(+), 13 deletions(-)

diff --git a/Server/src/plugin/zone/phasmatys/PhasmatysZone.java b/Server/src/plugin/zone/phasmatys/PhasmatysZone.java
index ea9bca562..7511378ab 100644
--- a/Server/src/plugin/zone/phasmatys/PhasmatysZone.java
+++ b/Server/src/plugin/zone/phasmatys/PhasmatysZone.java
@@ -4,16 +4,20 @@ import org.crandor.game.content.global.Bones;
 import org.crandor.game.content.global.action.ClimbActionHandler;
 import org.crandor.game.content.skill.Skills;
 import org.crandor.game.content.skill.member.agility.AgilityHandler;
+import org.crandor.game.interaction.MovementPulse;
 import org.crandor.game.interaction.NodeUsageEvent;
 import org.crandor.game.interaction.Option;
 import org.crandor.game.interaction.UseWithHandler;
 import org.crandor.game.node.Node;
 import org.crandor.game.node.entity.Entity;
+import org.crandor.game.node.entity.lock.Lock;
 import org.crandor.game.node.entity.npc.NPC;
 import org.crandor.game.node.entity.player.Player;
 import org.crandor.game.node.item.Item;
 import org.crandor.game.node.object.GameObject;
 import org.crandor.game.node.object.ObjectBuilder;
+import org.crandor.game.system.task.Pulse;
+import org.crandor.game.world.GameWorld;
 import org.crandor.game.world.map.Direction;
 import org.crandor.game.world.map.Location;
 import org.crandor.game.world.map.zone.MapZone;
@@ -24,12 +28,21 @@ import org.crandor.plugin.Plugin;
 import org.crandor.plugin.InitializablePlugin;
 import org.crandor.plugin.PluginManager;
 
+import static java.lang.Thread.sleep;
+
 /**
  * Handles the phasmatyz zone area.
  * @author Vexia
  */
 @InitializablePlugin
 public final class PhasmatysZone extends MapZone implements Plugin<Object> {
+	int b;
+	Bones[] bones;
+	Player player;
+	Bones bone;
+	boolean notFirst;
+
+
 
 	/**
 	 * Constructs a new {@code PhasmatysZone} {@code Object}.
@@ -56,7 +69,7 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 	@Override
 	public boolean interact(Entity e, Node target, Option option) {
 		if (e.isPlayer()) {
-			Player player = e.asPlayer();
+			player = e.asPlayer();
 			if (target instanceof NPC) {
 				NPC npc = (NPC) target;
 				if ((npc.getName().toLowerCase().contains("ghost") || npc.getName().equalsIgnoreCase("velorina") || npc.getName().contains("husband")) && !hasAmulet(player)) {
@@ -103,21 +116,24 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 			case 5244:
 				player.getDialogueInterpreter().open(1686, null, true);
 				return true;
+			case 11162:
 			case 11163:
 			case 11164:
 				GameObject obj = (GameObject) target;
 				switch (option.getName().toLowerCase()) {
-				case "wind":
-					wind(player, obj);
-					return true;
-				case "empty":
-					empty(player, obj);
-					return true;
-				case "status":
-					checkStatus(player, obj);
-					return true;
+					case "fill":
+						player.getPulseManager().run(fillPulse);
+						return true;
+					case "wind":
+						wind(player, obj);
+						return true;
+					case "empty":
+						empty(player, obj);
+						return true;
+					case "status":
+						checkStatus(player, obj);
+						return true;
 				}
-				break;
 			case 5282:
 				worship(player);
 				return true;
@@ -125,6 +141,76 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 		}
 		return super.interact(e, target, option);
 	}
+	public Pulse emptyPulse = new Pulse(2){
+		//the bin
+		GameObject emptyobj = new GameObject(11164,3658,3525,1);
+		@Override
+		public boolean pulse(){
+			try {
+				sleep(1800L);
+			}catch(Exception e){
+				System.out.println(e);
+			}
+			//player.getProperties().setTeleportLocation(new Location(3658,3524,1));
+			player.faceLocation(new Location(3658,3525,1));
+			empty(player,emptyobj);
+			player.getWalkingQueue().reset();
+			player.getWalkingQueue().addPath(3660,3524,true);
+			player.setAttribute("bgfirst?",false);
+			player.getPulseManager().run(fillPulse);
+			return true;}
+	};
+	public Pulse windPulse = new Pulse(2) {
+		//the crank
+		GameObject windobj = new GameObject(11163,3659,3525,1);
+		@Override
+		public boolean pulse() {
+			try {
+				sleep(1800L);
+			}catch(Exception e){
+				System.out.println(e);
+			}
+			//player.getProperties().setTeleportLocation(new Location(3659,3524,1));
+			player.faceLocation(new Location(3659,3525,1));
+			wind(player,windobj);
+			player.getWalkingQueue().reset();
+			player.getWalkingQueue().addPath(3658,3524,true);
+			player.getPulseManager().run(emptyPulse);
+			return true;}
+	};
+	public Pulse fillPulse = new Pulse(2) {
+		//the hopper
+		@Override
+		public boolean pulse() {
+			if((boolean)player.getAttribute("bgfirst?",true) == false) {
+				try {
+					sleep(3000L);
+				} catch (Exception e) {
+					System.out.println(e);
+				}
+			}
+			if(hasBoneInInventory(player)){
+				bone = getBone(player);
+			}  else {
+				player.debug("No bones in inventory, or bones not in bones array.");
+				player.setAttribute("bgfirst?",true);
+				return true;
+			}
+
+			player.faceLocation(new Location(3660,3525,1));
+			if (player.getInventory().remove(new Item(bone.getItemId()))) {
+				player.getLocks().lockInteractions(2);
+				player.debug("Using bone " + bone.getItemId() + " on grinder.. bone info:" + b);
+				player.animate(Animation.create(1649));
+				player.getConfigManager().set(408, bone.getConfigValue(true), true);
+				player.sendMessage("You put some bones in the grinder's hopper.", 1);
+				player.getWalkingQueue().reset();
+				player.getWalkingQueue().addPath(3659,3524,true);
+				player.getPulseManager().run(windPulse);
+			}
+			return true;
+		}
+	};
 
 	/**
 	 * Checks if the player has the amulet equipped.
@@ -169,7 +255,7 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 			return;
 		}
 		final Bones bone = Bones.forConfigValue(player.getConfigManager().get(408), false);
-		player.lock(2);
+		player.getLocks().lockInteractions(2);
 		player.animate(Animation.create(1650));
 		player.getConfigManager().set(408, 0, true);
 		player.sendMessage("You fill a pot with crushed bones.");
@@ -183,7 +269,7 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 	 */
 	private void wind(Player player, GameObject object) {
 		final Bones bone = Bones.forConfigValue(player.getConfigManager().get(408), true);
-		player.lock(3);
+		player.getLocks().lockInteractions(3);
 		player.animate(Animation.create(1648));
 		player.sendMessage("You wind the grinder handle.");
 		if (hasBones(player, object, true)) {
@@ -209,6 +295,30 @@ public final class PhasmatysZone extends MapZone implements Plugin<Object> {
 		return false;
 	}
 
+	public static boolean hasBoneInInventory(Player player){
+		Bones[] bones = Bones.values();
+		for (int c = 0; c < bones.length; c++) {
+			Bones bone = bones[c];
+			int boneId = bone.getItemId();
+			if(player.getInventory().containsItem(new Item(boneId))){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static Bones getBone(Player player){
+		Bones[] bones = Bones.values();
+		for (int b = 0; b < bones.length; b++) {
+			Bones bone = bones[b];
+			int boneId = bone.getItemId();
+			if(player.getInventory().containsItem(new Item(boneId))){
+				return bone;
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Worships the ectofuntus.
 	 * @param player the player.

From b03a796f3f787ac8e296929d315c74048931e1a2 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 18:02:01 -0500
Subject: [PATCH 07/12] Added the garden supplier and their shop

---
 .../npc/city/falador/gardensupplier.java      | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 Server/src/plugin/npc/city/falador/gardensupplier.java

diff --git a/Server/src/plugin/npc/city/falador/gardensupplier.java b/Server/src/plugin/npc/city/falador/gardensupplier.java
new file mode 100644
index 000000000..5595f8bc0
--- /dev/null
+++ b/Server/src/plugin/npc/city/falador/gardensupplier.java
@@ -0,0 +1,61 @@
+package plugin.npc.city.falador;
+
+import org.crandor.game.content.dialogue.DialoguePlugin;
+import org.crandor.game.node.entity.npc.NPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.plugin.InitializablePlugin;
+
+/**
+ * Handles the garden supplier NPC
+ * @author ceik
+ */
+@InitializablePlugin
+public class gardensupplier extends DialoguePlugin {
+    public gardensupplier(){
+        /**
+         * Empty
+         */
+    }
+    public gardensupplier(Player player){super(player);}
+
+    @Override
+    public DialoguePlugin newInstance(Player player){return new gardensupplier(player);}
+
+    @Override
+    public boolean open(Object... args){
+        npc("Hello, I sell many plants. Would you like","to see what I have?");
+        stage = 0;
+        return true;
+    }
+
+    @Override
+    public boolean handle(int componentId, int buttonId){
+        switch(stage){
+            case 0:
+                player.getDialogueInterpreter().sendOptions("Select one","Yes, please!","No, thanks.");
+                stage++;
+                break;
+            case 1:
+                switch(buttonId){
+                    case 1:
+                        player("Yes, please!");
+                        stage++;
+                        break;
+                    case 2:
+                        player("No, thanks.");
+                        stage = 10;
+                        break;
+                }
+                break;
+            case 2:
+                end();
+                new NPC(4251).openShop(player);
+                break;
+            case 10:
+                end();
+                break;
+        }
+        return true;
+    }
+    public int[] getIds() { return new int[] {4251};}
+}

From f0e40199be104de5ba3f4a9c07fbd9cc69f52c3b Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 18:04:31 -0500
Subject: [PATCH 08/12] Pyramid now correctly awards lap completion experience

---
 .../src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java
index e6233f305..7cac5d94f 100644
--- a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java
+++ b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java
@@ -371,6 +371,7 @@ public final class AgilityPyramidCourse extends AgilityCourse {
 		GameWorld.submit(new Pulse(3, player) {
 			@Override
 			public boolean pulse() {
+				player.getSkills().addExperience(Skills.AGILITY,1000);
 				if (player.getConfigManager().get(640) == 505 || player.getConfigManager().get(640) == 515) {
 					player.getPacketDispatch().sendMessage("You find nothing on top of the pyramid.");
 					return true;

From fb67c8be9342412e9c5a724629b8fbd8450eeda8 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 18:08:29 -0500
Subject: [PATCH 09/12] Players can now get the quest cape at the current # of
 acquirable points

---
 Server/src/plugin/interaction/item/QuestCapePlugin.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Server/src/plugin/interaction/item/QuestCapePlugin.java b/Server/src/plugin/interaction/item/QuestCapePlugin.java
index 329b0b0de..6585d4aaf 100644
--- a/Server/src/plugin/interaction/item/QuestCapePlugin.java
+++ b/Server/src/plugin/interaction/item/QuestCapePlugin.java
@@ -14,6 +14,7 @@ import org.crandor.plugin.Plugin;
  */
 @InitializablePlugin
 public final class QuestCapePlugin extends OptionHandler {
+	final int MAX_QP = 63;
 
 	@Override
 	public Plugin<Object> newInstance(Object arg) throws Throwable {
@@ -24,7 +25,7 @@ public final class QuestCapePlugin extends OptionHandler {
 
 	@Override
 	public boolean handle(Player player, Node node, String option) {
-		if (!player.getQuestRepository().hasCompletedAll()) {
+		if (!(player.getQuestRepository().getPoints() == MAX_QP)) {
 			player.getPacketDispatch().sendMessage("You cannot wear this " + node.getName().toLowerCase() + " yet.");
 			return true;
 		}

From 5c91d2291e99c8ea6714f86e029d7f1944320356 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 18:15:48 -0500
Subject: [PATCH 10/12] Added new npcs and shops

---
 Server/server.sql | 111 ++++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/Server/server.sql b/Server/server.sql
index 7ab709671..577d90b80 100644
--- a/Server/server.sql
+++ b/Server/server.sql
@@ -1,11 +1,11 @@
 -- phpMyAdmin SQL Dump
--- version 4.9.0.1
+-- version 5.0.1
 -- https://www.phpmyadmin.net/
 --
--- Host: 127.0.0.1
--- Generation Time: Mar 09, 2020 at 11:30 PM
--- Server version: 10.4.6-MariaDB
--- PHP Version: 7.3.9
+-- Host: localhost
+-- Generation Time: Mar 24, 2020 at 12:14 AM
+-- Server version: 10.4.11-MariaDB
+-- PHP Version: 7.4.3
 
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET AUTOCOMMIT = 0;
@@ -14615,6 +14615,7 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (1675, 'Gardener Ghost', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '436,439,438', NULL, NULL, NULL),
 (1681, 'Moss giant', 'His beard seems to have a life of its own.', 60, 50, 50, 55, 70, 70, '65,65,65,65,65,65,65,60,60,60,60,60,60,60,60', NULL, NULL, NULL, NULL, NULL, NULL, 4666, 4665, 4668, NULL, 4666, 4666, NULL, NULL, NULL, 3, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '449,451,450', NULL, NULL, NULL),
 (1686, 'Ghost disciple', 'A ghost disciple.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '436,439,438', NULL, NULL, NULL),
+(1688, 'Ak-Haranu', 'A trader from across the eastern sea.', 10, 1, 1, 1, 1, 1, NULL, NULL, NULL, 0, NULL, 4, NULL, 386, 0, 836, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (1691, 'Undead cow', 'It\'s an undead cow.', 4, 3, 3, 3, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 5849, 0, 5851, NULL, 0, 0, NULL, NULL, NULL, 8, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (1692, 'Undead chicken', 'Yep', 7, 5, 5, 5, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 5387, 0, 5389, NULL, 0, 0, NULL, NULL, NULL, 7, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '355,357,356', NULL, NULL, NULL),
 (1693, 'Giant lobster', 'An extremely vicious lobster.', 128, 30, 30, 30, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6265, 0, 6267, NULL, 0, 0, NULL, NULL, NULL, 6, 71, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -14665,9 +14666,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (1768, 'Cow calf', 'Young, but still beefy.', 6, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 5849, 5850, 5851, NULL, 5849, 5849, NULL, NULL, NULL, NULL, NULL, 8, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '366,368,367', NULL, NULL, NULL),
 (1769, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (1770, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
-(1771, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
-(1772, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
+(1771, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(1772, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (1773, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (1774, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (1775, 'Goblin', 'An ugly green creature.', 5, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, 7, 38, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
@@ -14859,10 +14860,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (2122, 'Trader', 'A trader for the Brown Engine mining company.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2127, 'Trade Referee', 'He is regulating the flow of goods on the trade floor and maintaining order.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2130, 'Black Guard', 'A member of the Black Guard', 48, 34, 34, 34, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(2131, 'Black Guard', 'A member of the Black Guard', 48, 34, 34, 34, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(2132, 'Black Guard', 'A member of the Black Guard', 48, 34, 34, 34, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(2133, 'Black Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(2131, 'Black Guard', 'A member of the Black Guard', 48, 34, 34, 34, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(2132, 'Black Guard', 'A member of the Black Guard', 48, 34, 34, 34, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(2133, 'Black Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 16, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2134, 'Black Guard Berserker', 'An elite member of the Black Guard.', 54, 38, 38, 38, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2135, 'Black Guard Berserker', 'An elite member of the Black Guard.', 54, 38, 38, 38, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2136, 'Black Guard Berserker', 'An elite member of the Black Guard.', 54, 38, 38, 38, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -15052,10 +15053,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (2699, 'Guard', 'He\'s guarding the prison.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (2700, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 422, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (2701, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 422, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(2702, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(2703, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(2704, 'Guard', 'He\'s asleep.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL);
+(2702, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(2703, 'Guard', 'A prison guard.', 18, 13, 13, 13, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
+(2704, 'Guard', 'He\'s asleep.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (2705, 'Guard', 'Keeping an eye out for suspicious activity.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (2706, 'Crab', 'No one likes crabs...', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (2707, 'Seagull', 'A sea bird.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -15251,10 +15252,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (3090, '', 'A mighty warrior', 24, 17, 17, 17, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 7048, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 8, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '511,513,512', NULL, NULL, NULL),
 (3091, '', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '511,513,512', NULL, NULL, NULL),
 (3094, 'Flying Book', 'The book moves by itself!', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3097, 'Entrance Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3098, 'Telekinetic Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3099, 'Alchemy Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(3097, 'Entrance Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(3098, 'Telekinetic Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(3099, 'Alchemy Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3100, 'Enchantment Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3101, 'Graveyard Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3102, 'Maze Guardian', 'A guardian of the arena.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -15456,10 +15457,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (3463, 'Skrach Uglogwee', 'What restful music!', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3476, 'Jubbly bird', 'A large boisterous bird', 11, 6, 6, 8, 8, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6800, 0, 6801, NULL, 0, 0, NULL, NULL, NULL, 0, 7, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3478, 'King Awowogei', NULL, 328, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3484, 'Big Snake', 'A big snake.', 65, 46, 46, 46, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 3538, 0, 3540, NULL, 0, 0, NULL, NULL, NULL, 8, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, '3609,3608,3610', NULL, NULL, NULL),
-(3491, 'Culinaromancer', NULL, 140, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3493, 'Agrith-Na-Na', NULL, 200, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 3501, 3500, 3503, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(3484, 'Big Snake', 'A big snake.', 65, 46, 46, 46, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 3538, 0, 3540, NULL, 0, 0, NULL, NULL, NULL, 8, NULL, NULL, NULL, 1, 1, NULL, NULL, NULL, NULL, NULL, '3609,3608,3610', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(3491, 'Culinaromancer', NULL, 140, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(3493, 'Agrith-Na-Na', NULL, 200, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 3501, 3500, 3503, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3494, 'Flambeed', NULL, 210, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 1750, 1751, 1752, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3495, 'Karamel', NULL, 240, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 422, 425, 836, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (3496, 'Dessourt', NULL, 140, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 3507, 3505, 3510, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -15650,10 +15651,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (4252, 'Macaroni Penguin', 'Beak areful with this one', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4257, 'Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (4258, 'Guard', 'A dwarven guard.', 17, 12, 12, 12, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 99, 0, 102, NULL, 0, 0, NULL, NULL, NULL, 6, 29, NULL, NULL, NULL, 1, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(4259, 'Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(4260, 'Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
-(4261, 'Goblin', 'An ugly green creature.', 10, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
+(4259, 'Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(4260, 'Guard', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
+(4261, 'Goblin', 'An ugly green creature.', 10, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (4262, 'Goblin', 'An ugly green creature.', 10, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (4263, 'Goblin', 'An ugly green creature.', 10, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (4264, 'Goblin', 'An ugly green creature.', 10, 1, 2, 1, 1, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 6185, 6183, 6182, NULL, 6185, 6185, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
@@ -15847,11 +15848,11 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (4635, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (4636, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (4637, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
-(4638, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(4638, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
 (4639, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4640, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(4641, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(4641, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4642, 'Gnome soldier', 'A little warrior.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4643, 'Healthorg and tortoise', 'King Healthorg riding his War Tortoise.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4645, 'Glouphrie the Untrusted', 'A weasly', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -16045,10 +16046,10 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (4971, 'Baby Roc', 'A mountain-dwelling bird. Cute', 100, 40, 40, 40, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 5031, 0, 5033, NULL, 0, 0, NULL, NULL, NULL, 7, 7, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4972, 'Giant Roc', 'A very', 285, 55, 55, 55, 55, 55, NULL, NULL, NULL, 60, NULL, NULL, NULL, 5024, 0, 5027, NULL, 0, 5025, NULL, NULL, NULL, 10, 7, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4975, 'Male slave', 'It looks like he\'s been here a long time.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(4977, 'Female slave', 'She looks like she\'s been down here a long time.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(4989, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(4990, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(4977, 'Female slave', 'She looks like she\'s been down here a long time.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(4989, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(4990, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4991, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4992, 'Mercenary', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (4993, 'Guard', 'He looks a bit aggressive.', 35, 25, 25, 25, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
@@ -16246,9 +16247,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (5376, 'Zombie', 'Examine not added', 23, 25, 1, 25, 1, NULL, '15,25,25,25,25,25,25,15,15,25,25,25,25,25,25', NULL, NULL, 30, 5, NULL, NULL, 5568, 5567, 5569, NULL, 5568, 5568, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL),
 (5377, 'Zombie', 'Examine not added', 30, 38, 1, 28, 1, NULL, '15,25,28,28,25,28,28,15,15,28,25,25,25,25,25', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL),
 (5378, 'Zombie', 'Examine not added', 30, 38, 1, 28, 1, NULL, '15,25,28,28,25,28,28,15,15,28,25,25,25,25,25', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL),
-(5379, 'Zombie', 'Examine not added', 40, 47, 1, 48, 1, NULL, '35,45,45,45,45,45,45,35,35,45,45,45,45,45,45', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL),
-(5380, 'Zombie', 'Examine not added', 40, 47, 1, 48, 1, NULL, '35,45,45,45,45,45,45,35,35,45,45,45,45,45,45', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL);
+(5379, 'Zombie', 'Examine not added', 40, 47, 1, 48, 1, NULL, '35,45,45,45,45,45,45,35,35,45,45,45,45,45,45', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(5380, 'Zombie', 'Examine not added', 40, 47, 1, 48, 1, NULL, '35,45,45,45,45,45,45,35,35,45,45,45,45,45,45', NULL, NULL, 30, 5, NULL, NULL, 5578, 5579, 5580, NULL, 5578, 5578, NULL, NULL, NULL, NULL, NULL, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '931,923,922', NULL, NULL, NULL),
 (5381, 'Skeleton', 'Could do with gaining a few pounds.', 88, 62, 62, 62, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 5485, 0, 5491, NULL, 0, 0, NULL, NULL, NULL, 8, 75, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '774,775,777', NULL, NULL, NULL),
 (5382, 'Animated steel armour', 'Animated steel armour.', 40, 28, 28, 28, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 386, 0, 4167, NULL, 0, 0, NULL, NULL, NULL, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (5384, 'Giant skeleton', 'Big and bony, just how I like them.', 100, 95, 95, 85, 1, NULL, '25,25,25,25,25,25,25,25,25,25,25,25,25,25,25', NULL, 1, NULL, 2, NULL, NULL, 5499, 5489, 5503, NULL, 5499, 5499, 2713, 2718, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -16449,9 +16450,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (5850, 'Outlaw', 'A mean looking outlaw. Don\'t get too close!', 32, 23, 23, 23, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (5851, 'Outlaw', 'A mean looking outlaw. Don\'t get too close!', 32, 23, 23, 23, 1, NULL, NULL, NULL, NULL, 60, NULL, NULL, NULL, 390, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (5852, 'Monkey', 'Weird eyeball thing. Reminds Thok of breakfast.', 85, 60, 60, 40, 60, 60, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 0, 0, NULL, NULL, NULL, 10, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, '629,631,630', NULL, NULL, NULL),
-(5854, 'Bench', 'For sitting on.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(5855, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
+(5854, 'Bench', 'For sitting on.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(5855, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (5856, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (5859, 'H.A.M. Archer', 'He looks pretty skilled with that bow.', 57, 15, 15, 20, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 426, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL),
 (5860, 'H.A.M. Mage', 'He bristles with arcane power.', 57, 15, 15, 20, 1, 20, NULL, NULL, NULL, 60, NULL, NULL, NULL, 429, 0, 836, NULL, 0, 0, NULL, NULL, NULL, 3, NULL, NULL, 2, NULL, 1, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL),
@@ -16649,9 +16650,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (6155, 'Portal', 'The Void Knight will soon weaken the shield.', 250, 1, 1, 30, 1, 15, '100,100,100,100,25,0,0,0,0,0,0,0,0,0,0', NULL, NULL, 125, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6156, 'Portal', 'The Void Knight will soon weaken the shield.', 250, 1, 1, 30, 1, 30, '100,100,50,100,50,0,0,0,0,0,0,0,0,0,0', NULL, NULL, 125, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6157, 'Portal', 'The Void Knight will soon weaken the shield.', 250, 1, 1, 30, 1, 30, '50,50,100,100,50,0,0,0,0,0,0,0,0,0,0', NULL, NULL, 125, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(6159, 'Workman', 'It is cold and solid. Thok will strap it to Marmaros\'s leg.', 114, 50, 50, 65, 50, 50, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, 0, NULL, NULL, NULL, 10, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(6169, 'Squire', 'Squire to the Knights of the Round Table.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(6159, 'Workman', 'It is cold and solid. Thok will strap it to Marmaros\'s leg.', 114, 50, 50, 65, 50, 50, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, 0, NULL, NULL, NULL, 10, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(6169, 'Squire', 'Squire to the Knights of the Round Table.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6170, 'Sir Lancelot', NULL, 118, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 5, NULL, NULL, 400, 422, 836, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6183, 'Guard', 'An officer of the law.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
 (6184, 'Guard', 'An officer of the law.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, '511,513,512', NULL, NULL, NULL),
@@ -16843,9 +16844,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (6433, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (6434, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (6435, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
-(6436, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
-(6437, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
+(6436, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(6437, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (6438, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (6439, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
 (6440, 'Goblin', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '469,472,471', NULL, NULL, NULL),
@@ -17045,9 +17046,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (6729, 'Revenant ork', NULL, 105, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL),
 (6730, 'Revenant knight', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL),
 (6731, 'Queen of Snow', 'Her lack of body heat is unsettling.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(6739, 'Snow imp', 'It looks right at home here.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(6740, 'Snow', 'Snowflakes swirling in the wind.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(6739, 'Snow imp', 'It looks right at home here.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(6740, 'Snow', 'Snowflakes swirling in the wind.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6743, 'Dragon snowman', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '408,410,409', NULL, NULL, NULL),
 (6745, 'Pirate snowman', NULL, 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '703,705,704', NULL, NULL, NULL),
 (6747, 'Snow ranger', 'A snowman armed with a holly bow.', 30, 30, 1, 10, 30, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -17243,9 +17244,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (7113, 'Thug', 'Low on brains', 5, 7, 7, 9, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 386, 0, 836, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL),
 (7114, 'Thug', 'Low on brains', 5, 7, 7, 9, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 386, 0, 836, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL),
 (7115, 'Thaki the delivery dwarf', 'He seems to be enjoying his time in the bar.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(7120, 'Tyras guard', 'One of King Tyras\'s men.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(7125, 'Rabbit', 'A hungry-looking rabbit.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(7120, 'Tyras guard', 'One of King Tyras\'s men.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(7125, 'Rabbit', 'A hungry-looking rabbit.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7128, 'Farmer', 'A gnome farmer.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7129, 'Farmer', 'A gnome farmer.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7130, 'Farmer', 'A gnome farmer.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -17438,9 +17439,9 @@ INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`
 (7593, 'Shifter', 'He\'s a little rough around the edges.', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7605, 'Banker', 'He has unbelievable strength!', 10, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7606, 'Vyrewatch', NULL, 95, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(7607, 'Vyrewatch', NULL, 105, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(7608, 'Vyrewatch', NULL, 120, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(7607, 'Vyrewatch', NULL, 105, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `npc_configs` (`id`, `name`, `examine`, `lifepoints`, `attack_level`, `strength_level`, `defence_level`, `range_level`, `magic_level`, `bonuses`, `poison_amount`, `poison_immune`, `respawn_delay`, `attack_speed`, `movement_radius`, `agg_radius`, `melee_animation`, `defence_animation`, `death_animation`, `spawn_animation`, `magic_animation`, `range_animation`, `start_gfx`, `projectile`, `end_gfx`, `weakness`, `slayer_task`, `slayer_exp`, `combat_style`, `poisonous`, `aggressive`, `start_height`, `prj_height`, `end_height`, `clue_level`, `spell_id`, `combat_audio`, `protect_style`, `force_talk`, `safespot`) VALUES
+(7608, 'Vyrewatch', NULL, 120, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7609, 'Vyrewatch', NULL, 130, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7614, 'Vyrewatch', NULL, 95, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (7615, 'Vyrewatch', NULL, 105, 1, 1, 1, 1, NULL, NULL, NULL, NULL, 60, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -17653,7 +17654,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES
 (123, '{526,1,1,0.0,ALWAYS}', '{1237,1,1,0.0,COMMON}~{826,5,5,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1279,1,1,0.0,COMMON}~{1293,1,1,0.0,UNCOMMON}~{1239,1,1,0.0,UNCOMMON}~{1241,1,1,0.0,UNCOMMON}~{1295,1,1,0.0,UNCOMMON}~{555,2,2,0.0,UNCOMMON}~{559,6,6,0.0,UNCOMMON}~{554,7,7,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{562,3,3,0.0,UNCOMMON}~{561,4,4,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{5318,4,8,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,COMMON}~{5320,3,3,0.0,COMMON}~{5323,1,2,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5322,3,3,0.0,UNCOMMON}~{5321,1,2,0.0,UNCOMMON}~{5306,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,2,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{211,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{225,1,1,0.0,COMMON}~{288,1,1,0.0,RARE}~{6306,15,15,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '');
 INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES
 (124, '', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{557,12,12,0.0,COMMON}~{557,60,60,0.0,COMMON}~{563,2,2,0.0,COMMON}~{561,3,3,0.0,COMMON}~{561,6,6,0.0,COMMON}~{562,3,3,0.0,UNCOMMON}~{560,2,2,0.0,UNCOMMON}~{565,2,2,0.0,RARE}~{556,45,45,0.0,RARE}~{554,6,6,0.0,RARE}~{5104,1,1,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5292,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5296,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5281,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5300,1,1,0.0,RARE}~{995,1,12,0.0,COMMON}~{995,24,24,0.0,COMMON}~{1385,1,1,0.0,UNCOMMON}~{1241,1,1,0.0,UNCOMMON}~{6808,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.745,ALWAYS}~{12158,1,1,0.09,ALWAYS}~{12159,1,1,0.045,ALWAYS}~{12160,1,1,0.112,ALWAYS}~{12163,1,1,0.007,ALWAYS}'),
-(125, '', '{1363,1,1,0.0,COMMON}~{888,3,3,0.0,COMMON}~{1428,1,1,0.0,UNCOMMON}~{890,2,2,0.0,UNCOMMON}~{890,5,5,0.0,UNCOMMON}~{1309,1,1,0.0,UNCOMMON}~{1281,1,1,0.0,RARE}~{1195,1,1,0.0,RARE}~{1181,1,1,0.0,RARE}~{1303,1,1,0.0,RARE}~{892,2,2,0.0,RARE}~{9185,1,1,0.0,RARE}~{564,2,4,0.0,COMMON}~{562,3,3,0.0,COMMON}~{561,4,4,0.0,COMMON}~{563,2,4,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,20,0.0,RARE}~{558,24,24,0.0,RARE}~{4694,2,2,0.0,RARE}~{5291,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5104,1,1,0.0,COMMON}~{12176,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5105,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5281,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,15,15,0.0,COMMON}~{995,465,465,0.0,COMMON}~{447,1,1,0.0,RARE}~{2853,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''),
+(125, '', '{1363,1,1,0.0,COMMON}~{888,3,3,0.0,COMMON}~{1428,1,1,0.0,UNCOMMON}~{890,2,2,0.0,UNCOMMON}~{890,5,5,0.0,UNCOMMON}~{1309,1,1,0.0,UNCOMMON}~{1281,1,1,0.0,RARE}~{1195,1,1,0.0,RARE}~{1181,1,1,0.0,RARE}~{1303,1,1,0.0,RARE}~{892,2,2,0.0,RARE}~{9185,1,1,0.0,RARE}~{564,2,4,0.0,COMMON}~{562,3,3,0.0,COMMON}~{561,4,4,0.0,COMMON}~{563,2,4,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,50,0.0,UNCOMMON}~{558,24,24,0.0,RARE}~{4694,2,2,0.0,RARE}~{5291,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5104,1,1,0.0,COMMON}~{12176,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5105,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5281,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,15,15,0.0,COMMON}~{995,465,465,0.0,COMMON}~{447,1,1,0.0,RARE}~{2853,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''),
 (126, '', '{1428,1,1,0.0,UNCOMMON}~{1391,1,1,0.0,UNCOMMON}~{888,15,15,0.0,RARE}~{1357,1,1,0.0,RARE}~{1432,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{562,4,4,0.0,COMMON}~{564,2,2,0.0,COMMON}~{563,2,2,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{561,5,10,0.0,UNCOMMON}~{565,2,2,0.0,RARE}~{995,15,40,0.0,COMMON}~{995,1,1,0.0,COMMON}~{1454,1,1,0.0,RARE}~{2357,1,1,0.0,RARE}~{355,1,1,0.0,RARE}~{1641,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''),
 (127, '{1363,1,1,0.0,ALWAYS}', '', ''),
 (128, '{526,1,1,0.0,ALWAYS}', '{7862,1,1,0.0,UNCOMMON}', ''),
@@ -17662,7 +17663,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES
 (133, '{526,1,1,0.0,ALWAYS}~{237,1,1,0.0,ALWAYS}', '{7821,1,1,0.0,UNCOMMON}', '{0,1,1,0.84,ALWAYS}~{12158,1,1,0.055,ALWAYS}~{12159,1,1,0.095,ALWAYS}~{12160,1,1,0.006,ALWAYS}~{12163,1,1,0.003,ALWAYS}'),
 (142, '{526,1,1,0.0,ALWAYS}~{2859,1,1,0.0,ALWAYS}', '{7830,1,1,0.0,COMMON}', '{0,1,1,0.885,ALWAYS}~{12158,1,1,0.035,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.051000000000000004,ALWAYS}~{12163,1,1,0.009000000000000001,ALWAYS}'),
 (143, '{2859,1,1,0.0,ALWAYS}', '', ''),
-(145, '', '{1363,1,1,0.0,COMMON}~{888,3,3,0.0,COMMON}~{1428,1,1,0.0,UNCOMMON}~{890,2,2,0.0,UNCOMMON}~{890,5,5,0.0,UNCOMMON}~{1309,1,1,0.0,UNCOMMON}~{1281,1,1,0.0,RARE}~{1195,1,1,0.0,RARE}~{1181,1,1,0.0,RARE}~{1303,1,1,0.0,RARE}~{892,2,2,0.0,RARE}~{9185,1,1,0.0,RARE}~{564,2,4,0.0,COMMON}~{562,3,3,0.0,COMMON}~{561,4,4,0.0,COMMON}~{563,2,4,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,20,0.0,RARE}~{558,24,24,0.0,RARE}~{4694,2,2,0.0,RARE}~{5291,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5104,1,1,0.0,COMMON}~{12176,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5105,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5281,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,15,15,0.0,COMMON}~{995,465,465,0.0,COMMON}~{447,1,1,0.0,RARE}~{2807,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''),
+(145, '', '{1363,1,1,0.0,COMMON}~{888,3,3,0.0,COMMON}~{1428,1,1,0.0,UNCOMMON}~{890,2,2,0.0,UNCOMMON}~{890,5,5,0.0,UNCOMMON}~{1309,1,1,0.0,UNCOMMON}~{1281,1,1,0.0,RARE}~{1195,1,1,0.0,RARE}~{1181,1,1,0.0,RARE}~{1303,1,1,0.0,RARE}~{892,2,2,0.0,RARE}~{9185,1,1,0.0,RARE}~{564,2,4,0.0,COMMON}~{562,3,3,0.0,COMMON}~{561,4,4,0.0,COMMON}~{563,2,4,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,50,0.0,UNCOMMON}~{558,24,24,0.0,RARE}~{4694,2,2,0.0,RARE}~{5291,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5104,1,1,0.0,COMMON}~{12176,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5105,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5281,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,15,15,0.0,COMMON}~{995,465,465,0.0,COMMON}~{447,1,1,0.0,RARE}~{2807,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''),
 (158, '', '{1217,1,1,0.0,UNCOMMON}~{869,1,1,0.0,UNCOMMON}~{1165,1,1,0.0,UNCOMMON}~{1297,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{564,3,3,0.0,COMMON}~{560,2,2,0.0,UNCOMMON}~{556,45,45,0.0,UNCOMMON}~{565,2,2,0.0,COMMON}~{995,8,8,0.0,COMMON}~{2359,1,1,0.0,COMMON}~{187,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.055,ALWAYS}~{12160,1,1,0.129,ALWAYS}~{12163,1,1,0.006,ALWAYS}'),
 (163, '{526,1,1,0.0,ALWAYS}', '{995,1,10,0.0,COMMON}~{2169,1,1,0.0,COMMON}~{2102,1,1,0.0,COMMON}~{2128,1,1,0.0,COMMON}~{2120,1,1,0.0,COMMON}~{2164,1,1,0.0,UNCOMMON}~{2026,1,1,0.0,UNCOMMON}~{2165,1,1,0.0,UNCOMMON}~{2167,1,1,0.0,RARE}~{2025,1,1,0.0,RARE}~{2166,1,1,0.0,UNCOMMON}~{2807,1,1,0.0,RARE}~{2171,1,1,0.0,COMMON}~{2023,1,1,0.0,UNCOMMON}', ''),
 (164, '{526,1,1,0.0,ALWAYS}', '{995,1,10,0.0,COMMON}~{2169,1,1,0.0,COMMON}~{2102,1,1,0.0,COMMON}~{2128,1,1,0.0,COMMON}~{2120,1,1,0.0,COMMON}~{2164,1,1,0.0,UNCOMMON}~{2026,1,1,0.0,UNCOMMON}~{2165,1,1,0.0,UNCOMMON}~{2167,1,1,0.0,RARE}~{2025,1,1,0.0,RARE}~{2166,1,1,0.0,UNCOMMON}~{2825,1,1,0.0,RARE}~{2171,1,1,0.0,COMMON}~{2023,1,1,0.0,UNCOMMON}', ''),
@@ -19021,8 +19022,8 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES
 (5884, '{526,1,1,0.0,ALWAYS}', '{1265,1,1,0.0,COMMON}~{438,1,1,0.0,COMMON}~{2349,1,1,0.0,COMMON}~{436,1,1,0.0,COMMON}~{440,1,1,0.0,COMMON}~{1267,1,1,0.0,UNCOMMON}~{453,1,1,0.0,UNCOMMON}~{2351,1,1,0.0,UNCOMMON}~{561,2,2,0.0,RARE}~{562,2,2,0.0,RARE}~{1139,1,1,0.0,COMMON}~{1375,1,1,0.0,UNCOMMON}~{1363,1,1,0.0,UNCOMMON}~{877,2,2,0.0,UNCOMMON}~{877,11,11,0.0,UNCOMMON}~{995,4,4,0.0,COMMON}~{995,10,10,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1913,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.905,ALWAYS}~{12158,1,1,0.039,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.03,ALWAYS}~{12163,1,1,0.006,ALWAYS}'),
 (5885, '{526,1,1,0.0,ALWAYS}', '{1265,1,1,0.0,COMMON}~{438,1,1,0.0,COMMON}~{2349,1,1,0.0,COMMON}~{436,1,1,0.0,COMMON}~{440,1,1,0.0,COMMON}~{1267,1,1,0.0,UNCOMMON}~{453,1,1,0.0,UNCOMMON}~{2351,1,1,0.0,UNCOMMON}~{561,2,2,0.0,RARE}~{562,2,2,0.0,RARE}~{1139,1,1,0.0,COMMON}~{1375,1,1,0.0,UNCOMMON}~{1363,1,1,0.0,UNCOMMON}~{877,2,2,0.0,UNCOMMON}~{877,11,11,0.0,UNCOMMON}~{995,4,4,0.0,COMMON}~{995,10,10,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1913,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.905,ALWAYS}~{12158,1,1,0.039,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.03,ALWAYS}~{12163,1,1,0.006,ALWAYS}'),
 (5909, '{526,1,1,0.0,ALWAYS}', '{557,2,5,0.0,UNCOMMON}~{562,2,6,0.0,UNCOMMON}~{563,1,2,0.0,UNCOMMON}~{558,4,10,0.0,UNCOMMON}~{554,5,5,0.0,UNCOMMON}~{554,8,8,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1351,1,1,0.0,COMMON}~{1375,1,1,0.0,COMMON}~{882,5,18,0.0,COMMON}~{1349,1,1,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{884,8,8,0.0,COMMON}~{995,58,315,0.0,COMMON}~{440,1,1,0.0,COMMON}~{438,1,1,0.0,COMMON}~{1917,1,1,0.0,COMMON}~{2142,1,1,0.0,COMMON}~{948,1,1,0.0,COMMON}~{1592,1,1,0.0,UNCOMMON}~{9004,1,1,0.0,RARE}~{1595,1,1,0.0,UNCOMMON}~{1619,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{2698,1,1,0.0,RARE}~{956,1,1,0.0,RARE}~{2349,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.9400000000000001,ALWAYS}~{12158,1,1,0.041,ALWAYS}~{12159,1,1,0.012,ALWAYS}~{12160,1,1,0.003,ALWAYS}~{12163,1,1,0.003,ALWAYS}'),
-(5919, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2857,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''),
-(5920, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2833,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''),
+(5919, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2857,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''),
+(5920, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2833,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''),
 (5923, '{526,1,1,0.0,ALWAYS}', '{555,7,7,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{554,6,6,0.0,UNCOMMON}~{558,9,9,0.0,UNCOMMON}~{562,2,2,0.0,RARE}~{559,7,7,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{877,2,12,0.0,COMMON}~{882,7,7,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{995,1,40,0.0,COMMON}~{1438,1,1,0.0,UNCOMMON}~{1440,1,1,0.0,UNCOMMON}~{1965,1,1,0.0,UNCOMMON}~{313,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{2703,1,1,0.0,RARE}', ''),
 (5924, '{526,1,1,0.0,ALWAYS}', '{877,7,7,0.0,COMMON}~{882,2,12,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{555,7,7,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{554,6,6,0.0,UNCOMMON}~{558,9,9,0.0,UNCOMMON}~{562,2,2,0.0,RARE}~{559,7,7,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{995,1,400,0.0,COMMON}~{1965,1,1,0.0,UNCOMMON}~{313,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{1438,1,1,0.0,UNCOMMON}~{1440,1,1,0.0,UNCOMMON}~{2701,1,1,0.0,RARE}', ''),
 (5926, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{882,1,1,0.0,UNCOMMON}~{877,2,2,0.0,UNCOMMON}~{877,4,4,0.0,UNCOMMON}~{1381,1,1,0.0,UNCOMMON}~{863,1,1,0.0,UNCOMMON}~{562,1,1,0.0,RARE}~{557,1,1,0.0,RARE}~{554,1,1,0.0,RARE}~{558,1,1,0.0,RARE}~{995,3,3,0.0,COMMON}~{995,5,5,0.0,COMMON}~{1440,1,1,0.0,RARE}~{2747,1,1,0.0,RARE}~{436,1,1,0.0,RARE}', ''),
@@ -20058,9 +20059,9 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
 (646, '{3257,3447,0,0,0}'),
 (648, '{3220,3471,0,0,6}'),
 (649, '{3149,3210,0,0,0}'),
-(650, '{3148,3205,0,0,0}'),
-(651, '{3148,3207,0,0,0}');
+(650, '{3148,3205,0,0,0}');
 INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
+(651, '{3148,3207,0,0,0}'),
 (652, '{3151,3209,0,0,0}'),
 (656, '{2822,3374,0,0,3}'),
 (657, '{3048,3236,0,1,2}'),
@@ -20524,6 +20525,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
 (1684, '{3660,3517,0,1,7}'),
 (1685, '{3659,3497,0,1,0}'),
 (1686, '{3657,3516,0,1,3}-{3663,3522,0,1,7}-{3654,3518,1,1,6}'),
+(1688, '{3709,3497,0,0,3}'),
 (1691, '{3624,3530,0,1,1}-{3623,3524,0,1,2}-{3618,3526,0,1,6}-{3612,3527,0,1,6}-{3609,3527,0,1,4}'),
 (1692, '{3632,3528,0,1,5}-{3633,3525,0,1,6}-{3631,3529,0,1,3}-{3631,3529,0,1,2}-{3628,3530,0,1,1}-{3631,3530,0,1,4}-{3629,3529,0,1,4}'),
 (1694, '{3673,3491,0,1,3}'),
@@ -20724,10 +20726,10 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
 (2342, '{3196,3231,0,1,4}'),
 (2343, '{2473,3446,0,1,6}'),
 (2344, '{2490,3183,0,1,3}'),
-(2353, '{2324,3179,0,1,5}'),
-(2355, '{2353,3163,0,0,4}'),
-(2359, '{2335,3169,0,1,3}');
+(2353, '{2324,3179,0,1,5}');
 INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
+(2355, '{2353,3163,0,0,4}'),
+(2359, '{2335,3169,0,1,3}'),
 (2360, '{2335,3174,0,1,4}-{2322,3172,0,1,5}'),
 (2361, '{2345,3172,0,1,2}-{2340,3178,0,1,3}'),
 (2362, '{2330,3163,0,1,3}'),
@@ -21115,6 +21117,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
 (4246, '{3480,3484,1,0,0}-{3479,3484,0,1,3}'),
 (4247, '{2639,3291,0,0,0}-{2981,3370,0,0,0}-{3240,3474,0,0,0}-{2737,3500,0,1,6}'),
 (4250, '{3302,3492,0,1,3}'),
+(4251, '{3009,3380,0,1,0}'),
 (4261, '{2569,9851,0,1,3}-{2579,9851,0,1,4}'),
 (4263, '{2584,9838,0,1,6}'),
 (4264, '{2588,9837,0,1,4}'),
@@ -23614,7 +23617,9 @@ INSERT INTO `shops` (`id`, `title`, `general_store`, `stock`, `npcs`, `currency`
 (208, 'Hartwin\'s Longrange Tools', 0, '{882,10000000}-{884,10000000}-{886,10000000}-{888,10000000}-{890,10000000}-{877,10000000}-{9140,10000000}-{9141,10000000}-{841,10}-{843,10}-{849,10}-{853,10}-{857,10}-{861,10}-{837,10}-{9177,10}-{9179,10}-{9181,10}-{9183,10}-{11864,10}-{11866,10}-{11868,10}-{11870,10}-{1063,10}-{1095,10}-{1129,10}-{1129,10}-{1131,10}-{1167,10}-{1133,10}-{1097,10}-{6328,10}-{3749,10}-{1478,10}-{8880,10}-{8882,10000000}-{863,10000000}', '8139', 995, 0),
 (209, 'Holy Wares', 0, '{6746, 20}-{732, 100000}', '1369', 995, 0),
 (210, 'Ranging Guild Ticket Exchange', 0, '{47,10000000}-{1133,10000000}-{892,10000000}-{1169,10000000}-{1135,10000000}-{829,10000000}', '694', 1464, 0),
-(211, 'Rok\'s Choc Box', 0, '{6794,30}-{1973,25}','3045',995,0);
+(211, 'Rok\'s Choc Box', 0, '{6794,30}-{1973,25}', '3045', 995, 0),
+(212, 'Ak-haranu\'s Exotic Goods', 0, '{4740,100000}', '1688', 995, 0),
+(213, 'The Garden Centre', 0, '{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}', '4251', 995, 0);
 
 -- --------------------------------------------------------
 
@@ -23725,7 +23730,7 @@ ALTER TABLE `door_configs`
 -- AUTO_INCREMENT for table `shops`
 --
 ALTER TABLE `shops`
-  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=211;
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=214;
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

From 603fc05a727c9b7e42a6e8b5549f5e602a8a9b29 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Mon, 23 Mar 2020 18:38:34 -0500
Subject: [PATCH 11/12] added GE autostock items

---
 itemstostock.txt | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 itemstostock.txt

diff --git a/itemstostock.txt b/itemstostock.txt
new file mode 100644
index 000000000..31341c6aa
--- /dev/null
+++ b/itemstostock.txt
@@ -0,0 +1,36 @@
+#ooh hash comment system uwu!
+#format is:
+#itemId:amount:price_increase_percentage (as decimal)
+#Weapons and tools
+1359:100:0.9
+1271:100:0.9
+1275:100:0.9
+1357:100:0.9
+1333:10:0.9
+#armor
+1127:50:0.9
+#ores
+453:5000:0.7
+#herbs
+199:1000:0.5 
+201:1000:0.5
+203:1000:0.7
+205:1000:0.7
+207:1000:0.9
+#vials and such
+227:10000:0.9
+229:10000:0.5
+#food
+379:10000:0.65
+#potions
+2452:1000:0.6
+#secondaries
+592:1000:0.6
+2970:1000:0.8
+6018:1000:0.8
+3138:1000:0.8
+223:1000:0.8
+6693:1000:0.9
+1975:1000:0.9
+225:1000:0.9
+

From 007d2abd65a77346c3f757498527b45024232a0a Mon Sep 17 00:00:00 2001
From: Jamix77 <jamiegreening6@gmail.com>
Date: Mon, 23 Mar 2020 23:43:22 +0000
Subject: [PATCH 12/12] Update itemstostock.txt

---
 itemstostock.txt | 49 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/itemstostock.txt b/itemstostock.txt
index 31341c6aa..d7b0e405d 100644
--- a/itemstostock.txt
+++ b/itemstostock.txt
@@ -2,35 +2,34 @@
 #format is:
 #itemId:amount:price_increase_percentage (as decimal)
 #Weapons and tools
-1359:100:0.9
-1271:100:0.9
-1275:100:0.9
-1357:100:0.9
-1333:10:0.9
+1359:100:1.9
+1271:100:1.9
+1275:100:1.9
+1357:100:1.9
+1333:10:1.9
 #armor
-1127:50:0.9
+1127:50:1.9
 #ores
-453:5000:0.7
+453:5000:1.7
 #herbs
-199:1000:0.5 
-201:1000:0.5
-203:1000:0.7
-205:1000:0.7
-207:1000:0.9
+199:1000:1.5 
+201:1000:1.5
+203:1000:1.7
+205:1000:1.7
+207:1000:1.9
 #vials and such
-227:10000:0.9
-229:10000:0.5
+227:10000:1.9
+229:10000:1.5
 #food
-379:10000:0.65
+379:10000:1.65
 #potions
-2452:1000:0.6
+2452:1000:1.6
 #secondaries
-592:1000:0.6
-2970:1000:0.8
-6018:1000:0.8
-3138:1000:0.8
-223:1000:0.8
-6693:1000:0.9
-1975:1000:0.9
-225:1000:0.9
-
+592:1000:1.6
+2970:1000:1.8
+6018:1000:1.8
+3138:1000:1.8
+223:1000:1.8
+6693:1000:1.9
+1975:1000:1.9
+225:1000:1.9