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, 17 insertions, 0 deletions

diff --git a/npc/functions/miriam.txt b/npc/functions/miriam.txt
new file mode 100644
index 00000000..e59b736b
--- /dev/null
+++ b/npc/functions/miriam.txt
@@ -0,0 +1,17 @@
+function	script	MiriamGoal	{
+    if (QUEST_MIRIAM_run > 0)
+        QUEST_MIRIAM_run = 0 - (gettimetick(2) - QUEST_MIRIAM_run);
+    return;
+}
+
+function	script	MiriamExpire	{
+    if (QUEST_MIRIAM_run > 0)
+        set QUEST_MIRIAM_run, 0 - 2; // force failute (expired)
+    return;
+}
+
+function	script	MiriamCheat	{
+    if (QUEST_MIRIAM_run > 0)
+        set QUEST_MIRIAM_run, 0 - 1; // force failure (cheating)
+    return;
+}