Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 26 insertions, 0 deletions

diff --git a/npc/items/purification_potion.txt b/npc/items/purification_potion.txt
new file mode 100644
index 00000000..47f84f3b
--- /dev/null
+++ b/npc/items/purification_potion.txt
@@ -0,0 +1,26 @@
+
+function	script	usePurificationPotion	{
+    if (isat("011-1", 88,67))
+        goto L_Wyara_Pond;
+    goto L_NoUse;
+
+L_NoUse:
+    message strcharinfo(0), "You don't know what to do with this.";
+    getitem "PurificationPotion", 1;
+    return;
+
+L_Wyara_Pond:
+    @Q_MASK = NIBBLE_2_MASK;
+    @Q_SHIFT = NIBBLE_2_SHIFT;
+    @Q_status = (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
+
+    if (@Q_status < 1)
+        goto L_NoUse;
+    if (@Q_status <= 2)
+        @Q_status = @Q_status + 1;
+
+    message strcharinfo(0), "You pour the potion into the pond.";
+
+    QUEST_MAGIC2 = (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
+    return;
+}