Command code cleaning (refer to topic:169759)

 * separated the execution part of command code into interface part and internal part to better see which checks are done and when (fixes problem where 'nocommand' mapflag blocked server npcs)
 * moved the internal commands list (array) to the end of the file, this let me discard that long block of ACMD_FUNC() declarations
 * removed enum AtCommandType from command headers and commands array; its purpose was perhaps to identify aliased commands, but apparently it was never finished because the rest of the code doesn't use it (also doing aliases like this is not a very good idea)
 * internally, commands are now referenced to using their function name
 * removed the @/# symbols from the command lists; all lookup functions will now properly deal with strings with- and without a command symbol (commands interface still requires the symbol tho', so TODO for later)
 * removed several unneeded commands (*id2 code, dmalloc debug commands)
 * reverted atcommand config from alphabetically-sorted to how it was before (with additional fixes; see /conf changelog)
 * added missing code for #dropall / #storeall
 * added a warning when trying to set gm level of an undefined command

The structure of the commands table has changed, please adjust docs/guides to match the new format (sorry for the inconvenience).


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11607 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 418 insertions, 373 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 16f89f004..b9da37380 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,13 @@
 Date	Added
 
+2007/10/29
+	* Removed petid command (not needed because commands understand names)
+	* Removed *id2 commands (messy, useless and redundant)
+	* Added missing @misceffect, @feelreset and #dropall/#storeall setting
+	* AGAIN added conf entries for @whozeny, @kamic, @tonpc, @identify,
+	  @adopt, @trade, @changelook, @send, @displayskill
+	* Reverted atcommand conf (alphabetically-sorted = failure) [ultramage]
+
 2007/10/26
 	* Removed the config setting firewall_hits_on_undead setting. The code
 	  handles this now using the delay defined in skill_unit_db. [Skotlex]
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 06fec590e..92ecf2bf5 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -1,41 +1,41 @@
-// Athena atcommand Configuration file.
-// Translated by Peter Kieser <pfak@telus.net>
-
-// Set here the symbol that you want to use for your commands
-// Only 1 character is get (default is character_savecharacter_save'@'). You can set any character,
-// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)
-// With default character, all commands begin by a '@': <example> @revive
+//--------------------------------------------------------------
+// eAthena atcommand configuration file.
+// Originally translated by Peter Kieser <pfak@telus.net>
+//--------------------------------------------------------------
+
+// The symbol that will be used to recognize commands.
+// You can set any one character except control-characters (0x00-0x1f),
+// '%', '$' (party/guild chat speaking) and '/' (standard client commands).
+// The symbol must also be different from from the GM charcommand symbol.
 command_symbol: @
 
+// The following settings in this file use the format "<command name>: level".
+// They define the minimum GM level required to execute the associated command.
+// Adjust values as you like. Note that to activate commands for normal players,
+// (GM level 0), you also need to change the 'atcommand_gm_only' option to 'no'.
+// To completely disable a command, set its required GM level to 100.
 
-// Sets the level of the users that can use the GM commands.
-// <command name>: level
-// When battle_athena.conf has atcommand_gm_only set to no,
-// normal players (gm level 0) can use GM commands if you set 0 to the command level.
-// Max GM level is 99. If you want forbid a command to all people, set it with level 100.
-
-// Default values are set to define different GM levels like follow:
-// 0: normal player
-//    -> no special advantage (only @time to know time and if at_command_gm_only is disabled)
+// Default levels were chosen so that they form the following hierarchy:
+// 0: Normal player
+//    -> no commands accessible
 // 1: Super player
-//    -> some (very) little advantages: storage, petrename, etc...
+//    -> some minor advantage: storage, petrename, etc...
 // 10: Super player+
-//    -> same of Super player with !go (very super player)
+//    -> more powerful commands, like mobsearch and changegm
 // 20: Mediator
-//    -> it's a GM that only need to know people, and move to their to speak with them (they can access to any command about wisps)
+//    -> GM commands for finding players and moving to them (also kicking them)
 // 40: Sub-GM
-//    -> This GM can help a GM, and can not create item or zeny or modify a character (can have some information commands)
+//    -> GM commands for basic tasks, no significant impact on other players
 // 50: Sub-GM+
-//    -> This GM can change some non-important things on a character
+//    -> GM commands to spawn mobs and create guilds
 // 60: GM
