Kamelot mode alpha -> beta

Can be enabled by @event

3 files changed, 16 insertions, 12 deletions

diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index ec049a3c8..c73461f09 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -55,16 +55,16 @@ function	script	KamelotCleanup	{
     end;
 
 OnTouch:
-    // XXX STATUS: STAGING - FINAL TESTING XXX
-    if (!is_staff())
-        end;
-
     // Not in a guild: Gate is sealed (MK might be excluded as well)
     if (getcharid(2) < 1) {
         dispbottom l("The gates are firmly shut. A warning is on the door, \"DO NOT ENTER. Guild Only.\"");
         end;
     }
 
+    // XXX STATUS: STAGING - FINAL TESTING XXX
+    if ($EVENT$ != "Kamelot")
+        end;
+
     // Save your GID for reference
     .@g=getcharid(2);
 
@@ -104,8 +104,8 @@ OnTouch:
     }
 
     // You can enter in every other state
-    if (is_admin())
-        warp "042-0@"+.@g, any(59, 60), 80;
+    warp "042-0@"+.@g, any(59, 60), 80;
+
     // Renew the instance clock : 6 hours
     instance_set_timeout(21600, 21600, $@KAMELOT_ID[.@g]);
     end;
@@ -145,11 +145,11 @@ OnDebug:
         l("Warp - Arrest me!");
     mes "";
     switch (@menu) {
-        case 2:
-            KamelotCleanup(.@g);
-            break;
+        // 3 inheirs 2
         case 3:
             instance_destroy($@KAMELOT_ID[.@g]);
+        case 2:
+            $KAMELOT_COOLDOWN[.@g] = 0;
             KamelotCleanup(.@g);
             break;
         // We now order from bottom-up
diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt
index 793d496ac..a0dfff38c 100644
--- a/npc/042-0/arthur.txt
+++ b/npc/042-0/arthur.txt
@@ -77,8 +77,7 @@ L_Quest:
     $KAMELOT_PC[.@g]=$@guildmembercount;
     $KAMELOT_KEY[.@g]=any(1,2,4,8);
     $KAMELOT_PASSCODE[.@g]=rand2(1, 31);
-    if (!is_admin()) // FIXME: This should be unconditional
-        $KAMELOT_COOLDOWN[.@g] = gettimeparam(GETTIME_WEEKDAY);
+    $KAMELOT_COOLDOWN[.@g] = gettimeparam(GETTIME_WEEKDAY);
     mapannounce(getmap(), "##1KAMELOT CASTLE, GUILD DUNGEON: MISSION START!", bc_map);
     // Spawn a few foot soldiers
     arthurSpawn(1, 25, 29, 43, 37);
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 9a20d02b9..5b00f65d4 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -305,6 +305,7 @@ function	script	GlobalEventMenu	{
             l("Enable Event Horizon"),
             l("Enable Christmas"),
             l("Enable Demure's Birthday"),
+            l("Enable Kamelot"),
             l("Reset Kill Saulc Event (Monthly)");
 
         switch (@menu) {
@@ -348,7 +349,11 @@ function	script	GlobalEventMenu	{
                 dispbottom("Maybe in future this increases everyone attack speed? Well, for now,");
                 dispbottom("This is not actually an event, it just lower prices at Lua GM shop.");
                 break;
-            case 10: DelItemFromEveryPlayer(MurdererCrown); break;
+            case 10:
+                $EVENT$="Kamelot";
+                logmes "Enabled KAMELOT event.", LOGMES_ATCOMMAND;
+                break;
+            case 11: DelItemFromEveryPlayer(MurdererCrown); break;
         }
 
         return;