Merge pull request #173 from wushin/halloween-annual

Halloween Annual Base Commit

1 files changed, 21 insertions, 1 deletions

diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 40af55ff..4d3cdf68 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -1,6 +1,5 @@
 // Annual Timer
 // One timer to check to enable all holiday events
-
 017-9.gat,26,28,0|script|#HolidayConfig|-1,
 {
     end;
@@ -16,6 +15,27 @@ L_StartTimer:
 OnTimer20000:
     setnpctimer 0;
     cmdothernpc "#XmasConfig", "RestartQuest";
+    cmdothernpc "#HalloweenConfig", "RestartQuest";
     initnpctimer;
     end;
 }
+017-9.gat,31,24,0|script|HolidayDebug#1|105,
+{
+    if(getgmlevel() < 40)
+        goto L_End;
+
+    menu
+        "Xmas.", L_XmasDebug,
+        "Halloween.", L_HalloweenDebug;
+
+L_XmasDebug:
+    callfunc "XmasDebug";
+    goto L_End;
+
+L_HalloweenDebug:
+    callfunc "HalloweenDebug";
+    goto L_End;
+
+L_End:
+    end;
+}