diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-03-20 08:56:38 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-03-20 08:56:38 -0300 |
| commit | fa768d6b1301c8ed5806b36ea2671d8c672a572f (patch) | |
| tree | 71489fd6cb8a7bc0ae8cd0f652231e103d70bb2f /npc/008-1 | |
| parent | 45d0d0bcc1104d56304d6df15a0904d93e60bcb6 (diff) | |
| download | serverdata-fa768d6b1301c8ed5806b36ea2671d8c672a572f.tar.gz serverdata-fa768d6b1301c8ed5806b36ea2671d8c672a572f.tar.bz2 serverdata-fa768d6b1301c8ed5806b36ea2671d8c672a572f.tar.xz serverdata-fa768d6b1301c8ed5806b36ea2671d8c672a572f.zip | |
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)
Diffstat (limited to 'npc/008-1')
| -rw-r--r-- | npc/008-1/confused-tree.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/008-1/confused-tree.txt b/npc/008-1/confused-tree.txt index 202fb53ca..22d415e47 100644 --- a/npc/008-1/confused-tree.txt +++ b/npc/008-1/confused-tree.txt @@ -14,7 +14,7 @@ 008-1,84,63,0 script Confused Tree NPC_CONFUSED_TREE,14,14,{ function tree_panel { - if (is_trusted() == false && #Tree_Trusted == false) + if (!is_staff() && #Tree_Trusted == false) { narrator(l("You see a tree.")); if (getq(HurnscaldQuests_Inspector) == 2) @@ -285,11 +285,11 @@ if (((.@reply$ == .last_reply$ && gettimetick(2) - .last_reply < .repeat_rate) || gettimetick(2) - .last_reply < .talk_rate - || (gettimetick(2) - .blocked < .block_time && is_trusted() == false) + || (gettimetick(2) - .blocked < .block_time && is_staff() == false) || .@pc_map$ != .map$ || distance(.x, .y, .@pc_x, .@pc_y) > .distance || .@reply$ == "") - && is_dev() == false) + && is_gm() == false) { ++.ignored_times; return; @@ -435,7 +435,7 @@ function grab_quote { .@name$ = getarg(0, ""); - if (gettimetick(2) - .last_query < (is_trusted() ? .qpoll_rate : .qpoll_rate2)) + if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) { ++.ignored_times; end; @@ -488,7 +488,7 @@ function remove_quote { .@tmp = getarg(0, 0); - if (gettimetick(2) - .last_query < (is_trusted() ? .qpoll_rate : .qpoll_rate2)) + if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) { ++.ignored_times; end; @@ -513,7 +513,7 @@ function cite_quote { .@id = getarg(0,0); - if (gettimetick(2) - .last_query < (is_trusted() ? .qpoll_rate : .qpoll_rate2)) + if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) { ++.ignored_times; end; @@ -543,7 +543,7 @@ function random_quote { .@name$ = escape_sql(getarg(0, "")); - if (gettimetick(2) - .last_query < (is_trusted() ? .qpoll_rate : .qpoll_rate2)) + if (gettimetick(2) - .last_query < (is_staff() ? .qpoll_rate : .qpoll_rate2)) { ++.ignored_times; end; @@ -716,7 +716,7 @@ OnTalkNearby: .last_activity = gettimetick(2); // for the auto-janitor - if ((is_trusted() || #Tree_Trusted) && charat(.@no_nick$, 0) == .symbol$) + if ((is_staff() || #Tree_Trusted) && charat(.@no_nick$, 0) == .symbol$) { if (.@no_nick$ ~= "^.grab \"?([^#:@\"]{4,23})\"?$") reply(grab_quote($@regexmatch$[1])); |