summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/commands/gm.txt41
-rw-r--r--npc/commands/resync.txt2
-rw-r--r--npc/commands/warp.txt16
-rw-r--r--npc/commands/zeny.txt2
-rw-r--r--npc/functions/permissions.txt2
-rw-r--r--npc/scripts.conf1
6 files changed, 53 insertions, 11 deletions
diff --git a/npc/commands/gm.txt b/npc/commands/gm.txt
new file mode 100644
index 00000000..b402cda8
--- /dev/null
+++ b/npc/commands/gm.txt
@@ -0,0 +1,41 @@
+// @showgm/@hidegm atcommand
+// TEMPORALY hides GM level (or revert it)
+//
+// group lv: 20+
+// group char lv: 99
+// log: False
+//
+// usage:
+// @showgm
+// #showgm "char" <delta>
+//
+
+- script @group 32767,{
+ end;
+
+OnHide:
+ .@gm=getgroupid();
+ if (.@gm < 20) end;
+ if (.@gm % 10 != 0) end;
+ setgroupid(.@gm+1);
+ dispbottom "hidelevel : "+l("Your GM level is now hidden.");
+ end;
+
+OnShow:
+ .@gm=getgroupid();
+ if (.@gm < 20) end;
+ if (.@gm % 10 != 1) end;
+ setgroupid(.@gm-1);
+ dispbottom "showlevel : "+l("Your GM level is now visible.");
+ end;
+
+OnInit:
+ bindatcmd "showgroup", "@group::OnShow", 20, 99, 0;
+ bindatcmd "showgm", "@group::OnShow", 20, 99, 0;
+ bindatcmd "showlevel", "@group::OnShow", 20, 99, 0;
+
+ bindatcmd "hidegroup", "@group::OnHide", 20, 99, 0;
+ bindatcmd "hidegm", "@group::OnHide", 20, 99, 0;
+ bindatcmd "hidelevel", "@group::OnHide", 20, 99, 0;
+ end;
+}
diff --git a/npc/commands/resync.txt b/npc/commands/resync.txt
index 63b2d290..a535a343 100644
--- a/npc/commands/resync.txt
+++ b/npc/commands/resync.txt
@@ -35,6 +35,6 @@ OnCall:
// Anyone can call @resync, but only support and upwards for other players.
// ie. GMs can try to fix lag for other people.
OnInit:
- bindatcmd "resync", "@resync::OnCall", 0, 2, 0;
+ bindatcmd "resync", "@resync::OnCall", 0, 20, 0;
end;
}
diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt
index e4e5c92c..22eeda39 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -76,16 +76,16 @@ OnCall:
OnInit:
if (debug > 0)
{
- bindatcmd("w", "@w::OnCall", 0, 2, 0);
- bindatcmd("go", "@w::OnCall", 0, 2, 0);
- bindatcmd("to", "@w::OnCall", 0, 2, 0);
- bindatcmd("warp", "@w::OnCall", 0, 2, 0);
+ bindatcmd("w", "@w::OnCall", 0, 20, 0);
+ bindatcmd("go", "@w::OnCall", 0, 20, 0);
+ bindatcmd("to", "@w::OnCall", 0, 20, 0);
+ bindatcmd("warp", "@w::OnCall", 0, 20, 0);
}
else
{
- bindatcmd("w", "@w::OnCall", 2, 2, 1);
- bindatcmd("go", "@w::OnCall", 2, 2, 1);
- bindatcmd("to", "@w::OnCall", 2, 2, 1);
- bindatcmd("warp", "@w::OnCall", 2, 2, 1);
+ bindatcmd("w", "@w::OnCall", 20, 60, 1);
+ bindatcmd("go", "@w::OnCall", 20, 60, 1);
+ bindatcmd("to", "@w::OnCall", 20, 60, 1);
+ bindatcmd("warp", "@w::OnCall", 20, 60, 1);
}
}
diff --git a/npc/commands/zeny.txt b/npc/commands/zeny.txt
index 77f6d2de..944c1bb9 100644
--- a/npc/commands/zeny.txt
+++ b/npc/commands/zeny.txt
@@ -94,5 +94,5 @@ OnInit:
end;
}
- bindatcmd "esp", "@esp::OnCall", 3, 99, 1;
+ bindatcmd "esp", "@esp::OnCall", 99, 99, 1;
}
diff --git a/npc/functions/permissions.txt b/npc/functions/permissions.txt
index 62e0da6b..96e69fde 100644
--- a/npc/functions/permissions.txt
+++ b/npc/functions/permissions.txt
@@ -31,5 +31,5 @@ function script is_evtc {
// game master
function script is_gm {
return is_admin(getarg(0, getcharid(CHAR_ID_ACCOUNT))) ||
- has_permission("send_gm", getarg(0, getcharid(CHAR_ID_ACCOUNT)));
+ can_use_command("@jail", getarg(0, getcharid(CHAR_ID_ACCOUNT)));
}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 1106d6e6..8e0d91d9 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -106,6 +106,7 @@
"npc/items/master_skillbook.txt",
// custom atcommands
+"npc/commands/gm.txt",
"npc/commands/music.txt",
"npc/commands/warp.txt",
"npc/commands/zeny.txt",