Move Aeros Extension control to Event Master

2 files changed, 14 insertions, 14 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 647443887..31ef2002e 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -74,6 +74,8 @@ L_Menu:
         "Spawn",L_Spawn,
         rif(countitem(StrangeCoin) >= 10, "Drop stuff! (10x Coins)"),L_Drop,
         "Reconfigure spawn/warp points",L_Conf,
+        rif(is_gm() && .WALL, l("Open Extension")), L_DelWall,
+        rif(is_gm() && !.WALL, l("Close Extension")), L_AddWall,
         "Adjust coins drop rate",L_Rate;
 
 L_Unauthorized:
@@ -822,6 +824,18 @@ L_EventHandler:
     }
     close;
 
+L_AddWall:
+    setcells "001-1", 169, 63, 169, 76, 3, "AerosWall";
+    //setwall("001-1", 169, 63, 13, DOWN, false, "AerosWall");
+    .WALL=1;
+    close;
+
+L_DelWall:
+    delcells "AerosWall";
+    //delwall("AerosWall");
+    .WALL=0;
+    close;
+
 L_Conf:
     mes "";
     mesn;
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
index 0b93a1a34..0240de50b 100644
--- a/npc/001-1/portal.txt
+++ b/npc/001-1/portal.txt
@@ -14,8 +14,6 @@ OnTouch:
         l("No."), L_Close,
         rif(is_admin() && !$@GM_EVENT, l("Enable Event")), L_Enable,
         rif(is_admin() && $@GM_EVENT, l("Disable Event")), L_Disable,
-        rif(is_gm() && .WALL, l("Open Extension")), L_DelWall,
-        rif(is_gm() && !.WALL, l("Close Extension")), L_AddWall,
         l("Yes."), L_Leave;
 
 L_Leave:
@@ -30,18 +28,6 @@ L_Disable:
     $@GM_EVENT=0;
     close;
 
-L_AddWall:
-    setcells "001-1", 169, 63, 169, 76, 3, "AerosWall";
-    //setwall("001-1", 169, 63, 13, DOWN, false, "AerosWall");
-    .WALL=1;
-    close;
-
-L_DelWall:
-    delcells "AerosWall";
-    //delwall("AerosWall");
-    .WALL=0;
-    close;
-
 // Uses l() to translate utilities
 L_TranslationFix:
     mes l("Magic Maggot");