Alias Thanksgiving on @event so it can be tested with more ease

2 files changed, 30 insertions, 25 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 3104ef49d..b9048508f 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -141,15 +141,16 @@ function	script	GlobalEventMenu	{
     function seasonManagement {
         clear;
         mes l("Current event: @@", $EVENT$);
-        menu
-            l("Disable event"), -,
-            l("Enable Valentine Day"), -,
-            l("Enable St. Patrick Day"), -,
-            l("Enable Easter"), -,
-            l("Enable Worker's Day"), -,
-            l("Enable Christmas"), -,
-            l("Enable Demure's Birthday"), -,
-            l("Reset Kill Saulc Event (Monthly)"), -;
+        select
+            l("Disable event"),
+            l("Enable Valentine Day"),
+            l("Enable St. Patrick Day"),
+            l("Enable Easter"),
+            l("Enable Worker's Day"),
+            l("Enable Thanksgiving"),
+            l("Enable Christmas"),
+            l("Enable Demure's Birthday"),
+            l("Reset Kill Saulc Event (Monthly)");
 
         switch (@menu) {
             case 1: sClear(); set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND;
@@ -158,13 +159,13 @@ function	script	GlobalEventMenu	{
                 set $EVENT$, "Valentine"; $@VALENTINE_LOVELETTER = htnew(); $@VALENTINE_GIFTSTACKS = htnew(); logmes "Enabled VALENTINE DAY event.", LOGMES_ATCOMMAND;
                 break;
             case 3:
-            $EVENT$="St. Patrick";
-            $@PATRICK_DAYMAX=31;
-            enablenpc "sPatrick";
-            enablenpc "Patrick Saulc";
-            enablenpc "St. Patrick Gold Pot";
-            donpcevent "St. Patrick Gold Pot::OnForcedMove";
-            logmes "Enabled ST. PATRICK DAY event (until day 31).", LOGMES_ATCOMMAND;
+                $EVENT$="St. Patrick";
+                $@PATRICK_DAYMAX=31;
+                enablenpc "sPatrick";
+                enablenpc "Patrick Saulc";
+                enablenpc "St. Patrick Gold Pot";
+                donpcevent "St. Patrick Gold Pot::OnForcedMove";
+                logmes "Enabled ST. PATRICK DAY event (until day 31).", LOGMES_ATCOMMAND;
                 break;
             case 4: sEaster(); break;
             case 5:
@@ -176,15 +177,19 @@ function	script	GlobalEventMenu	{
                */
                 break;
             case 6:
-                    logmes "Enabled CHRISTMAS event.", LOGMES_ATCOMMAND;
-                    query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'");
-                    sChristmas(); break;
+                set $EVENT$, "Thanksgiving";
+                logmes "Enabled THANKS GIVING event.", LOGMES_ATCOMMAND;
+                break;
             case 7:
-                    $EVENT$=any("Demure Birthday", "Blame Saulc");
-                    dispbottom("Maybe in future this increases everyone attack speed? Well, for now,");
-                    dispbottom("This is not actually an event, it just lower prices at Lua GM shop.");
-                    break;
-            case 8: DelItemFromEveryPlayer(MurdererCrown); break;
+                logmes "Enabled CHRISTMAS event.", LOGMES_ATCOMMAND;
+                query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'");
+                sChristmas(); break;
+            case 8:
+                $EVENT$=any("Demure Birthday", "Blame Saulc");
+                dispbottom("Maybe in future this increases everyone attack speed? Well, for now,");
+                dispbottom("This is not actually an event, it just lower prices at Lua GM shop.");
+                break;
+            case 9: DelItemFromEveryPlayer(MurdererCrown); break;
         }
 
         return;
diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index b02d59fc5..cb6732565 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -112,7 +112,7 @@ function	script	sThanksgiving	{
         sleep2(60);
     }
     mes l(".:: Congratulations ::.");
-    //#THANKS_DAY = gettime(5);
+    #THANKS_DAY = gettime(5);
     #THANKS_STREAK+=1;
     if (debug || $@GM_OVERRIDE) {
         mes l("You got a %d", .@luck);