Stop using getgmlevel() and use is_gm() is_admin() and is_staff().

Our four power levels:
getgmlevel() → Sponsors, etc.
is_staff() → GM 5, Developers, test server, etc.
is_gm() → GM 80, Game Master, controls the world
is_admin() → GM 99, Administrator, controls the uniserver (pun intended)

3 files changed, 15 insertions, 11 deletions

diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index dbac830c3..74084dd02 100644
--- a/npc/001-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -1,13 +1,13 @@
 // TMW2 Scripts.
 // Author:
 //  Jesusalva
-
-// Original File
+// Description
+//  Cassia and her lieutenants manages Aeros Battlegrounds
 
 001-1,96,37,0	script	Cassia	NPC_FEMALE,{
     mesn;
 
-    if (getgmlevel()) goto L_Control;
+    if (is_gm()) goto L_Control;
     if ($@BGMaster1) goto L_Busy;
 
 L_Intro:
@@ -36,7 +36,7 @@ L_Busy:
 L_Control:
     menu
         l("Introduce"), L_Intro,
-        rif($@BGMaster1 != 1 && getgmlevel() >= 99,l("Enable BG")), L_On,
+        rif($@BGMaster1 != 1 && is_gm(),l("Enable BG")), L_On,
         l("Disable BG"), L_Off;
 
 L_On:
@@ -56,6 +56,8 @@ L_On:
     close;
 
 L_Off:
+    delwaitingroom("Lt. Randy");
+    delwaitingroom("Lt. Gerry");
     disablenpc "Lt. Randy";
     disablenpc "Lt. Gerry";
     mes "Event disabled.";
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index e82ccda99..b76a6cd97 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -9,7 +9,7 @@
         areamonster("001-1", 171, 0, 339, 158, getarg(0), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
     }
 
-    if (!getgmlevel()) goto L_Unauthorized;
+    if (!is_gm()) goto L_Unauthorized;
 
     @log_spawns=0;
     @log_ratio=.coins_rate;
@@ -168,8 +168,10 @@ L_Drop:
 L_Rate:
     mes "";
     mes "Current drop rate: " + str(.coins_rate);
-    mes "Insert drop rate (from 0 to 10000). Use -1 to disable.";
+    mes "Insert drop rate (from 0 to 10000, capped at 5000 or 50%). Use -1 to disable.";
     input .coins_rate;
+    if (.coins_rate > 5000)
+        .coins_rate=5000;
     mes "";
     mes "Ratio adjusted.";
     next;
@@ -203,7 +205,7 @@ OnInit:
     end;
 
 OnCall:
-    if (!is_evtc())
+    if (!is_admin())
         end;
     if (getmapname() != "001-1") {
         dispbottom "This command can only be used at aeros.";
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
index 4708930e8..40f3e3d9c 100644
--- a/npc/001-1/portal.txt
+++ b/npc/001-1/portal.txt
@@ -12,10 +12,10 @@ OnTouch:
     mes l("Would you like to leave this place?");
     menu
         l("No."), L_Close,
-        rif(getgmlevel() && !$@GM_EVENT, l("Enable Event")), L_Enable,
-        rif(getgmlevel() && $@GM_EVENT, l("Disable Event")), L_Disable,
-        rif(getgmlevel() && .WALL, l("Open Extension")), L_DelWall,
-        rif(getgmlevel() && !.WALL, l("Close Extension")), L_AddWall,
+        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: