Update annuals script to use kamibroadcast instead of legacy channelmes + announce

1 files changed, 20 insertions, 40 deletions

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index ada71f3dc..d27be4f67 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -113,26 +113,22 @@ OnClock0000:
     if (.@m >=.valentine_stmon && .@m <= .valentine_endmon) {
         // It's tomorrow: Send out an announcement
         if (.@d == .valentine_stday - 1) {
-            channelmes("#world", "Valentine Day will start tomorrow!");
-            announce ("Valentine Day will start tomorrow!"), bc_all|bc_npc;
+            kamibroadcast("Valentine Day will start tomorrow!");
         }
         // Last Day: Send out an announcement
         if (.@d == .valentine_endday) {
-            channelmes("#world", "It's the last day for Valentine Event! Hurry up!");
-            announce ("It's the last day for Valentine Event! Hurry up!"), bc_all|bc_npc;
+            kamibroadcast("It's the last day for Valentine Event! Hurry up!");
         }
         // Begin the event
         if (.@d == .valentine_stday) {
-            channelmes("#world", "Valentine Day begun!");
-            announce ("Valentine Day begun!"), bc_all|bc_npc;
+            kamibroadcast("Valentine Day begun!");
             $EVENT$="Valentine";
             $@VALENTINE_LOVELETTER = htnew();
             $@VALENTINE_GIFTSTACKS = htnew();
         }
         // End the event the day after
         if (.@d == .valentine_endday+1) {
-            channelmes("#world", "Valentine Day ended!");
-            announce ("Valentine Day ended!"), bc_all|bc_npc;
+            kamibroadcast("Valentine Day ended!");
             sClear();
             $EVENT$="";
         }
@@ -146,18 +142,15 @@ OnClock0000:
     if (.@m >=.patrick_stmon && .@m <= .patrick_endmon) {
         // It's tomorrow: Send out an announcement
         if (.@d == .patrick_stday - 1) {
-            channelmes("#world", "St. Patrick Day will start tomorrow!");
-            announce ("St. Patrick Day will start tomorrow!"), bc_all|bc_npc;
+            kamibroadcast("St. Patrick Day will start tomorrow!");
         }
         // Last Day: Send out an announcement
         if (.@d == .patrick_endday) {
-            channelmes("#world", "It's the last day for St. Patrick Event! Hurry up!");
-            announce ("It's the last day for St. Patrick Event! Hurry up!"), bc_all|bc_npc;
+            kamibroadcast("It's the last day for St. Patrick Event! Hurry up!");
         }
         // Begin the event
         if (.@d == .patrick_stday) {
-            channelmes("#world", "St. Patrick Day begun!");
-            announce ("St. Patrick Day begun!"), bc_all|bc_npc;
+            kamibroadcast("St. Patrick Day begun!");
             $EVENT$="St. Patrick";
             $@PATRICK_DAYMAX=.patrick_endday;
             enablenpc "sPatrick";
@@ -167,8 +160,7 @@ OnClock0000:
         }
         // End the event the day after
         if (.@d == .patrick_endday+1) {
-            channelmes("#world", "St. Patrick Day ended!");
-            announce ("St. Patrick Day ended!"), bc_all|bc_npc;
+            kamibroadcast("St. Patrick Day ended!");
             sClear();
             $EVENT$="";
             donpcevent "sPatrick::OnCleanUp";
@@ -181,24 +173,20 @@ OnClock0000:
     if (.@m >=.easter_stmon && .@m <= .easter_endmon) {
         // It's tomorrow: Send out an announcement
         if (.@d == .easter_stday - 1 && .@m == .easter_stmon) {
-            channelmes("#world", "Easter will start tomorrow!");
-            announce ("Easter will start tomorrow!"), bc_all|bc_npc;
+            kamibroadcast("Easter will start tomorrow!");
         }
         // Last Day: Send out an announcement
         if (.@d == .easter_endday && .@m == .easter_endmon) {
-            channelmes("#world", "It's the last day for Easter Event! Hurry up!");
-            announce ("It's the last day for Easter Event! Hurry up!"), bc_all|bc_npc;
+            kamibroadcast("It's the last day for Easter Event! Hurry up!");
         }
         // Begin the event
         if (.@d == .easter_stday && .@m == .easter_stmon) {
-            channelmes("#world", "Easter begun!");
-            announce ("Easter begun!"), bc_all|bc_npc;
+            kamibroadcast("Easter begun!");
             $EVENT$="Easter";
         }
         // End the event the day after
         if (.@d == .easter_endday+1 && .@m == .easter_endmon) {
-            channelmes("#world", "Easter ended!");
-            announce ("Easter ended!"), bc_all|bc_npc;
+            kamibroadcast("Easter ended!");
             sClear();
             $EVENT$="";
         }
@@ -209,24 +197,20 @@ OnClock0000:
     if (.@m >=.worker_stmon && .@m <= .worker_endmon) {
         // It's tomorrow: Send out an announcement
         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;
+            kamibroadcast("Worker Day will start tomorrow!");
         }
         // Last Day: Send out an announcement
         if (.@d == .worker_endday && .@m == .worker_endmon) {
-            channelmes("#world", "It's the last day for Worker Day Event! Hurry up!");
-            announce ("It's the last day for Worker Day Event! Hurry up!"), bc_all|bc_npc;
+            kamibroadcast("It's the last day for Worker Day Event! Hurry up!");
         }
         // Begin the event
         if (.@d == .worker_stday && .@m == .worker_stmon) {
-            channelmes("#world", "Worker Day begun!");
-            announce ("Worker Day begun!"), bc_all|bc_npc;
+            kamibroadcast("Worker Day begun!");
             $EVENT$="Worker Day";
         }
         // End the event the day after
         if (.@d == .worker_endday+1 && .@m == .worker_endmon) {
-            channelmes("#world", "Worker Day ended!");
-            announce ("Worker Day ended!"), bc_all|bc_npc;
+            kamibroadcast("Worker Day ended!");
             sClear();
             $EVENT$="";
         }
@@ -261,26 +245,22 @@ OnClock0000:
     if (.@m >=.xmas_stmon && .@m <= .xmas_endmon) {
         // It's tomorrow: Send out an announcement
         if (.@d == .xmas_stday - 1 && .@m == .xmas_stmon) {
-            channelmes("#world", "Christmas will start tomorrow!");
-            announce ("Christmas will start tomorrow!"), bc_all|bc_npc;
+            kamibroadcast("Christmas will start tomorrow!");
         }
         // Last Day: Send out an announcement
         if (.@d == .xmas_endday && .@m == .xmas_endmon) {
-            channelmes("#world", "It's the last day for Christmas Event! Hurry up!");
-            announce ("It's the last day for Christmas Event! Hurry up!"), bc_all|bc_npc;
+            kamibroadcast("It's the last day for Christmas Event! Hurry up!");
         }
         // Begin the event
         if (.@d == .xmas_stday && .@m == .xmas_stmon) {
-            channelmes("#world", "Christmas begun!");
-            announce ("Christmas begun!"), bc_all|bc_npc;
+            kamibroadcast("Christmas begun!");
             $EVENT$="Christmas";
             query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'");
             sChristmas();
         }
         // End the event the day after
         if (.@d == .xmas_endday+1 && .@m == .xmas_endmon) {
-            channelmes("#world", "Christmas ended!");
-            announce ("Christmas ended!"), bc_all|bc_npc;
+            kamibroadcast("Christmas ended!");
             sClear();
             $EVENT$="";
         }