Live Server now restarts monthly, Hardcore now restarts weekly

This is needed for memory management.
Also: Make Fortress Gate resist a few status ailments (o.o)
Set monthly restart from Monday to Wednesday (avoid conflicts)

1 files changed, 22 insertions, 14 deletions

diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt
index 2909ea31b..2ce9c6f5b 100644
--- a/npc/commands/super-menu.txt
+++ b/npc/commands/super-menu.txt
@@ -117,39 +117,47 @@ OnInit:
     end;
 
 // Servers with "debug" set are debug servers which must reset on their own
+// Hardcore servers as well
 // They restart every sunday, at 03:00 UTC
 OnSun0250:
-    if (debug) kamibroadcast("WARNING: Test Server will go down for scheduled maintenance in 10 minutes!");
+    .@sv$=(debug ? "Test" : "Hardcore");
+    if (debug || $HARDCORE) kamibroadcast("WARNING: "+.@sv$+" Server will go down for scheduled maintenance in 10 minutes!");
     end;
 OnSun0255:
-    if (debug) kamibroadcast("WARNING: Test Server will go down for scheduled maintenance in 5 minutes!");
+    .@sv$=(debug ? "Test" : "Hardcore");
+    if (debug || $HARDCORE) kamibroadcast("WARNING: "+.@sv$+" Server will go down for scheduled maintenance in 5 minutes!");
     end;
 OnSun0259:
-    if (debug) kamibroadcast("WARNING: Imminent Test Server restart!");
+    .@sv$=(debug ? "Test" : "Hardcore");
+    if (debug || $HARDCORE) kamibroadcast("WARNING: Imminent "+.@sv$+" Server restart!");
     end;
 OnSun0300:
-    if (debug) atcommand("@serverexit 103");
+    if (debug || $HARDCORE) atcommand("@serverexit 103");
     end;
 
 
-// Hardcore Servers also need to reset, but with less frequency
-// They restart on the first monday of the month, at 03:00 UTC
+// Live Servers also need to reset, but with less frequency
+// They restart on the first wednesday of the month, at 03:00 UTC
 // Note: We can use gettimeparam - weeks since epoch - and restart every
 // 2 weeks if needed. (weeks % 2 == 1)
-OnMon0250:
-    if (!$HARDCORE || gettime(GETTIME_DAYOFMONTH) > 7) end;
-    kamibroadcast("WARNING: Hardcore Server will go down for scheduled maintenance in 10 minutes!");
+OnWed0245:
+    if (!$AUTORESTART || gettime(GETTIME_DAYOFMONTH) > 7) end;
+    kamibroadcast("WARNING: Server will go down for scheduled maintenance in 15 minutes!");
+    end;
+OnWed0250:
+    if (!$AUTORESTART || gettime(GETTIME_DAYOFMONTH) > 7) end;
+    kamibroadcast("WARNING: Server will go down for scheduled maintenance in 10 minutes!");
     end;
 OnMon0255:
-    if (!$HARDCORE || gettime(GETTIME_DAYOFMONTH) > 7) end;
-    kamibroadcast("WARNING: Hardcore Server will go down for scheduled maintenance in 5 minutes!");
+    if (!$AUTORESTART || gettime(GETTIME_DAYOFMONTH) > 7) end;
+    kamibroadcast("WARNING: Server will go down for scheduled maintenance in 5 minutes!");
     end;
 OnMon0259:
-    if (!$HARDCORE || gettime(GETTIME_DAYOFMONTH) > 7) end;
-    kamibroadcast("WARNING: Imminent Hardcore Server restart!");
+    if (!$AUTORESTART || gettime(GETTIME_DAYOFMONTH) > 7) end;
+    kamibroadcast("WARNING: Imminent Server restart!");
     end;
 OnMon0300:
-    if (!$HARDCORE || gettime(GETTIME_DAYOFMONTH) > 7) end;
+    if (!$AUTORESTART || gettime(GETTIME_DAYOFMONTH) > 7) end;
     atcommand("@serverexit 103");
     end;