-//    -> can do almost anything (excep administration, and mass commands)
-//       GM is the first level where we can modify a character with important value, create items or create zenys
+//    -> almost all commands available (except administration and mass commands)
 // 80: GM Chief
 //    -> can do anything, except administration commands
 // 99: Administrator
 //    -> can do anything!
 // 100: Disabled
-//    -> Commands that aren't used. Note: You must use command level 100 to disable command. Commenting doesn't enough.
+//    -> commands that will not be available to anyone
 
 
 //--------------------------
@@ -45,222 +45,168 @@ command_symbol: @
 //-------------------------
 // 1: Super player commands
 
-// Enables/disables autolooting from killed mobs.
-autoloot: 1
-
-// Allows you continue vending offline.
-autotrade: 1
-at: 1
-
-// Away messsage
-away: 1
-aw: 1
+// Displays a list of @ commands available to the player.
+commands: 1
 
-// Change Guild Master of your Guild
-changegm: 1
+// Displays the server rates.
+rates: 1
 
-// Change the leader of your party.
-changeleader: 1
+// Show server uptime
+uptime: 1
 
-//Displays a list of @ commands available to the player.
-commands: 1
+// Shows/Hides the "there is a delay after a skill" message.
+showdelay: 1
 
-// Duel organizing commands
-duel: 1
-invite: 1
-accept: 1
-reject: 1
-leave: 1
+// Displays current levels and % progress.
+exp: 1
 
 // To change your (own) email (characters protection)
 // note: this command doesn't check email itself, but check structure of the email (xxx@xxx)
 //       if you want be sure of each e-mail disable this option (value: 100)
 email: 1
 
-//Displays current levels and % progress.
-exp: 1
-
-//Homunculus commands for players
-homtalk: 1
-hominfo: 1
+// Show Monster info (rates, stats, drops, MVP stuff)
+mobinfo: 1
+monsterinfo: 1
+mi: 1
 
 // Show Item info (type, price, etc)
 iteminfo: 1
 ii: 1
 
-// Displays remaining jail time
-jailtime: 1
-
-// Main chat
-main: 1
-
-// Displays the text as a normal message with the format "*name message*" 
-// instead of "name : message" (Like the /me command in IRC)
-me: 1
-
-// Saves a warp point.
-memo: 1
+// Show who drops an item (mobs with highest drop rate)
+whodrops: 1
 
-// Show Monster info (rates, stats, drops, MVP stuff)
-mobinfo: 1
-monsterinfo: 1
-mi: 1
+// Syncs the player's position on the client with the one stored on the server.
+refresh: 1
 
-// Autorejecting Deals/Invites
-noask: 1
+// Give server time. (6 same commands)
+time: 1
+date: 1
+serverdate: 1
+servertime: 1
 
-//Create a party
-party: 1
+// Displays SVN version of the server.
+version: 1
 
-// Change the party item share rules.
-partyoption: 1
+// Suicide your character.
+die: 1
 
 // Enables you to rename your pet.
 petrename: 1
 
-// Command what the player's pet will say.
-pettalk: 1
-
-//Displays the server rates.
-rates: 1
-
-// Syncs the position of the player on the client with the one stored in the server.
-refresh: 1
-
-// Sends a request to all connected GMs (via the gm whisper system)
-request: 1
+// Organize a new party, with you as the party leader.
+party: 1
 
-//Shows/Hides the "there is a delay after a skill" message.
-showdelay: 1
+// Brings up your personal storage wherever you are.
+storage: 1
 
-//Displays/Hides Experience gained
-showexp: 1
+// Opens your mailbox.
+mail: 1
 
-//Displays/Hides Zeny gained
-showzeny: 1
+// Locate someone on a map, returns your coordinates if the person isn't on.
+where: 1
 
-// Give server time. (6 same commands)
-time: 1
-date: 1
-server_date: 1
-serverdate: 1
-server_time: 1
-servertime: 1
+// Duel organizing commands
+duel: 1
+invite: 1
+accept: 1
+reject: 1
+leave: 1
 
-// Show server uptime
-uptime: 1
+// Away messsage
+away: 1
+aw: 1
 
-// Displays SVN version of the server.
-version: 1
+// Main chat
+main: 1
 
