Kamelot mode alpha -> beta

Can be enabled by @event

1 files changed, 9 insertions, 9 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