summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-15 14:03:39 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-15 14:03:39 -0300
commit6b800ae5ce3d58646423617debf3fb9ed2a265e4 (patch)
tree6bd07207b5843e8cc611ef69cb624b78f363cd23 /npc
parent454b36feb213a6eab58d3f0ecf9a19cedf1c333e (diff)
downloadserverdata-6b800ae5ce3d58646423617debf3fb9ed2a265e4.tar.gz
serverdata-6b800ae5ce3d58646423617debf3fb9ed2a265e4.tar.bz2
serverdata-6b800ae5ce3d58646423617debf3fb9ed2a265e4.tar.xz
serverdata-6b800ae5ce3d58646423617debf3fb9ed2a265e4.zip
St. Patrick Day event help.
Prevent Aurora Event Framework from overriding other events.
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/event.txt2
-rw-r--r--npc/functions/news.txt25
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;
}