1 files changed, 55 insertions, 50 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index ace0c1ba3..48dd5bef5 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -6,56 +6,8 @@
 // Description:
 //    Handles all major events on TMW2 (Christmas, Easter, Worker Day, etc.)
 
-function	script	GlobalEventMenu	{
-
-    function resetCandor {
-        $@FEFE_CAVE_LEVEL=0;
-        $@FEFE_DELAY=0;
-        $@FEFE_DIFFICULTY=0;
-        $@FEFE_CAVE_HERO$="";
-        mesc "Candor Fight Reset!";
-        return;
-    }
-
-    function rateManagement {
-        clear;
-        mes l("To get the current rate:");
-        mes col("    @exprate", 7);
-        next;
-        mes l("To set the exp rate:");
-        mes col("    @exprate ##Brate##b hours", 7);
-        next;
-        mes l("To reset back to normal:");
-        mes col("    @exprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
-        next;
-        return;
-    }
-
-    function dropManagement {
-        clear;
-        mes l("To get the current rate:");
-        mes col("    @rates", 7);
-        next;
-        mes l("To set the drop rate:");
-        mes col("    @droprate ##Brate##b hours", 7);
-        next;
-        mes l("To reset back to normal:");
-        mes col("    @droprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
-        next;
-        return;
-    }
-
-    // Easter is map-only, so it can be handled here instead of seasons.txt
-    function sEaster {
-
-        // Enable event
-        set $EVENT$, "Easter";
-        logmes "Enabled EASTER event.", LOGMES_ATCOMMAND;
-        return;
-    }
-
-    // WARNING, possibly dangerous.
-    function sClear {
+// WARNING, possibly dangerous.
+function	script	sClear	{
         // Delete all Easter Stuff
         if ($EVENT$ != "Easter") {
             DelItemFromEveryPlayer(GoldenEasteregg);
@@ -102,11 +54,64 @@ function	script	GlobalEventMenu	{
             enablenpc "Demure#ValentineFinal";
         }
 
+        // Simpler events
+        $PATRICK_DAYCTRL=0;
+        $PATRICK_DAYMAX=0;
+
         // We must remove any event drop
         charcommand("@reloadmobdb");
         SeasonReload(1);
     }
 
+function	script	GlobalEventMenu	{
+
+    function resetCandor {
+        $@FEFE_CAVE_LEVEL=0;
+        $@FEFE_DELAY=0;
+        $@FEFE_DIFFICULTY=0;
+        $@FEFE_CAVE_HERO$="";
+        mesc "Candor Fight Reset!";
+        return;
+    }
+
+    function rateManagement {
+        clear;
+        mes l("To get the current rate:");
+        mes col("    @exprate", 7);
+        next;
+        mes l("To set the exp rate:");
+        mes col("    @exprate ##Brate##b hours", 7);
+        next;
+        mes l("To reset back to normal:");
+        mes col("    @exprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
+        next;
+        return;
+    }
+
+    function dropManagement {
+        clear;
+        mes l("To get the current rate:");
+        mes col("    @rates", 7);
+        next;
+        mes l("To set the drop rate:");
+        mes col("    @droprate ##Brate##b hours", 7);
+        next;
+        mes l("To reset back to normal:");
+        mes col("    @droprate default", 7); // note to translators: any non-numerical value will reset so "default" is safe to translate
+        next;
+        return;
+    }
+
+    // Easter is map-only, so it can be handled here instead of seasons.txt
+    function sEaster {
+
+        // Enable event
+        set $EVENT$, "Easter";
+        logmes "Enabled EASTER event.", LOGMES_ATCOMMAND;
+        return;
+    }
+
+