-// Show who drops an item (mobs with highest drop rate)
-whodrops: 1
+// Autorejecting Deals/Invites
+noask: 1
 
-//---------------------------------------------------------------
-// 0: Mail System - SQL Only commands
+// Displays remaining jail time
+jailtime: 1
 
-// Opens mail Window.
-mail: 1
+// Homunculus commands for players
+hominfo: 1
+homstats: 1
 
 //---------------------------
 // 10: Super player+ commands
 
-// Suicide your character.
-die: 10
+// Displays/Hides Experience gained
+showexp: 10
 
-// Spawns you to set points in major cities.
+// Displays/Hides Zeny gained
+showzeny: 10
+
+// Warps you to predefined locations in major cities.
 go: 10
 
-// Brings up your guild storage wherever you are.
-gstorage: 10
+// Enables/disables autolooting from killed mobs.
+autoloot: 10
 
-// Create a guild
-guild: 10
+// Allows you continue vending offline.
+autotrade: 10
+at: 10
 
-// Brings up your personal storage wherever you are.
-storage: 10
+// Change Guild Master of your Guild
+changegm: 10
 
-// Locate someone on a map, returns your coordinates if the person isn't on.
-where: 10
+// Change the leader of your party.
+changeleader: 10
 
-// Locates and displays the position of a certain mob on the current map.
-mobsearch: 10
+// Change the party exp- and item share rules.
+partyoption: 10
 
-// Changes your apperance.
-model: 10
+// Command what the player's pet will say.
+pettalk: 10
+
+// Command what the player's homunculus will say.
+homtalk: 10
 
+// Locates and displays the position of a certain mob on the current map.
+mobsearch: 10
 // Locates and displays the position of a certain mob on your mini-map
 showmobs: 10
-
 // Prints out in which maps a monster normally spawns at (does not count script-invoked mobs)
 whereis: 10
 
-// Changes your size.
-size: 10
+// Resets a Star Gladiator's marked maps
+feelreset: 10
 
 //----------------------
 // 20: Mediator commands
 
-// Change your appearence to other players to a mob.
-disguise: 20
-
-// Changes GM clothes color (2 same commands)
-dye: 20
-ccolor: 20
-
-// Do some visual effect on your character
-effect: 20
-
-// Changes your name to your choice temporarly.
-fakename: 20
-
-// follow a player (including warping to them)
-follow: 20
-
-// Displays the motd file to all players
-gmotd: 20
-
-// Displays helpfile in Athena base directory (2 same commands).
+// Displays helpfile in eAthena base directory (2 same commands).
 help: 20
 h: 20
 help2: 20
 h2: 20
 
-// Changes GM hair color (2 same commands)
-haircolor: 20
-hcolor: 20
-
-// Changes GM hair style (2 same commands)
-hairstyle: 20
-hstyle: 20
-
 // Warp yourself to a person (3 same commands + /shift).
 jumpto: 20
 goto: 20
 warpto: 20
 
-// Warp yourself to a person by PID (similar to above, cept you us the PID)
-jumptoid2: 20
-gotoid2: 20
-warptoid2: 20
-
-// allow other players to hit you out of pvp
-killable: 20
+// Displays the motd file to all players
+gmotd: 20
 
-// To get a peco to (un)ride
-mountpeco: 20
+// Follow a player (including warping to them)
+follow: 20
 
-// Can command what other npcs (by name) can say.
-npctalk: 20
+// Sends a request to all connected GMs (via the gm whisper system)
+request: 20
 
-// Sets the speed you can walk/attack at. Default is 150.
-speed: 20
+// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
+kick: 20
 
-//Restore your normal appearance.
-undisguise: 20
+// Changes your appearance.
+model: 20
 
-// Displays distribution of players on the server per map (% on each map which has players)
-users: 20
+// To get a peco to (un)ride (2 same commands).
+mountpeco: 20
+mount: 20
 
 // Returns list of logged in characters with their position (2 same commands).
 who: 20
@@ -286,50 +232,58 @@ whomap3: 20
 // @who+@who2+who3
 whogm: 20
 
-//--------------------
-// 40: Sub-GM commands
+// Displays a sorted list of the ammount of zeny each conected player has at hand.
+whozeny: 20
 
+// Change your appearence to other players to a mob.
+disguise: 20
 
