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

diff --git a/npc/annuals/halloween/munro.txt b/npc/annuals/halloween/munro.txt
new file mode 100644
index 00000000..93d01764
--- /dev/null
+++ b/npc/annuals/halloween/munro.txt
@@ -0,0 +1,46 @@
+026-1,24,37,0	script	Munro	NPC183,{
+    callfunc "HalloweenCheckOld";
+    callfunc "TrickOrTreatTally";
+    if (($@halloween_time == $@halloween_reward_time) && (@npc_tally >= $@halloween_charm_count) && !(HALLOWEENTIME & $@halloween_got_charm_reward))
+        goto L_Halloween;
+    goto L_NoReward;
+
+L_NoReward:
+    mes "[Munro]";
+    mes "\"Greetings mortal.\"";
+    next;
+    mes "\"Once again we come to that time of year when the veil is thin\"";
+    next;
+    mes "\"All those who have passed on can part the veil to return.\"";
+    next;
+    mes "\"A time to celebrate our ancestors and chase evil away.\"";
+    next;
+    mes "\"Celebrate the holiday with me and I will reward you later.\"";
+    goto L_Exit;
+
+L_Halloween:
+    mes "[Munro]";
+    mes "\"You have shown to have the Halloween spirit. Take this charm.\"";
+    HALLOWEENTIME = HALLOWEENTIME | $@halloween_got_charm_reward;
+    getitem "SkeletonCharm",1;
+    goto L_Exit;
+
+L_Exit:
+    close;
+}
+function	script	SpawnMunro	{
+    if ($@halloween_time)
+        goto L_EnableMunro;
+    goto L_DisableMunro;
+
+L_EnableMunro:
+    enablenpc "Munro";
+    goto L_Return;
+
+L_DisableMunro:
+    disablenpc "Munro";
+    goto L_Return;
+
+L_Return:
+    return;
+}