Maintenance

1 files changed, 10 insertions, 1 deletions

diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index 7859eb29c..4da8be856 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -40,13 +40,17 @@ function	script	SeasonControl	{
         select
             "Summer Start",
             "Summer End",
+            "Autumn Start",
+            "Autumn End",
             "Abort";
 
         switch (@menu) {
             case 1: donpcevent("#SeasonCore::OnSummerStart"); break;
             case 2: donpcevent("#SeasonCore::OnSummerEnd"); break;
+            case 3: donpcevent("#SeasonCore::OnAutumnStart"); break;
+            case 4: donpcevent("#SeasonCore::OnAutumnEnd"); break;
         }
-    } while (@menu != 3);
+    } while (@menu != 5);
     return;
 }
 
@@ -69,6 +73,10 @@ function	script	SeasonReload	{
     if (season() == AUTUMN && $@SEASON != AUTUMN) {
         donpcevent("#SeasonCore::OnAutumnStart");
     }
+    // Autumn end delete drops
+    if (season() == AUTUMN && $@SEASON == SUMMER) {
+        donpcevent("#SeasonCore::OnAutumnEnd");
+    }
 
     $@SEASON=season();
     return;
@@ -151,6 +159,7 @@ OnAutumnStart:
     end;
 
 OnAutumnEnd:
+    removemapmask "012-1", MASK_AUTUMN;
     delmonsterdrop(Mouboo, Mashmallow);
     end;