Check month in Easter, Worker Day and Christmas.

Not on Valentine and St. Patrick Days - Need @Jesusalva for that

1 files changed, 18 insertions, 18 deletions

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 2d688c7a5..5bc602cc3 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -112,9 +112,9 @@ OnClock0000:
             announce ("Valentine Day will start tomorrow!"), bc_all|bc_npc;
         }
         // Last Day: Send out an announcement
-        if (.@d == .valentine_endday - 1) {
+        if (.@d == .valentine_endday) {
             channelmes("#world", "It's the last day for Valentine Event! Hurry up!");
-            announce ("t's the last day for Valentine Event! Hurry up!"), bc_all|bc_npc;
+            announce ("It's the last day for Valentine Event! Hurry up!"), bc_all|bc_npc;
         }
         // Begin the event
         if (.@d == .valentine_stday) {
@@ -147,7 +147,7 @@ OnClock0000:
         // Last Day: Send out an announcement
         if (.@d == .patrick_endday) {
             channelmes("#world", "It's the last day for St. Patrick Event! Hurry up!");
-            announce ("t's the last day for St. Patrick Event! Hurry up!"), bc_all|bc_npc;
+            announce ("It's the last day for St. Patrick Event! Hurry up!"), bc_all|bc_npc;
         }
         // Begin the event
         if (.@d == .patrick_stday) {
@@ -174,23 +174,23 @@ OnClock0000:
     // Handle Easter
     if (.@m >=.easter_stmon && .@m <= .easter_endmon) {
         // It's tomorrow: Send out an announcement
-        if (.@d == .easter_stday - 1) {
+        if (.@d == .easter_stday - 1 && .@m == .easter_stmon) {
             channelmes("#world", "Easter will start tomorrow!");
             announce ("Easter will start tomorrow!"), bc_all|bc_npc;
         }
         // Last Day: Send out an announcement
-        if (.@d == .easter_endday - 1) {
+        if (.@d == .easter_endday && .@m == .easter_endmon) {
             channelmes("#world", "It's the last day for Easter Event! Hurry up!");
-            announce ("t's the last day for Easter Event! Hurry up!"), bc_all|bc_npc;
+            announce ("It's the last day for Easter Event! Hurry up!"), bc_all|bc_npc;
         }
         // Begin the event
-        if (.@d == .easter_stday) {
+        if (.@d == .easter_stday && .@m == .easter_stmon) {
             channelmes("#world", "Easter begun!");
             announce ("Easter begun!"), bc_all|bc_npc;
             $EVENT$="Easter";
         }
         // End the event the day after
-        if (.@d == .easter_endday+1) {
+        if (.@d == .easter_endday+1 && .@m == .easter_endmon) {
             channelmes("#world", "Easter ended!");
             announce ("Easter ended!"), bc_all|bc_npc;
             sClear();
@@ -201,23 +201,23 @@ OnClock0000:
     // Handle Worker Day
     if (.@m >=.worker_stmon && .@m <= .worker_endmon) {
         // It's tomorrow: Send out an announcement
-        if (.@d == .worker_stday - 1) {
+        if (.@d == .worker_stday - 1 && .@m == .worker_stmon) {
             channelmes("#world", "Worker Day will start tomorrow!");
             announce ("Worker Day will start tomorrow!"), bc_all|bc_npc;
         }
         // Last Day: Send out an announcement
-        if (.@d == .worker_endday - 1) {
+        if (.@d == .worker_endday && .@m == .worker_endmon) {
             channelmes("#world", "It's the last day for Worker Day Event! Hurry up!");
-            announce ("t's the last day for Worker Day Event! Hurry up!"), bc_all|bc_npc;
+            announce ("It's the last day for Worker Day Event! Hurry up!"), bc_all|bc_npc;
         }
         // Begin the event
-        if (.@d == .worker_stday) {
+        if (.@d == .worker_stday && .@m == .worker_stmon) {
             channelmes("#world", "Worker Day begun!");
             announce ("Worker Day begun!"), bc_all|bc_npc;
             $EVENT$="Worker Day";
         }
         // End the event the day after
-        if (.@d == .worker_endday+1) {
+        if (.@d == .worker_endday+1 && .@m == .worker_endmon) {
             channelmes("#world", "Worker Day ended!");
             announce ("Worker Day ended!"), bc_all|bc_npc;
             sClear();
@@ -229,17 +229,17 @@ OnClock0000:
     // Handle Christmas
     if (.@m >=.xmas_stmon && .@m <= .xmas_endmon) {
         // It's tomorrow: Send out an announcement
-        if (.@d == .xmas_stday - 1) {
+        if (.@d == .xmas_stday - 1 && .@m == .xmas_stmon) {
             channelmes("#world", "Christmas will start tomorrow!");
             announce ("Christmas will start tomorrow!"), bc_all|bc_npc;
         }
         // Last Day: Send out an announcement
-        if (.@d == .xmas_endday - 1) {
+        if (.@d == .xmas_endday && .@m == .xmas_endmon) {
             channelmes("#world", "It's the last day for Christmas Event! Hurry up!");
-            announce ("t's the last day for Christmas Event! Hurry up!"), bc_all|bc_npc;
+            announce ("It's the last day for Christmas Event! Hurry up!"), bc_all|bc_npc;
         }
         // Begin the event
-        if (.@d == .xmas_stday) {
+        if (.@d == .xmas_stday && .@m == .xmas_stmon) {
             channelmes("#world", "Christmas begun!");
             announce ("Christmas begun!"), bc_all|bc_npc;
             $EVENT$="Christmas";
@@ -247,7 +247,7 @@ OnClock0000:
             sChristmas();
         }
         // End the event the day after
-        if (.@d == .xmas_endday+1) {
+        if (.@d == .xmas_endday+1 && .@m == .xmas_endmon) {
             channelmes("#world", "Christmas ended!");
             announce ("Christmas ended!"), bc_all|bc_npc;
             sClear();