summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2024-05-18 15:49:17 -0300
committerJesusaves <cpntb1@ymail.com>2024-05-18 15:49:17 -0300
commitc9c56a043bedddc14b252d13ca3a445bfe684faa (patch)
tree865f2e1fecde785cd1444ffc26a372bcbd8df286
parentbc7994a5667d6e6c6235ae97b27d99f3f3511e24 (diff)
downloadserverdata-c9c56a043bedddc14b252d13ca3a445bfe684faa.tar.gz
serverdata-c9c56a043bedddc14b252d13ca3a445bfe684faa.tar.bz2
serverdata-c9c56a043bedddc14b252d13ca3a445bfe684faa.tar.xz
serverdata-c9c56a043bedddc14b252d13ca3a445bfe684faa.zip
Correct some instances where game officers were being treated as Game Masters.
In the last commit, mostly. Masters can change the game, officers cannot.
-rw-r--r--npc/012-1/guards.txt2
-rw-r--r--npc/026-6/ctrl.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index e4c5f0486..45df8c6c0 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -263,7 +263,7 @@ OnInit:
//query_sql("SELECT online FROM `char` WHERE name='Saulc GM'", .@online);
// TODO
.@online=$@BG1_SIZE;
- if (!.@online) {
+ if (!.@online && !is_master()) {
mesn;
mesq l("We are planning to take over Hurnscald from the Monster King, and we will need everybody's help.");
next;
diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
index d7f8bf54f..8f2e07b4c 100644
--- a/npc/026-6/ctrl.c
+++ b/npc/026-6/ctrl.c
@@ -34,7 +34,7 @@ L_Warp:
end;
}
// Not a hero
- if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$ && !is_gm()) {
+ if (!$@MK_CHALLENGE && !islegendary() && strcharinfo(0) != $MOST_HEROIC$ && !is_master()) {
dispbottom l("I should wait for %s or one of the heroes to challenge the Monster King.", $MOST_HEROIC$);
end;
}
@@ -54,7 +54,7 @@ OnInit:
026-6,22,40,0, script #MKBossFightFire NPC_HIDDEN,0,0,{
end;
OnTouch:
- if ($@MK_COOLDOWN > gettimetick(2) && !is_gm()) {
+ if ($@MK_COOLDOWN > gettimetick(2) && !is_master()) {
dispbottom l("I should wait for %s.", ($GAME_STORYLINE >= 5 ? l("the Moubootaur arrange a new puppet") : l("the blood stains to be cleaned up")));
end;
}