-// Resurects yourself.
-alive: 40
+// Restore your normal appearance.
+undisguise: 20
+
+// Displays the text as a normal message with the format "*name message*" 
+// instead of "name : message" (Like the /me command in IRC)
+me: 20
+
+// Changes your name to your choice temporarily.
+fakename: 20
+
+// Changes your size.
+size: 20
 
-// Levels your character to specified level (adds to your level) (3 same commands).
-blvl: 40
-blevel: 40
-baselvl: 40
-baselevel: 40
+// Can command what other npcs (by name) can say.
+npctalk: 20
+
+//--------------------
+// 40: Sub-GM commands
 
 // Broadcast to the whole server. Using (1 command + /nb, /b).
 broadcast: 40
 
-// Changes the sex of yourself
-changesex: 40
+// Broadcast to the map you are on (1 command + /lb, /nlb).
+localbroadcast: 40
 
-// Deletes floor items in your range of sight
-cleanmap: 40
+// Broadcast (with or without name)
+kami: 40
+// Same as kami but with blue color
+kamib: 40
+// Same as kami but you can choose the color (uses different packet)
+kamic: 40
 
-// drop all your items
-dropall: 40
+// Enables GvG on a map (2 same commands).
+gvgon: 40
+gpvpon: 40
 
-//Hatches an egg
-hatch: 60
+// Turns GvG (Guild vs. Guild) off on a map (2 same commands).
+gvgoff: 40
+gpvpoff: 40
 
-// Heals yourself to full HP/SP.
+// Modifies your HP/SP.
 heal: 40
 
-// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).
+// GM Hide (total invisibility to characters and monsters) (1 command + /hide).
 hide: 40
 
-//Homunculus commands for gms
-homlvup: 40
-homevolution: 40
-makehomun: 40
-homfriendly: 40
-homhungry: 40
-
-// Deletes all your items.
-itemreset: 40
-
 // Changes your job to one you specify (2 same commands).
 job: 40
 jobchange: 40
@@ -337,53 +291,15 @@ jobchange: 40
 // Enables you to to jump randomly on a map (that you are already on).
 jump: 40
 
-// Broadcast (with or without name).
-kami: 40
-kamib: 40
-
-// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
-kick: 40
-
-// Disconnects a user from the server using their PID.
-kickid2: 40
-
-// Kill all monsters in map (without drops)
-killmonster2: 40
-
 // Warps you to your last save point (2 same commands).
 load: 40
 return: 40
 
-// Broadcast to the map you are on (1 command + /lb, /nlb).
-localbroadcast: 40
-
-// To send specified character in jails
-jail: 40
-
-// To discharge a prisoner (2 same commands)
-unjail: 40
-discharge: 40
-
-// Timed jailing
-jailfor: 40
-
-// Raises your job level (3 same commands).
-jlvl: 40
-jlevel: 40
-joblvl: 40
-joblevel: 40
-
-// Creates yourself a pet egg, have to use Pet ID.
-makeegg: 60
+// Warps you to a specific npc
+tonpc: 40
 
-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands). /mm or /mapmove
-mapmove: 40
-rura: 40
-warp: 40
-
-// Marriage skills
-marry: 40
-divorce: 40
+// Saves a warp point.
+memo: 40
 
 // Set your character display options. (Visual effects of your character)
 option: 40
@@ -394,67 +310,106 @@ petfriendly: 40
 // Sets hunger level of your pet.
 pethungry: 40
 
+// Turns PvP (Person vs. Person) off on a map.
+pvpoff: 40
+
+// Enables PvP on a map.
+pvpon: 40
+
 // Permanently adds/removes a quest skill
 questskill: 40
 lostskill: 40
 
+// Sets the speed you can walk/attack at. Default is 150.
+speed: 40
+
+// Summons spirit spheres around you.
+spiritball: 40
+
+// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
+mapmove: 40 // (also /mm or /mapmove)
+rura: 40
+warp: 40
+
+// Changes GM clothes color (2 same commands)
+dye: 40
+ccolor: 40
+
+// Changes GM hair style (2 same commands)
+hairstyle: 40
+hstyle: 40
+
+// Changes GM hair color (2 same commands)
+haircolor: 40
+hcolor: 40
+
+// Deletes all your items.
+itemreset: 40
+
 // Does a skill/stat reset.
 reset: 40
 
