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

4 files changed, 6 insertions, 43 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"
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index b60735cac..4245d00c4 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -14,7 +14,6 @@ whodrops: Show who drops an item (mobs with highest drop rate).
 refresh: Syncs the player's position on the client with the one stored on the server.
 time: Give server time.
 version: Displays SVN version of the server.
-die: Suicide your character.
 petrename: Enables you to rename your pet.
 party: Organize a new party, with you as the party leader.
 storage: Opens your Kafra storage wherever you are.
@@ -136,7 +135,7 @@ idsearch: Find an itemID based on item name
 item: Creates an item of your choosing, either Item ID or Name
 item2: Creates a complete item (card, etc...) of your choosing, either Item ID or Name.
 delitem: Deletes an item of your choosing, either Item ID or Name.
-kill: Kill another character without hitting them.
+kill: Kills player.
 killmonster: Kill all monsters in map (with drops)
 makeegg: Creates yourself a pet egg.
 hatch: Hatches an egg.
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d86d6aa64..296156c20 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1182,48 +1182,13 @@ ACMD_FUNC(jobchange)
 /*==========================================
  *
  *------------------------------------------*/
-ACMD_FUNC(die)
-{
-	nullpo_retr(-1, sd);
-	clif_specialeffect(&sd->bl,450,SELF);
-	status_kill(&sd->bl);
-	clif_displaymessage(fd, msg_txt(13)); // A pity! You've died.
-
-	return 0;
-}
-
-/*==========================================
- *
- *------------------------------------------*/
 ACMD_FUNC(kill)
 {
-	struct map_session_data *pl_sd;
 	nullpo_retr(-1, sd);
-
-	memset(atcmd_player_name, '\0', sizeof(atcmd_player_name));
-
-	if (!message || !*message) {
-		clif_displaymessage(fd, "Please, enter a player name (usage: @kill <player name/id>).");
-		return -1;
-	}
-
-	if((pl_sd=map_nick2sd((char *)message)) == NULL && (pl_sd=map_charid2sd(atoi(message))) == NULL)
-	{
-		clif_displaymessage(fd, msg_txt(3)); // Character not found.
-		return -1;
-	}
-	
-	if (pc_get_group_level(sd) < pc_get_group_level(pl_sd))
-	{ // you can kill only lower or same level
-		clif_displaymessage(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
-		return -1;
-	}
-	
-	status_kill(&pl_sd->bl);
-	clif_displaymessage(pl_sd->fd, msg_txt(13)); // A pity! You've died.
-	if (fd != pl_sd->fd)
+	status_kill(&sd->bl);
+	clif_displaymessage(sd->fd, msg_txt(13)); // A pity! You've died.
+	if (fd != sd->fd)
 		clif_displaymessage(fd, msg_txt(14)); // Character killed.
-
 	return 0;
 }
 
@@ -8426,7 +8391,6 @@ void atcommand_basecommands(void) {
 		ACMD_DEF(option),
 		ACMD_DEF(hide), // + /hide
 		ACMD_DEF(jobchange),
-		ACMD_DEF(die),
 		ACMD_DEF(kill),
 		ACMD_DEF(alive),
 		ACMD_DEF(kami),