diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-29 23:07:40 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-29 23:07:40 -0500 |
| commit | 17a8452f5a55f93f7d38e027b69d98445daabdef (patch) | |
| tree | a68d484908def67cebbde4a59cc152d0300d9f6f /world/map | |
| parent | 4b1a7723f33e4c21cf39c1c627f2a1faf00349df (diff) | |
| parent | d1d13e4d05ab27b7b5a9863f21b5e5dc3b7cad8d (diff) | |
| download | classic-serverdata-17a8452f5a55f93f7d38e027b69d98445daabdef.tar.gz classic-serverdata-17a8452f5a55f93f7d38e027b69d98445daabdef.tar.bz2 classic-serverdata-17a8452f5a55f93f7d38e027b69d98445daabdef.tar.xz classic-serverdata-17a8452f5a55f93f7d38e027b69d98445daabdef.zip | |
Merge pull request #323 from mekolat/xmas-blvl
deprecate gmcommand builtin
Diffstat (limited to 'world/map')
| -rw-r--r-- | world/map/npc/009-7/debug.txt | 10 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/core.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/items/magic_gm_top_hat.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/items/restricted_item.txt | 4 |
4 files changed, 4 insertions, 15 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 d064efca..f154794d 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -159,8 +159,7 @@ L_LevelingReward: goto L_XmasExp; L_XmasLevel: - gmcommand "@blvl 1"; - gmcommand "@l I was a good kid this year."; + set BaseLevel, BaseLevel + 1; return; L_XmasExp: 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: |