summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/event.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 1de8d7ef0..7abc2eb35 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -403,6 +403,8 @@ OnClock0000:
// Begin the event
if (.@d == .valentine_stday) {
kamibroadcast("Valentine Day begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Valentine";
$@VALENTINE_LOVELETTER = htnew();
$@VALENTINE_GIFTSTACKS = htnew();
@@ -459,6 +461,8 @@ OnClock0000:
// Begin the event
else if (.@d == .patrick_stday) {
kamibroadcast("St. Patrick Day begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Patrick";
$@PATRICK_DAYMAX=.patrick_endday;
enablenpc "sPatrick";
@@ -489,6 +493,8 @@ OnClock0000:
// Begin the event
else if (.@d == .easter_stday && .@m == .easter_stmon) {
kamibroadcast("Easter begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Easter";
}
// End the event the day after
@@ -513,6 +519,8 @@ OnClock0000:
// Begin the event
else if (.@d == .worker_stday && .@m == .worker_stmon) {
kamibroadcast("Worker Day begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Worker";
}
// End the event the day after
@@ -537,6 +545,8 @@ OnClock0000:
// Begin the event
else if (.@d == .thanks_stday && .@m == .thanks_stmon) {
kamibroadcast("Thanksgiving begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Thanksgiving";
}
// End the event the day after
@@ -561,6 +571,8 @@ OnClock0000:
// Begin the event
else if (.@d == .xmas_stday && .@m == .xmas_stmon) {
kamibroadcast("Christmas begun!");
+ if ($EVENT$ != "")
+ FYStopEvent();
$EVENT$="Christmas";
query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'");
sChristmas();