+// Displays distribution of players on the server per map (% on each map which has players)
+users: 40
+
+// Deletes floor items in your range of sight
+cleanmap: 40
+
+// Kill all monsters in map (without drops)
+killmonster2: 40
+
 // Sets your spawn point (aka save point).
 save: 40
 
-// look up a skill by name
-skillid: 40
+// Do some visual effect on your character
+effect: 40
 
-// What skills are required to get this skill
-skilltree: 40
+// Do some visual effect on your character (misceffect)
+misceffect: 40
 
-// Play a Sound!
-sound: 40
+// GM's magnifier
+identify: 40
 
-// Enables spirit sphere balls.
-spiritball: 40
+// Drop all your items
+dropall: 40
 
-// Change Status of your character
-str: 40
-agi: 40
-vit: 40
-int: 40
-dex: 40
-luk: 40
+// Store all your items
+storeall: 40
 
-// Gets all skills (4 same commands)
-allskill: 40
-allskills: 40
-skillall: 40
-skillsall: 40
+// Allow other players to hit you out of PvP
+killable: 40
 
-// sets GM stats to maximum (4 same commands)
-statall: 40
-statsall: 40
-allstats: 40
-allstat: 40
+// Look up a skill by name
+skillid: 40
 
-// Gives you job points.
-stpoint: 40
+// Use a skill by id
+useskill: 40
 
-// Gives you skill points of desired amount.
-skpoint: 40
+// What skills are required to get this skill
+skilltree: 40
 
-// store all your items
-storeall: 40
+// Marriage commands
+marry: 40
+divorce: 40
 
-// use a skill by id
-useskill: 40
+// Adopt a novice into a family
+adopt: 40
+
+// Play a Sound!
+sound: 40
 
 //---------------------
 // 50: Sub-GM+ commands
 
-// Spawns a monster, and a certain amount (3 same commands + /monster).
-spawn: 50
+// Creates a new guild, with you as the guildmaster.
+guild: 50
+
+// Brings up your guild storage wherever you are.
+gstorage: 50
+
+// Spawns a monster, and a certain amount (2 same commands + /monster).
 monster: 50
-summon: 50
+spawn: 50
 
 // Spawns a smaller sized version of a monster.
 monstersmall: 50
@@ -462,6 +417,9 @@ monstersmall: 50
 // Spawns a larger sized version of a monster.
 monsterbig: 50
 
+// Spawns mobs that treat you as their master (they disappear after some time)
+summon: 50
+
 // It will spawn a supportive clone of the given player.
 clone: 50
 
@@ -475,40 +433,43 @@ evilclone: 50
 //----------------
 // 60: GM commands
 
-// Create a static warp portal that lasts until the next reboot
-addwarp: 60
-
-// To block definitively a player (only administrator can unblock the account) (2 same commands)
-block: 60
-charblock: 60
+// Starts Guild Wars
+agitstart: 60
 
-// To unblock a player (2 same commands)
-unblock: 60
-charunblock: 60
+// Ends Guild Wars
+agitend: 60
 
-// To ban a player for a limited time (only administrator can unban the account) (4 same commands)
-ban: 60
-banish: 60
-charban: 60
-charbanish: 60
+// Resurects yourself.
+alive: 60
+
+// Levels your character to specified level (adds to your level) (7 same commands).
+blvl: 60
+lvup: 60
+blevel: 60
+baselvl: 60
+baselvup: 60
+baselevel: 60
+baselvlup: 60
+
+// Raises your job level (6 same commands).
+jlvl: 60
+jlevel: 60
+joblvl: 60
+joblvup: 60
+joblevel: 60
+joblvlup: 60
 
-// To unban a player (4 same commands)
-unban: 60
-unbanish: 60
-charunban: 60
-charunbanish: 60
+// Changes the sex of yourself
+changesex: 60
 
 // Levels your guild to specified level (2 same commands).
+glvl: 60
+glevel: 60
+guildlvl: 60
 guildlvup: 60
+guildlevel: 60
 guildlvlup: 60
 
-// Warps all online character of a guild to you. (at least one member of that guild must be on.)
-guildrecall: 60
-
-// Allows you to spy on any Guilds Guild chat. (at least one member of that guild must be on.)
-// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
-guildspy: 60
-
 // Find an itemID based on item name
 idsearch: 60
 
