diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-14 02:05:16 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-14 02:05:16 +0000 |
| commit | bf9b79f1e0f2141191215e85a2f5b00eea9eba5f (patch) | |
| tree | bdc92c422fef492740f25d2b93a1d5b84fa50902 /conf | |
| parent | 8b2a77020601a1d6a567ddd7ae1cd519e7097483 (diff) | |
| download | hercules-bf9b79f1e0f2141191215e85a2f5b00eea9eba5f.tar.gz hercules-bf9b79f1e0f2141191215e85a2f5b00eea9eba5f.tar.bz2 hercules-bf9b79f1e0f2141191215e85a2f5b00eea9eba5f.tar.xz hercules-bf9b79f1e0f2141191215e85a2f5b00eea9eba5f.zip | |
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
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/atcommand_athena.conf | 1 | ||||
| -rw-r--r-- | conf/help.txt | 3 |
2 files changed, 2 insertions, 2 deletions
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: <guild_name/id> - You will receive all messages of the guild channel (Chat logging must be enabled)" partyspy: "@partyspy <party_name/id> - 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: <number/city_name>\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: <pet_id>\n" "Gives pet egg for monster number in pet DB" kick: "Params: <char name>\n" "Kicks specified character off the server" unjail: "Params: <char name>\n" "Discharges specified character/prisoner" -kill: "Params: <char name>\n" "Kills specified character." +kill: "Kills player." recall: "Params: <char name>\n" "Warps target character to you." raise: "Params: <char name>\n" "Revives target character." block: "Params: <char name>\n" "Blocks definitively a account" |