From 7d6ce8de7accad073621fb24414f8b994748adcc Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 9 Mar 2021 17:58:44 -0300
Subject: Dark Eggshell Hat can no longer be obtained outside Easter. (WARNING:
 Does not survives server restarts)

---
 npc/functions/event.txt   |  2 +-
 npc/functions/seasons.txt | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'npc/functions')

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 733658c91..c594bc562 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -533,7 +533,7 @@ OnClock0000:
             kamibroadcast("Easter begun!");
             if ($EVENT$ != "")
                 FYStopEvent();
-            $EVENT$="Easter";
+            sEaster();
         }
         // End the event the day after
         else if (.@d == .easter_endday+1 && .@m == .easter_endmon) {
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index fa3b5c5bd..f79b9e3d2 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -119,6 +119,14 @@ function	script	sValentine	{
     return;
 }
 
+function	script	sEaster	{
+        // Enable event
+        set $EVENT$, "Easter";
+        addmonsterdrop(Forain, DarkEggshellHat, 2);
+        logmes "Enabled EASTER event.", LOGMES_ATCOMMAND;
+        return;
+}
+
 // This allows GMs to change seasons if needed
 function	script	SeasonControl	{
     do
@@ -134,6 +142,7 @@ function	script	SeasonControl	{
             "Spring End",
             "SPECIAL - Christmas",
             "SPECIAL - Valentine",
+            "SPECIAL - Easter",
             "FORCED DAYLIGHT",
             "FORCED NIGHTTIME",
             "Abort";
@@ -149,8 +158,9 @@ function	script	SeasonControl	{
             case 8: donpcevent("#SeasonCore::OnSpringEnd"); break;
             case 9: sChristmas(); break;
             case 10: sValentine(); break;
-            case 11: $@WEATHER_NIGHT=false; doevent("#WeatherCore::OnMinute45"); break;
-            case 12: $@WEATHER_NIGHT=true; doevent("#WeatherCore::OnMinute45"); break;
+            case 11: sEaster(); break;
+            case 12: $@WEATHER_NIGHT=false; doevent("#WeatherCore::OnMinute45"); break;
+            case 13: $@WEATHER_NIGHT=true; doevent("#WeatherCore::OnMinute45"); break;
         }
     } while (@menu != 13);
     return;
-- 
cgit v1.2.3-60-g2f50