@@ -521,85 +482,142 @@ item2: 60
 // Kill another character without hitting them.
 kill: 60
 
-// Same as above, cept uses PID.
-killid2: 60
-
 // Kill all monsters in map (with drops)
 killmonster: 60
 
-// Enable hitting a player even when not in pvp
-killer: 60
+// Creates yourself a pet egg.
+makeegg: 60
 
-// Mute a player (prevents talking, usage of skills and commands)
-mute: 80
+// Hatches an egg
+hatch: 60
 
-// Warps all online character of a party to you. (at least one party member must be online.)
-partyrecall: 60
+// Instantly kills player whose name is entered and deals insane damage to everything around
+nuke: 60
 
-//Allows you to spy on any party's party chat. (at least one party member must be online.)
-// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
-partyspy: 60
+// Enable hitting a player even when not in PvP
+killer: 60
 
 // Creates weapon of desired element.
 produce: 60
 
-// Turns PVP (Person v. Person) off on a map.
-pvpoff: 60
-
-// Enables PVP on a map.
-pvpon: 60
-
 // Warps a character to you (1 command + /recall).
 recall: 60
 
-// Warps a character to you using their PID.
-recallid2: 60
-
 // Refines all weapons in your items list.
 refine: 60
 
 // Will repair all broken items in inventory.
 repairall: 60
 
-// Revives a character using their PID.
-reviveid2: 60
+// Change Status of your character
+str: 60
+agi: 60
+vit: 60
+int: 60
+dex: 60
+luk: 60
 
-// Unmute a player
-unmute: 60
+// Gets all skills (4 same commands)
+allskill: 60
+allskills: 60
+skillall: 60
+skillsall: 60
+
+// Sets GM stats to maximum (4 same commands)
+statall: 60
+statsall: 60
+allstats: 60
+allstat: 60
+
+// Gives you job points.
+stpoint: 60
+
+// Gives you skill points of desired amount.
+skpoint: 60
+
+// Warps all online character of a guild to you. (at least one member of that guild must be on.)
+guildrecall: 60
+
+// Warps all online character of a party to you. (at least one party member must be online.)
+partyrecall: 60
+
+// Allows you to spy on any Guilds Guild chat. (at least one member of that guild must be on.)
+// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
+guildspy: 60
+
+// Allows you to spy on any party's party chat. (at least one party member must be online.)
+// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
+partyspy: 60
 
 // Gives you money (zeny) of desired amount.
 zeny: 60
 
-//----------------------
-// 80: GM Chief commands
+// To block definitively a player (2 same commands)
+block: 60
+charblock: 60
 
-// Starts Guild Wars
-agitstart: 60
+// To unblock a player (2 same commands)
+unblock: 60
+charunblock: 60
 
-// Ends Guild Wars
-agitend: 60
+// To ban a player for a limited time (4 same commands)
+ban: 60
+banish: 60
+charban: 60
+charbanish: 60
+
+// To unban a player (4 same commands)
+unban: 60
+unbanish: 60
+charunban: 60
+charunbanish: 60
+
+// To send specified character in jails
+jail: 60
+
+// To discharge a prisoner (2 same commands)
+unjail: 60
+discharge: 60
+
+// Timed jailing
+jailfor: 60
+
+// Create a static warp portal that lasts until the next reboot
+addwarp: 60
+
+// Open a trade window with any player
+trade: 60
+
+// Changes the player's appearance (headgear)
+changelook: 60
+
+// Homunculus commands for GMs
+hlvl: 60
+hlevel: 60
+homlvl: 60
+homlvup: 60
+homlevel: 60
+homevolve: 60
+homevolution: 60
+makehomun: 60
+homfriendly: 60
+homhungry: 60
+
+// Re-calculates stats, as if the homun was sent back to level 1 and re-leveled
+homshuffle: 60
+
+//----------------------
+// 80: GM Chief commands
 
 // Set the map you are on to day.
 day: 80
 
-// [Un]Disguise All Players (admin command)
-disguiseall: 99
-undisguiseall: 99
-
 // Kills everyone on the server.
 doom: 80
 
 // Kills everyone on the map you are on.
 doommap: 80
 
