From bf9b79f1e0f2141191215e85a2f5b00eea9eba5f Mon Sep 17 00:00:00 2001 From: gepard1984 Date: Tue, 14 Feb 2012 02:05:16 +0000 Subject: Merged `@kill` and `@die`, since `@kill` was just a remote version of `@die`. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15578 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/atcommand_athena.conf | 1 + conf/help.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf index 58813c1c7..723dd7945 100644 --- a/conf/atcommand_athena.conf +++ b/conf/atcommand_athena.conf @@ -52,6 +52,7 @@ aliases: { mutearea: ["stfu"] monsterignore: ["battleignore"] raise: ["revive"] + kill: ["die"] } /* Commands help file */ diff --git a/conf/help.txt b/conf/help.txt index 5a8f5871f..f2b8eadd7 100644 --- a/conf/help.txt +++ b/conf/help.txt @@ -39,7 +39,6 @@ whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM." guildspy: "Params: - You will receive all messages of the guild channel (Chat logging must be enabled)" partyspy: "@partyspy - You will receive all messages of the party channel (Chat logging must be enabled)" mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat)." -die: "Kills yourself." go: "Params: \n" "Warps you to a city.\n" " -3: (Memo point 2) 1: morocc 5: izlude 9: yuno 13: niflheim \n" " -2: (Memo point 1) 2: geffen 6: aldebaran 10: amatsu 14: louyang\n" @@ -187,7 +186,7 @@ hatch: "Create a pet from your inventory eggs list." makeegg: "Params: \n" "Gives pet egg for monster number in pet DB" kick: "Params: \n" "Kicks specified character off the server" unjail: "Params: \n" "Discharges specified character/prisoner" -kill: "Params: \n" "Kills specified character." +kill: "Kills player." recall: "Params: \n" "Warps target character to you." raise: "Params: \n" "Revives target character." block: "Params: \n" "Blocks definitively a account" -- cgit v1.2.3-60-g2f50