1 files changed, 17 insertions, 2 deletions
diff --git a/npc/003-1/events.txt b/npc/003-1/events.txt
index 63e2721e7..1def03e13 100644
--- a/npc/003-1/events.txt
+++ b/npc/003-1/events.txt
@@ -12,8 +12,23 @@
     function handleValentine();
     function handleStPatrick();
     function handleAurora();
+    // Switch annuals
+    if ($EVENT$ == "Patrick")
+        handleStPatrick();
+    /*
+    else if ($EVENT$ == "Valentine")
+        handleValentine();
+    else if ($EVENT$ == "Easter")
+        handleEaster();
+    */
+
+    // Generic
+    if ($EVENT$ != "")
+        handleAurora();
+
+    // No event ongoing
     mesn;
-    mesq l("Heya.");
+    mesq l("Remember, you can talk to my friends in other towns as well!");
     close;
 
 
@@ -164,7 +179,7 @@ function handleValentine {
     mes("10."+$@valentine_name$[9]+" ("+$@valentine_value[9]+")");
 
     if (#VALENTINE_SENT+#VALENTINE_OPENED <= 0)
-        close;
+        return;
     next;
 
     // Handle rewards