Start moving all non-debug functionality from Game Admin (99) to Game Master (80)

- Aeros Strange Coin Drop Rate
- Aeros Portals (Without Event Master)
- Quirin Arena: Waves (GM 80) & Autostart (GM 60 Officer)
- Candor Siege
- Kage Flag Game Manual Controls
- Hurnscald Liberation Day Control Panel
- Message Of The Day

Game Master is the one to whom the whole game was entrusted to.
In all ML years, only Demure, Saulc and Crazyfefe ever attained this position.
Therefore: It is fine to have them with full event control.

8 files changed, 11 insertions, 11 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index bd7266032..247eebb3b 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -78,7 +78,7 @@ L_Menu:
         "Reconfigure spawn/warp points", L_Conf,
         rif(.WALL, "Open Extension"), L_DelWall,
         rif(!.WALL, "Close Extension"), L_AddWall,
-        rif(is_admin(), "Adjust coins drop rate"), L_Rate;
+        rif(is_master(), "Adjust coins drop rate"), L_Rate;
 
 L_Unauthorized:
     //dispbottom l("I am too far away to talk. Weird floating thingy...");
@@ -662,7 +662,7 @@ L_Drop:
 
 L_Rate:
     // Only Admins can change Strange Coin drop rate
-    if (!is_admin())
+    if (!is_master())
         goto L_Menu;
 
     mes "";
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
index 221080ea6..3dbcc32de 100644
--- a/npc/001-1/portal.txt
+++ b/npc/001-1/portal.txt
@@ -12,8 +12,8 @@ OnTouch:
     mes l("Would you like to leave this place?");
     menu
         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_master() && !$@GM_EVENT, l("Enable Event")), L_Enable,
+        rif(is_master() && $@GM_EVENT, l("Disable Event")), L_Disable,
         l("Yes."), L_Leave;
 
 L_Leave:
diff --git a/npc/003-1/quirino.txt b/npc/003-1/quirino.txt
index dbc88e2e5..2e78ebd36 100644
--- a/npc/003-1/quirino.txt
+++ b/npc/003-1/quirino.txt
@@ -200,8 +200,8 @@ L_Hub:
     // Main Control menu. Not using l() on purpose.
 
     select
-        rif($@EQ_STATUS == 0 && (getmapusers("001-8") >= 3 || $@GM_OVERRIDE) && is_admin(), "Start Event at once!"),
-        rif($@EQ_STATUS == 1 && is_admin(), "Send wave of items and monsters!"),
+        rif($@EQ_STATUS == 0 && (getmapusers("001-8") >= 3 || $@GM_OVERRIDE) && is_gm(), "Start Event at once!"),
+        rif($@EQ_STATUS == 1 && is_master(), "Send wave of items and monsters!"),
         rif($@EQ_STATUS == 0 && $@GM_OVERRIDE && is_admin(), "[DEBUG] Join Event"),
         rif($@EQ_STATUS == 0 && $@GM_OVERRIDE && is_admin(), "[DEBUG] Join & Start Event Now"),
         "I'm done.";
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 7cd6f5174..16d152755 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -15,7 +15,7 @@
 
 005-1,59,91,0	script	Ayasha	NPC_HUMAN_FEMALE_NOOB,{
     showavatar NPC_HUMAN_FEMALE_NOOB;  // this is handled by avatars.xml
-    if (strcharinfo(2) == "Monster King" && is_admin()) goto L_MKControl;
+    if (strcharinfo(2) == "Monster King" && is_master()) goto L_MKControl;
 
     function quest_findAllKids {
         setq CandorQuest_HAS, 2;
diff --git a/npc/006-8/kage.txt b/npc/006-8/kage.txt
index 1b42470c7..cf6355f14 100644
--- a/npc/006-8/kage.txt
+++ b/npc/006-8/kage.txt
@@ -76,7 +76,7 @@ OnTouch:
     mesn;
     mesq l("Oh, and if I perchance catch you using %s or %s... You'll be banned from my game, understood?", b(l("splash weapons")), b(l("splash magic")));
     mesc l("-- In such event, Candor Underground B4F will be permanently unreachable for this char."), 1;
-    if (is_admin() && !$@CAPTURE_FLAG) {
+    if (is_master() && !$@CAPTURE_FLAG) {
         next;
         select
             l("Ok"),
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index c5cc466a7..ca6919961 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -8,7 +8,7 @@
     .@q=getq(HurnscaldQuest_Lieutenant);
     .@k=getq2(HurnscaldQuest_Lieutenant);
     // The Monster King guild have a special menu
-    if (!$HURNS_LIBDATE && is_admin()) goto L_Admus;
+    if (!$HURNS_LIBDATE && is_master()) goto L_Admus;
     if (strcharinfo(2) == "Monster King") goto L_MKControl;
     mesn;
     mesq l("We are @@ since the last great attack from the Monster King.", FuzzyTime($HURNS_LIBDATE,1,2));
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index b150b798e..dcdb01460 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -147,7 +147,7 @@ function	script	MOTDConfig	{
     end;
 
 OnCall:
-    if (!is_admin()) {
+    if (!is_master()) {
         end;
     }
 
diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt
index 824ce5384..8a9cb2dd2 100644
--- a/npc/commands/super-menu.txt
+++ b/npc/commands/super-menu.txt
@@ -10,7 +10,7 @@ function	script	SuperMenu	{
         next;
         select
             rif(is_gm(), l("Scheduled broadcasts")),
-            rif(is_admin(), l("MOTD")),
+            rif(is_master(), l("MOTD")),
             rif(is_gm(), l("Event management")),
             rif(is_admin() && !getcharid(2), l("Join teh Guild")),
             rif(is_staff(), l("Referral Program Report")),