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)

4 files changed, 25 insertions, 21 deletions

diff --git a/npc/003-1/cyndala.txt b/npc/003-1/cyndala.txt
index a4dc4c92d..7bb026b5e 100644
--- a/npc/003-1/cyndala.txt
+++ b/npc/003-1/cyndala.txt
@@ -3,7 +3,7 @@
 //    Saulc
 //    Jesusalva
 // Description:
-//    Will be with dye functions for a while...
+//    Will be with dye functions for a while... May be wrong. Only Card2 is available
 
 // Original code from evol
 // Authors:
@@ -94,7 +94,7 @@
             l("Excuse me."),
             l("Could you bleach my clothes?"),
             l("What can you say about dyes?"),
-            rif(getgmlevel(), l("Technical problem, gimme info about an item."));
+            rif(is_staff(), l("Technical problem, gimme info about an item."));
 
         switch (@menu)
         {
@@ -119,6 +119,7 @@
                 {
                     mes sprintf("%d: Option: %d, Value: %d", .@i, getitemoptionidbyindex(.@item, .@i), getitemoptionvaluebyindex(.@item, .@i));
                 }
+                mes "Note named items (Card1 254 and 255) have Card3 and Card4 reserved";
                 break;
             default:
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("I wish you a good time in town.");
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 2eadf0507..b51553bde 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -12,8 +12,8 @@
     if (BaseLevel < 40) close;
     if (getskilllv(SM_BASH) >= 1) mesq l("Are you using my skill?");
     if (getskilllv(SM_BASH) >= 1) close;
-    if (!getgmlevel()) mesq l("Hey, you're strong! Congratulations!");
-    if (!getgmlevel()) close;
+    if (!is_staff()) mesq l("Hey, you're strong! Congratulations!");
+    if (!is_staff()) close;
     mesq l("Hey, you are strong! But still, so, so GREEN! You're PATHETIC! I mean, look your skill list! Empty!");
     next;
     // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
diff --git a/npc/003-1/michel.txt b/npc/003-1/michel.txt
index 1024e401c..736aa2424 100644
--- a/npc/003-1/michel.txt
+++ b/npc/003-1/michel.txt
@@ -39,8 +39,9 @@
 	mes("5."+.@name$[4]+" ("+.@value[4]+")");
     next;
 
-
+    // Anyone with GM Level, staff or not, is allowed to latest GM logs
     if (!getgmlevel()) close;
+
     mes "";
 	.@nb = query_sql("select char_name, command from `atcommandlog` ORDER BY atcommand_id DESC LIMIT 10", .@name$, .@value$);
 	mes l("##BLatest GM Commands##b");
@@ -55,22 +56,24 @@
 	mes("9."+.@name$[8]+" ("+.@value$[8]+")");
 	mes("10."+.@name$[9]+" ("+.@value$[9]+")");
 
-    if (getgmlevel() < 99) close;
+    // Only Admins are allowed to change the HoF Scoreboard
+    if (!is_admin()) close;
+
     next;
-    if (getgmlevel()) mes "##BGM Information##b";
-    if (getgmlevel()) mes "We are currently relying in Karma to generate this Hall Of Fame.";
-    if (getgmlevel()) mes "";
-    if (getgmlevel()) mes "##B Manual Edition ##b";
-    if (getgmlevel()) mes "To reliably change Karma values, you must use @set Karma.";
-    if (getgmlevel()) mes "But before, check on MySQL the previous karma value, because this command overrides it.";
-    if (getgmlevel()) mes "Therefore, it is advised to DON'T change this by hand.";
-    if (getgmlevel()) mes "";
-    if (getgmlevel()) mes "##B Scripting Edition ##b";
-    if (getgmlevel()) mes "Is known to work. This hall of fame will need a few minutes to update itself.";
-    if (getgmlevel()) mes "";
-    if (getgmlevel()) mes "##B Technical Notes ##b";
-    if (getgmlevel()) mes "In future we may start Fame field directly (but it is not displayed on client, thus, we decided to use Karma).";
-    //if (getgmlevel()) set Karma, Karma + 5;
+    mes "##BGM Information##b";
+    mes "We are currently relying in Karma to generate this Hall Of Fame.";
+    mes "";
+    mes "##B Manual Edition ##b";
+    mes "To reliably change Karma values, you must use @set Karma.";
+    mes "But before, check on MySQL the previous karma value, because this command overrides it.";
+    mes "Therefore, it is advised to DON'T change this by hand.";
+    mes "";
+    mes "##B Scripting Edition ##b";
+    mes "Is known to work. This hall of fame will need a few minutes to update itself.";
+    mes "";
+    mes "##B Technical Notes ##b";
+    mes "In future we may start Fame field directly (but it is not displayed on client, thus, we decided to use Karma).";
+    //set Karma, Karma + 5;
     close;
 
 OnInit:
diff --git a/npc/003-1/tamiloc.txt b/npc/003-1/tamiloc.txt
index 007e260e6..f6812288f 100644
--- a/npc/003-1/tamiloc.txt
+++ b/npc/003-1/tamiloc.txt
@@ -32,7 +32,7 @@
             l("What is my current hairstyle and hair color?"),
             l("I'd like to get a different style."),
             l("Can you do something with my color?"),
-            rif(getgmlevel(), l("I am a GM, and I want to change my Race!")),
+            rif(is_staff(), l("I am a GM, and I want to change my Race!")),
             l("I'm fine for now, thank you.");
 
         switch (@menu)