-// Enables GVG on a map (2 same commands).
-gvgon: 40
-gpvpon: 40
-
-// Turns GVG (Guild v. Guild) off on a map (2 same commands).
-gvgoff: 40
-gpvpoff: 40
-
 // Set the map you are currently on to night.
 night: 80
 
@@ -633,19 +651,14 @@ skillon: 80
 // turn skills off for a map
 skilloff: 80
 
-//---------------------------
-// 99: Administrator commands
-
-// Changes the required GM level of an @ command
-// (effect lasts until restart or command reload)
-adjcmdlvl: 99
+// Mute a player (prevents talking, usage of skills and commands)
+mute: 80
 
-// Changes the GM level of another character
-// (lasts until reboot, or gm list reload)
-adjgmlvl: 99
+// Unmute a player
+unmute: 80
 
-// Give information about terrain/area (debug function)
-gat: 99
+//---------------------------
+// 99: Administrator commands
 
 // Disconnect all users from the server
 kickall: 99
@@ -653,6 +666,12 @@ kickall: 99
 // Closes Map-Server
 mapexit: 99
 
+// Used for testing packet sends from the client (debug function)
+send: 99
+
+// Give information about terrain/area (debug function)
+gat: 99
+
 // Displays a status change without really applying it (debug function)
 displaystatus: 99
 
@@ -665,10 +684,6 @@ mapinfo: 99
 // Set Map Flags (WIP)
 mapflag: 99
 
-// Mutes every player on screen (admin command)
-mutearea: 99
-stfu: 99
-
 // Re-load item database (admin command)
 reloaditemdb: 99
 
@@ -684,7 +699,10 @@ reloadscript: 99
 // Re-load GM level (admin command)
 reloadgmdb: 99
 
-// Refresh online status of players - SQL Only
+// Change a battle_config flag without rebooting server
+setbattleflag: 99
+
+// Refresh only status of players - SQL Only
 refreshonline: 99
 
 // Re-load gm command config (admin command)
@@ -704,11 +722,21 @@ reloadpcdb: 99
 // Re-load the Message of the Day (admin command)
 reloadmotd: 99
 
-// Used for testing packet sends from the client (debug function)
-send: 99
+// Changes the GM level of another character
+// (lasts until reboot, or gm list reload)
+adjgmlvl: 99
 
-// change a battle_config flag without rebooting server
-setbattleflag: 99
+// Changes the required GM level of an @ command
+// (effect lasts until restart or command reload)
+adjcmdlvl: 99
+
+// [Un]Disguise All Players (admin command)
+disguiseall: 99
+undisguiseall: 99
+
+// Mutes every player on screen (admin command)
+mutearea: 99
+stfu: 99
 
 // Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)
 monsterignore: 99
@@ -737,8 +765,6 @@ clearweather: 99
 //---------------------------------------------------------------
 // 100: Disabled commands
 gm: 100
-nuke: 100
-
 
 //---------------------
 // OTHER: not a command
diff --git a/conf/charcommand_athena.conf b/conf/charcommand_athena.conf
index acd89779a..20e0c2427 100644
--- a/conf/charcommand_athena.conf
+++ b/conf/charcommand_athena.conf
@@ -1,10 +1,12 @@
-// Athena charcommand Configuration file.
-// Translated by Peter Kieser <pfak@telus.net>
+//--------------------------------------------------------------
+// eAthena charcommand configuration file.
+// Originally translated by Peter Kieser <pfak@telus.net>
+//--------------------------------------------------------------
 
 // The symbol that will be used to recognize commands.
-// You can set any one character, except control-characters (0x00-0x1f),
+// You can set any one character except control-characters (0x00-0x1f),
 // '%', '$' (party/guild chat speaking) and '/' (standard client commands).
-// The symbol must be different from from the standard GM command symbol.
+// The symbol must also be different from from the GM atcommand symbol.
 command_symbol: #
 
 
@@ -21,6 +23,9 @@ command_symbol: #
 //----------------------
 // 20: Mediator commands
 
+// Displays helpfile in eAthena base directory
+help: 20
+
 //--------------------
 // 40: Sub-GM commands
 
@@ -120,6 +125,12 @@ delitem: 60
 disguise: 60
 undisguise: 60
 
+// Drop a players possessions on the ground
+dropall: 60
+
+// Put a players possessions in storage
+storeall: 60
+
 // Resets another character's designated maps
 feelreset: 60