Easter event control.

2 files changed, 25 insertions, 0 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 898db8331..4d98dd002 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -28,6 +28,22 @@ function	script	GlobalEventMenu	{
         return;
     }
 
+    function seasonManagement {
+        clear;
+        mes l("Current event: @@", $EVENT$);
+        menu
+            l("Disable event"), -,
+            l("Enable Easter"), -;
+
+        switch (@menu)
+        {
+            case 1: set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND; break;
+            case 2: set $EVENT$, "Easter"; logmes "Enabled EASTER event.", LOGMES_ATCOMMAND; break;
+        }
+
+        return;
+    }
+
     do
     {
         clear;
@@ -39,6 +55,7 @@ function	script	GlobalEventMenu	{
         select
             l("Experience Rate management"),
             l("Drop Rate management"),
+            l("Change Season Event"),
             rif(getarg(0,0), menuimage("actions/home", l("Return to Super Menu")));
 
         //.@c = getarg(0,0) ? 2 : 1; // 1 = back to event menu, 2 = back to super menu
@@ -47,6 +64,7 @@ function	script	GlobalEventMenu	{
         {
             case 1: rateManagement; break;
             case 2: dropManagement; break;
+            case 3: seasonManagement; break;
             default: return;
         }
 
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index 838b5d868..865d5a6a1 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -5,6 +5,7 @@ function	script	SoulMenhir	{
     menu
         l("Touch it."), L_Bind,
         rif($@GM_EVENT, l("Send soul to the Mana Plane for GM events")), L_Aeros,
+        rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
         l("Leave it alone."), L_Return;
 
 //L_Towel:
@@ -43,6 +44,12 @@ L_Aeros:
     message strcharinfo(0), l("You are now at the Mana Plane of Existence, at the Floating Island of Aeros.");
     close;
 
+L_Easter:
+    if ($EVENT$ != "Easter") goto L_DontPanic;
+    warp "001-4", 151, 157;
+    message strcharinfo(0), l("You are now at the Mana Plane of Existence, at the Magical Forest.");
+    close;
+
 L_DontPanic:
     message strcharinfo(0), l("(A strange barrier keeps you from touching the stone at this time.)");
     goto L_Return;