summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-04-15 11:02:38 -0400
committermekolat <mekolat@users.noreply.github.com>2015-04-30 00:06:06 -0400
commitd1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d (patch)
treea68d484908def67cebbde4a59cc152d0300d9f6f /world/map/npc
parent757f63bd2ba14072cd88485dae653d59d3df5a89 (diff)
downloadserverdata-d1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d.tar.gz
serverdata-d1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d.tar.bz2
serverdata-d1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d.tar.xz
serverdata-d1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d.zip
use wgm and gmlog
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/009-7/debug.txt10
-rw-r--r--world/map/npc/annuals/xmas/core.txt1
-rw-r--r--world/map/npc/items/magic_gm_top_hat.txt2
-rw-r--r--world/map/npc/items/restricted_item.txt4
4 files changed, 3 insertions, 14 deletions
diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt
index cd75a342..94735b3e 100644
--- a/world/map/npc/009-7/debug.txt
+++ b/world/map/npc/009-7/debug.txt
@@ -34,19 +34,9 @@ L_Menu:
"edit|Set $Duel_LastDuel", L_LastDuel,
"edit|Set pvp channel", L_Channel,
"toggle|Toggle @Duel_Fighter", L_DuelFighter,
- "toggle|Toggle killer state", L_Killer,
- "toggle|Toggle killable state", L_Killable,
"restart|Restart fightclub.", L_Restart,
"quit|Nevermind.", L_End;
-L_Killer:
- gmcommand "@killer";
- goto L_Menu;
-
-L_Killable:
- gmcommand "@killable";
- goto L_Menu;
-
L_DuelEnabled:
if(@due < 1) goto L_DuelEnabled2;
set $SANGUINE, $SANGUINE | $@SV_FCDBit;
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 500c7678..f154794d 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -159,7 +159,6 @@ L_LevelingReward:
goto L_XmasExp;
L_XmasLevel:
- gmlog "XMAS: increase BaseLevel ("+BaseLevel+" => "+(BaseLevel+1)+")";
set BaseLevel, BaseLevel + 1;
return;
diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt
index f4f6b078..129aa5c0 100644
--- a/world/map/npc/items/magic_gm_top_hat.txt
+++ b/world/map/npc/items/magic_gm_top_hat.txt
@@ -9,7 +9,7 @@ function|script|ActivateMagicGMTophat
// Display an effect
misceffect FX_CHANNELLING_CAST, strcharinfo(0);
// Log the usage of this spell
- gmcommand "@l "+strcharinfo(0)+" used the Magic GM Top Hat.";
+ gmlog strcharinfo(0)+" used the Magic GM Top Hat.";
return;
L_Inventory:
diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index c0084408..9bd1c3d5 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -13,8 +13,8 @@ function|script|RestrictedItem
message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
callfunc "UnequipLater";
if (getgmlevel()) goto L_Return;
- gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
- gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+ wgm "Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+ gmlog "Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
goto L_Return;
L_Return: