St. Patrick Day event help.

Prevent Aurora Event Framework from overriding other events.

2 files changed, 17 insertions, 10 deletions

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 6c38bd1f4..01afec06b 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -322,7 +322,7 @@ OnClock0000:
         }
 
         // Trigger event framework
-        if (.@dofy)
+        if (.@dofy && $EVENT$ == "")
             FYNewEvent();
         else
             debugmes "\033[1mAnother event is scheduled!";
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index a4bfe3504..994d8cc91 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -363,15 +363,6 @@ function	script	GameNews	{
 }
 
 function	script	EventHelp	{
-            ("Enable Valentine Day"),
-            ("Enable St. Patrick Day"),
-            ("Enable Easter"),
-            ("Enable Worker's Day"),
-            ("Enable Thanksgiving"),
-            ("Enable Event Horizon"),
-            ("Enable Christmas"),
-            ("Enable Demure's Birthday"),
-            ("[FY] Enable Kamelot"),
     if ($EVENT$ == "") return;
 
     if ($EVENT$ == "Kamelot") {
@@ -409,10 +400,26 @@ function	script	EventHelp	{
         mes l("Who will collect the most?!");
         mesc l("Location: Enchanted Forest, access by Soul Menhir."), 3;
         /////////////////////////////////////////////////////////////////////////
+    } else if ($EVENT$ == "St. Patrick") {
+        mesc ".:: " + l("St. Patrick Day") + " ::.", 2;
+        mes "";
+        mes l("A golden pot in woodlands shall reward those who wear green.");
+        mes l("Find it, spin it, and be bestowed in golden rewards!");
+        mes "";
+        mes l("Meanwhile, at 00h, 06h, 12h, 15h, 18h and 21h UTC,");
+        mes l("legendary clovers will spawn almost everywhere.");
+        mes "";
+        mes l("Feeling lucky?");
+        mesc l("Location: North Woodlands, south of Nivalis."), 3;
+        /////////////////////////////////////////////////////////////////////////
     } else {
         mesc l("There's no help available for this event.");
         /////////////////////////////////////////////////////////////////////////
     }
+            ("Enable Worker's Day"),
+            ("Enable Thanksgiving"),
+            ("Enable Event Horizon"),
+            ("Enable Christmas"),
     next;
     return;
 }