remove usage of getgroupid

7 files changed, 9 insertions, 12 deletions

diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt
index ef12e83e..436bdcca 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -89,7 +89,7 @@ function	script	BarberDebug	{
     end;
 
 OnCall:
-    if (!debug && getgroupid() < 3)
+    if (!debug && !is_dev())
     {
         end;
     }
diff --git a/npc/commands/debug-preset.txt b/npc/commands/debug-preset.txt
index bc2fc180..59cda9f2 100644
--- a/npc/commands/debug-preset.txt
+++ b/npc/commands/debug-preset.txt
@@ -230,7 +230,7 @@ function	script	DoRoutine	{
     end;
 
 OnCall:
-    if (!debug && getgroupid() < 99)
+    if (!debug && !is_admin())
     {
         end;
     }
diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt
index 041879d2..889c988d 100644
--- a/npc/commands/debug-quest.txt
+++ b/npc/commands/debug-quest.txt
@@ -144,7 +144,7 @@ function	script	GlobalQuestDebug	{
     end;
 
 OnCall:
-    if (!debug && getgroupid() < 1)
+    if (!debug && !is_trusted())
     {
         end;
     }
diff --git a/npc/commands/debug-skill.txt b/npc/commands/debug-skill.txt
index f4a55a50..2e5393a4 100644
--- a/npc/commands/debug-skill.txt
+++ b/npc/commands/debug-skill.txt
@@ -68,7 +68,7 @@ function	script	GlobalSkillDebug	{
     end;
 
 OnCall:
-    if (!debug && getgroupid() < 99)
+    if (!debug && !is_admin())
     {
         end;
     }
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index 83387d26..fc352bd2 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -129,7 +129,7 @@ function	script	GlobalDebugMenu	{
     end;
 
 OnCall:
-    if (!debug && getgroupid() < 99)
+    if (!debug && !is_admin())
     {
         end;
     }
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt
index 06f1c77b..54f64fb3 100644
--- a/npc/commands/rate-management.txt
+++ b/npc/commands/rate-management.txt
@@ -20,7 +20,7 @@
     }
 
 OnCall:
-   if (getgroupid() < 3)
+   if (!is_evtc())
     {
         end;
     }
diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt
index fede6e71..5e5fb6f7 100644
--- a/npc/commands/super-menu.txt
+++ b/npc/commands/super-menu.txt
@@ -1,9 +1,7 @@
 function	script	SuperMenu	{
     do
     {
-        .@gid = getgroupid();
-
-        if (.@gid < 3)
+        if (debug && !is_dev())
         {
             GlobalDebugMenu;
             return;
@@ -18,7 +16,7 @@ function	script	SuperMenu	{
         select
             l("Scheduled broadcasts"),
             l("MOTD"),
-            rif(.@gid >= 4, l("Event management")),
+            rif(is_evtc(), l("Event management")),
             l("Debug");
 
         switch (@menu)
@@ -37,9 +35,8 @@ function	script	SuperMenu	{
     end;
 
 OnCall:
-    .@gid = getgroupid();
 
-    if (!debug && .@gid < 3)
+    if (!debug && !is_dev())
     {
         dispbottom l("You do not have the required access privileges to use the Super Menu.");
         end;