From 65c634722e6a551388a63193b0c9a28d35ff845f Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 17 May 2020 04:20:20 -0300
Subject: Stop using compound names on events

---
 npc/functions/event.txt       | 6 +++---
 npc/functions/news.txt        | 4 ++--
 npc/functions/soul_menhir.txt | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'npc/functions')

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 0203cf641..87f913de0 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -39,7 +39,7 @@ OnClock2100:
     // act with 100% chances (determinism).
     // As it is being spawn 4 times at a day (like TMW-BR events), because it is
     // flatly and outright IMPOSSIBLE to add a permanent spawn, that is not required.
-    if ($EVENT$ == "St. Patrick" && .@d <= $@PATRICK_DAYMAX) {
+    if ($EVENT$ == "Patrick" && .@d <= $@PATRICK_DAYMAX) {
         for (.@i=0; .@i < getarraysize(.maps$); .@i++) {
             .@m$=.maps$[.@i];
             .@x=getmapinfo(MAPINFO_SIZE_X, .@m$)-20;
@@ -400,7 +400,7 @@ OnClock0000:
         // Begin the event
         else if (.@d == .patrick_stday) {
             kamibroadcast("St. Patrick Day begun!");
-            $EVENT$="St. Patrick";
+            $EVENT$="Patrick";
             $@PATRICK_DAYMAX=.patrick_endday;
             enablenpc "sPatrick";
             enablenpc "Patrick Saulc";
@@ -455,7 +455,7 @@ OnClock0000:
         // Begin the event
         else if (.@d == .worker_stday && .@m == .worker_stmon) {
             kamibroadcast("Worker Day begun!");
-            $EVENT$="Worker Day";
+            $EVENT$="Worker";
         }
         // End the event the day after
         else if (.@d == .worker_endday+1 && .@m == .worker_endmon) {
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 6593e9fd0..aedc04167 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -400,7 +400,7 @@ 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") {
+    } else if ($EVENT$ == "Patrick") {
         mesc ".:: " + l("St. Patrick Day") + " ::.", 2;
         mes "";
         mes l("A golden pot in woodlands shall reward those who wear green.");
@@ -412,7 +412,7 @@ function	script	EventHelp	{
         mes l("Feeling lucky?");
         mesc l("Location: North Woodlands, south of Nivalis."), 3;
         /////////////////////////////////////////////////////////////////////////
-    } else if ($EVENT$ == "Worker Day") {
+    } else if ($EVENT$ == "Worker") {
         mesc ".:: " + l("Worker Day") + " ::.", 2;
         mes "";
         mes l("The International Worker Day is a traditional celebration,");
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index 299d6067c..732322ba1 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -11,7 +11,7 @@ function	script	SoulMenhir	{
         rif($@GM_EVENT, l("Send soul to the Mana Plane for GM events")), L_Aeros,
         rif($EVENT$ == "Valentine", l("[Valentine Day] Send soul to the Valentine Highlands!")), L_Valentine,
         rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
-        rif($EVENT$ == "Worker Day", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
+        rif($EVENT$ == "Worker", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
         rif($EVENT$ == "Christmas", l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
         l("Leave it alone."), L_Return;
 
@@ -82,7 +82,7 @@ L_Easter:
     close;
 
 L_Worker:
-    if ($EVENT$ != "Worker Day") goto L_DontPanic;
+    if ($EVENT$ != "Worker") goto L_DontPanic;
     warp "001-5", 22, 79;
     message strcharinfo(0), l("You are now at the Mana Plane of Existence, at the Contributor's Cave.");
     close;
-- 
cgit v1.2.3-70-g09d2