diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-05-02 15:19:57 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-05-02 15:19:57 -0400 |
| commit | 1e1b1410e0dc8d187f6ee3cf6098a3d7a9499ebc (patch) | |
| tree | a495558ec6e1a1f189ae658085a5eabc69e83293 | |
| parent | 65ec6edb3dcbf725360771f882c92a95f101743c (diff) | |
| parent | 7ceca28c3b011161f67221a31cbdc4eaabcca305 (diff) | |
| download | serverdata-1e1b1410e0dc8d187f6ee3cf6098a3d7a9499ebc.tar.gz serverdata-1e1b1410e0dc8d187f6ee3cf6098a3d7a9499ebc.tar.bz2 serverdata-1e1b1410e0dc8d187f6ee3cf6098a3d7a9499ebc.tar.xz serverdata-1e1b1410e0dc8d187f6ee3cf6098a3d7a9499ebc.zip | |
Merge pull request #491 from mekolat/cmdalias
command modifications
| -rw-r--r-- | world/map/npc/commands/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/commands/hug.txt (renamed from world/map/npc/functions/hug.txt) | 3 | ||||
| -rw-r--r-- | world/map/npc/commands/pullrabbit.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/scripts.conf | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/commands/_import.txt b/world/map/npc/commands/_import.txt index 3cabe0b7..b2fe92a1 100644 --- a/world/map/npc/commands/_import.txt +++ b/world/map/npc/commands/_import.txt @@ -8,3 +8,4 @@ npc: npc/commands/pullrabbit.txt npc: npc/commands/numa.txt npc: npc/commands/destroynpc.txt npc: npc/commands/remotecmd.txt +npc: npc/commands/hug.txt diff --git a/world/map/npc/functions/hug.txt b/world/map/npc/commands/hug.txt index f1bd2637..323e0563 100644 --- a/world/map/npc/functions/hug.txt +++ b/world/map/npc/commands/hug.txt @@ -18,6 +18,7 @@ OnInit: set .tree_id, getnpcid("#DruidTree0#_M"); - registercmd "*hugs", strnpcinfo(0); + registercmd "*hugs", strnpcinfo(0); // eq: /me hugs (target) + registercmd "*hugs*", strnpcinfo(0); // eq: /me hugs end; } diff --git a/world/map/npc/commands/pullrabbit.txt b/world/map/npc/commands/pullrabbit.txt index 022f3753..9c3634a4 100644 --- a/world/map/npc/commands/pullrabbit.txt +++ b/world/map/npc/commands/pullrabbit.txt @@ -21,5 +21,6 @@ L_Inventory: OnInit: registercmd chr(ATCMD_SYMBOL) + "pullrabbit", strnpcinfo(0); + registercmd chr(MAGIC_SYMBOL) + "pullrabbit", strnpcinfo(0); // former pullrabbit invocation end; } diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index 0935f246..25fba83b 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -29,7 +29,6 @@ npc: npc/functions/dynamic_menu.txt npc: npc/functions/DyeConfig.txt npc: npc/functions/motd.txt npc: npc/functions/motdconfig.txt -npc: npc/functions/hug.txt // Item Functions npc: npc/items/purification_potion.txt |