Massive at+charcommand cleanup, big thanks to HiddenDragon

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

2 files changed, 549 insertions, 465 deletions

diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index e4eacc9c2..b0d3b0ec4 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -45,170 +45,237 @@ command_symbol: @
 //-------------------------
 // 1: Super player commands
 
-//Displays a list of @ commands available to the player.
-commands: 1
+// Enables/disables autolooting from killed mobs.
+autoloot: 1
 
-//Displays the server rates.
-rates: 1
+// Allows you continue vending offline.
+autotrade: 1
+at: 1
 
-// Show server uptime
-uptime: 1
+// Away messsage
+away: 1
+aw: 1
 
-//Shows/Hides the "there is a delay after a skill" message.
-showdelay: 1
+// Change Guild Master of your Guild
+changegm: 1
 
-//Displays current levels and % progress.
-exp: 1
+// Change the leader of your party.
+changeleader: 1
+
+//Displays a list of @ commands available to the player.
+commands: 1
+
+// Duel organizing commands
+duel: 1
+invite: 1
+accept: 1
+reject: 1
+leave: 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 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 Monster info (rates, stats, drops, MVP stuff)
 mobinfo: 1
 monsterinfo: 1
 mi: 1
 
-// Show Item info (type, price, etc)
-iteminfo: 1
-ii: 1
+// Autorejecting Deals/Invites
+noask: 1
 
-// Show who drops an item (mobs with highest drop rate)
-whodrops: 1
+//Create a party
+party: 1
+
+// Change the party item share rules.
+partyoption: 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
+
+//Shows/Hides the "there is a delay after a skill" message.
+showdelay: 1
+
+//Displays/Hides Experience gained
+showexp: 1
+
+//Displays/Hides Zeny gained
+showzeny: 1
+
 // Give server time. (6 same commands)
 time: 1
 date: 1
+server_date: 1
 serverdate: 1
+server_time: 1
 servertime: 1
 
+// Show server uptime
+uptime: 1
+
 // Displays SVN version of the server.
 version: 1
 
-// Suicide your character.
-die: 1
-
-// Enables you to rename your pet.
-petrename: 1
-
-party: 1
+// Show who drops an item (mobs with highest drop rate)
+whodrops: 1
 
-// Brings up your personal storage wherever you are.
-storage: 1
+//---------------------------------------------------------------
+// 0: Mail System - SQL Only commands - Must be enabled
 
-// Locate someone on a map, returns your coordinates if the person isn't on.
-where: 1
+// Check # of messages.
+checkmail: 1
 
-// Duel organizing commands
-duel: 1
-invite: 1
-accept: 1
-reject: 1
-leave: 1
+// List all messages.
+listmail: 1
 
-// Away messsage
-away: 1
-aw: 1
+// List only new mail.
+listnewmail: 1
 
-// Main chat
-main: 1
+// Read a message.
+readmail: 1
 
-// Autorejecting Deals/Invites
-noask: 1
+// Send mail.
+sendmail: 1
 
-// Displays remaining jail time
-jailtime: 1
+// Send priority mail (tagged with Priority and cannot be deleted until read)
+sendprioritymail: 80
 
-//Homunculus commands for players
-hominfo: 1
-homstats: 1
+// Delete a message.
+deletemail: 1
 
 //---------------------------
 // 10: Super player+ commands
 
-//Displays/Hides Experience gained
-showexp: 10
-
-//Displays/Hides Zeny gained
-showzeny: 10
+// Suicide your character.
+die: 10
 
 // Spawns you to set points in major cities.
 go: 10
 
-// Enables/disables autolooting from killed mobs.
-autoloot: 10
-
-// Allows you continue vending offline.
-autotrade: 10
-at: 10
-
-// Change Guild Master of your Guild
-changegm: 10
-
-// Change the leader of your party.
-changeleader: 10
+// Brings up your guild storage wherever you are.
+gstorage: 10
 
-// Change the party item share rules.
-partyoption: 10
+// Create a guild
+guild: 10
 
-// Command what the player's pet will say.
-pettalk: 10
+// Brings up your personal storage wherever you are.
+storage: 10
 
-// Command what the player's homunculus will say.
-homtalk: 10
+// Locate someone on a map, returns your coordinates if the person isn't on.
+where: 10
 
 // Locates and displays the position of a certain mob on the current map.
 mobsearch: 10
+
+// Changes your apperance.
+model: 10
+
 // Locates and displays the position of a certain mob on your mini-map
 showmobs: 10
 
+// Changes your size.
+size: 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).
 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)
-jumptoid: 20
 jumptoid2: 20
-gotoid: 20
 gotoid2: 20
-warptoid: 20
 warptoid2: 20
 
-// Displays the motd file to all players
-gmotd: 20
-
-// follow a player (including warping to them)
-follow: 20
+// allow other players to hit you out of pvp
+killable: 20
 
-// Sends a request to all connected GMs (via the gm whisper system)
-request: 20
+// To get a peco to (un)ride
+mountpeco: 20
 
-// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
-kick: 20
+// Can command what other npcs (by name) can say.
+npctalk: 20
 
-// Disconnects a user from the server using their PID.
-kickid: 20
-kickid2: 20
+// Sets the speed you can walk/attack at. Default is 150.
+speed: 20
 
-// Changes your apperance.
-model: 20
+//Restore your normal appearance.
+undisguise: 20
 
-// To get a peco to (un)ride
-mountpeco: 20
+// Displays distribution of players on the server per map (% on each map which has players)
+users: 20
 
 // Returns list of logged in characters with their position (2 same commands).
 who: 20
@@ -234,61 +301,50 @@ whomap3: 20
 // @who+@who2+who3
 whogm: 20
 
-// 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
-
-//Restore your normal appearance.
-undisguise: 20
-
-// Display ignore list of a player (people from which the player ignore wisps)
-charignorelist: 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 temporarly.
-fakename: 20
+//--------------------
+// 40: Sub-GM commands
 
-// Changes your size.
-size: 20
 
-// Can command what other npcs (by name) can say.
-npctalk: 20
+// Resurects yourself.
+alive: 40
 
-//--------------------
-// 40: Sub-GM commands
+// Levels your character to specified level (adds to your level) (3 same commands).
+blvl: 40
+blevel: 40
+baselvl: 40
+baselevel: 40
 
 // Broadcast to the whole server. Using (1 command + /nb, /b).
 broadcast: 40
 
-// Broadcast to the map you are on (1 command + /lb, /nlb).
-localbroadcast: 40
+// Changes the sex of yourself
+changesex: 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
+// Deletes floor items in your range of sight
+cleanmap: 40
 
-// Enables GVG on a map (2 same commands).
-gvgon: 40
-gpvpon: 40
+// drop all your items
+dropall: 40
 
-// Turns GVG (Guild v. Guild) off on a map (2 same commands).
-gvgoff: 40
-gpvpoff: 40
+//Hatches an egg
+hatch: 60
 
-// Heals a person to full HP/SP.
+// Heals yourself to full HP/SP.
 heal: 40
 
 // GM Hide (enables you to be invisible to characters, and most 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
@@ -296,140 +352,126 @@ jobchange: 40
 // Enables you to to jump randomly on a map (that you are already on).
 jump: 40
 
-// Warps you to your last save point (2 same commands).
-return: 40
-load: 40
-
-// Warps you to a specific npc
-tonpc: 40
+// Broadcast (with or without name).
+kami: 40
+kamib: 40
 
-// Enables lost skills.
-lostskill: 40
+// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
+kick: 40
 
-// Saves a warp point.
-memo: 40
+// Disconnects a user from the server using their PID.
+kickid2: 40
 
-// Set your character display options. (Visual effects of your character)
-option: 40
+// Kill all monsters in map (without drops)
+killmonster2: 40
 
-// Search the pet db for matching entries
-petid: 40
+// Warps you to your last save point (2 same commands).
+load: 40
+return: 40
 
-// Sets the level of intemecy of your pet.
-petfriendly: 40
+// Broadcast to the map you are on (1 command + /lb, /nlb).
+localbroadcast: 40
 
-// Sets hunger level of your pet.
-pethungry: 40
+// Enables lost skills.
+lostskill: 40
 
-// Turns PVP (Person v. Person) off on a map.
-pvpoff: 40
+// To send specified character in jails
+jail: 40
 
-// Enables PVP on a map.
-pvpon: 40
+// To discharge a prisoner (2 same commands)
+unjail: 40
+discharge: 40
 
-// Enables platinum skills.
-questskill: 40
+// Timed jailing
+jailfor: 40
 
-// Sets the speed you can walk/attack at. Default is 150.
-speed: 40
-charspeed: 40
+// Raises your job level (3 same commands).
+jlvl: 40
+jlevel: 40
+joblvl: 40
+joblevel: 40
 
-// Enables spirit sphere balls.
-spiritball: 40
+// Creates yourself a pet egg, have to use Pet ID.
+makeegg: 60
 
-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
-mapmove: 40 // (also /mm or /mapmove)
+// Warp yourself to a certain map, at (x,y) coordinates (2 same commands). /mm or /mapmove
+mapmove: 40
 rura: 40
 warp: 40
 
-// Changes GM clothes color (2 same commands)
-dye: 40
-ccolor: 40
+// Marriage skills
+marry: 40
+divorce: 40
 
-// Changes GM hair style (2 same commands)
-hairstyle: 40
-hstyle: 40
+// Set your character display options. (Visual effects of your character)
+option: 40
 
-// Changes GM hair color (2 same commands)
-haircolor: 40
-hcolor: 40
+// Sets the level of intemecy of your pet.
+petfriendly: 40
 
-// Deletes all your items.
-itemreset: 40
+// Sets hunger level of your pet.
+pethungry: 40
+
+// Enables any skill.
+questskill: 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
 
-// Do some visual effect on your character
-effect: 40
-
-// Display all items of a player's cart
-charcartlist: 40
-
-// GM's magnifier
-identify: 40
-
-// drop all your items
-dropall: 40
-
-// store all your items
-storeall: 40
-
-// allow other players to hit you out of pvp
-killable: 40
-
 // look up a skill by name
 skillid: 40
 
-// use a skill by id
-useskill: 40
-
 // What skills are required to get this skill
 skilltree: 40
 
-// Marriage commands
-marry: 40
-divorce: 40
+// Play a Sound!
+sound: 40
 
-// Adopt a novice into a family
-adopt: 40
+// Enables spirit sphere balls.
+spiritball: 40
 
-// make another player killable
-charkillable: 40
+// Change Status of your character
+str: 40
+agi: 40
+vit: 40
+int: 40
+dex: 40
+luk: 40
 
-// Same as above, cept uses PID.
-charkillableid: 40
-charkillableid2: 40
+// Gets all skills (4 same commands)
+allskill: 40
+allskills: 40
+skillall: 40
+skillsall: 40
 
-// Play a Sound!
-sound: 40
+// sets GM stats to maximum (4 same commands)
+statall: 40
+statsall: 40
+allstats: 40
+allstat: 40
 
-//---------------------
-// 50: Sub-GM+ commands
+// Gives you job points.
+stpoint: 40
+
+// Gives you skill points of desired amount.
+skpoint: 40
 
-guild: 50
+// store all your items
+storeall: 40
 
-// Brings up your guild storage wherever you are.
-gstorage: 50
+// use a skill by id
+useskill: 40
 
-// To get a peco to (un)ride for another player.
-charmountpeco: 50
+//---------------------
+// 50: Sub-GM+ commands
 
-// Spawns a monster, and a certain amount (2 same commands + /monster).
-monster: 50
+// Spawns a monster, and a certain amount (3 same commands + /monster).
 spawn: 50
+monster: 50
+summon: 50
 
 // Spawns a smaller sized version of a monster.
 monstersmall: 50
@@ -437,9 +479,6 @@ 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
 
@@ -453,38 +492,41 @@ evilclone: 50
 //----------------
 // 60: GM commands
 
-// Starts Guild Wars
-agitstart: 60
-
-// Ends Guild Wars
-agitend: 60
-
-// Resurects yourself.
-alive: 60
-
-// Levels your character to specified level (adds to your level) (3 same commands).
-lvup: 60
-baselvlup: 60
-blevel: 60
+// Create a static warp portal that lasts until the next reboot
+addwarp: 60
 
-// Raises your job level (3 same commands).
-joblvup: 60
-joblvlup: 60
-jlevel: 60
+// To block definitively a player (only administrator can unblock the account) (2 same commands)
+block: 60
+charblock: 60
 
-// Changes the sex of yourself
-changesex: 60
+// To unblock a player (2 same commands)
+unblock: 60
+charunblock: 60
 
-// Remove items from a character
-chardelitem: 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
 
-// Saves the respawn point of another character.
-charsave: 60
+// To unban a player (4 same commands)
+unban: 60
+unbanish: 60
+charunban: 60
+charunbanish: 60
 
 // Levels your guild to specified level (2 same commands).
 guildlvup: 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
 
 // Creates an item of your choosing, either Item ID or Name (1 command + /item).
@@ -497,32 +539,37 @@ item2: 60
 kill: 60
 
 // Same as above, cept uses PID.
-killid: 60
 killid2: 60
 
 // Kill all monsters in map (with drops)
 killmonster: 60
 
-// Creates yourself a pet egg, have to use Pet ID.
-makeegg: 60
+// Enable hitting a player even when not in pvp
+killer: 60
 
-// Hatches an egg
-hatch: 60
+// Mute a player (prevents talking, usage of skills and commands)
+mute: 80
 
-// Instantly kills player whose name is entered and deals insane damage to everything around
-nuke: 60
+// Warps all online character of a party to you. (at least one party member must be online.)
+partyrecall: 60
 
-// Enable hitting a player even when not in pvp
-killer: 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
 
 // 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.
-recallid: 60
 recallid2: 60
 
 // Refines all weapons in your items list.
@@ -531,133 +578,45 @@ refine: 60
 // Will repair all broken items in inventory.
 repairall: 60
 
-// Revives a character, and heals them.
-revive: 60
-
-// Same as above, cept uses PID.
-reviveid: 60
+// Revives a character using their PID.
 reviveid2: 60
 
-// Warp another person to a certain map, at (x,y) coordinates (2 same commands).
-charwarp: 60
-
-// Change Status of your character
-str: 60
-agi: 60
-vit: 60
-int: 60
-dex: 60
-luk: 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
+// Unmute a player
+unmute: 60
 
 // Gives you money (zeny) of desired amount.
 zeny: 60
 
-// To block definitively a player (only administrator can unblock the account) (2 same commands)
-block: 60
-charblock: 60
-
-// To unblock a player (2 same commands)
-unblock: 60
-charunblock: 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
-
-// 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
-
-//Displays remaining jail time
-charjailtime: 60
-
-// To change disguise of another player/GM
-chardisguise: 60
-charundisguise: 60
-
-// Create a static warp portal that lasts until the next reboot
-addwarp: 60
-
-// drop a players possessions on the gruond
-chardropall: 60
-
-// put a players possessions in storage
-charstoreall: 60
-
-// open a trade window with any player
-trade: 60
-
-// changes the player's appearance (headgear)
-changelook: 60
-
-// Homunculus commands for gms
-homlvup: 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
 
+// Starts Guild Wars
+agitstart: 60
+
+// Ends Guild Wars
+agitend: 60
+
 // 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
 
@@ -691,43 +650,42 @@ skillon: 80
 // turn skills off for a map
 skilloff: 80
 
-// Mute a player (prevents talking, usage of skills and commands)
-mute: 80
-
-// Unmute a player
-unmute: 80
-
 //---------------------------
 // 99: Administrator commands
 
+// Changes the required GM level of an @ command
+// (effect lasts until restart or command reload)
+adjcmdlvl: 99
+
+// Changes the GM level of another character
+// (lasts until reboot, or gm list reload)
+adjgmlvl: 99
+
+// Give information about terrain/area (debug function)
+gat: 99
+
 // Disconnect all users from the server
 kickall: 99
 
 // Closes Map-Server
 mapexit: 99
 
-// Used for testing packet sends from the client (debug function)
-send: 99
-
-// Enables debugging
-packet: 99
-
-// Give information about terrain/area (debug function)
-gat: 99
+// Displays a status change without really applying it (debug function)
+displaystatus: 99
 
 // Displays the animation of a skill without really using it (debug function)
 displayskill: 99
 
-// Allows viewing/changing the map's water level (debug function)
-// NOTE: Requires access to the .grf files since the map height properties are not stored in the map cache.
-waterlevel: 99
-
 // Shows information about the map
 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
 
@@ -743,10 +701,7 @@ reloadscript: 99
 // Re-load GM level (admin command)
 reloadgmdb: 99
 
-// change a battle_config flag without rebooting server
-setbattleflag: 99
-
-// Refresh only status of players - SQL Only
+// Refresh online status of players - SQL Only
 refreshonline: 99
 
 // Re-load gm command config (admin command)
@@ -766,23 +721,13 @@ reloadpcdb: 99
 // Re-load the Message of the Day (admin command)
 reloadmotd: 99
 
-// Changes the GM level of another character
-// (lasts until reboot, or gm list reload)
-adjgmlvl: 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
+// Used for testing packet sends from the client (debug function)
+send: 99
 
-// Mutes every player on screen (admin command)
-mutearea: 99
-stfu: 99
+// change a battle_config flag without rebooting server
+setbattleflag: 99
 
-// Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)
+// Makes you inmune to attacks (monsters/players/skills cannot target/hit you, admin command)
 monsterignore: 99
 battleignore: 99
 
@@ -807,32 +752,10 @@ leaves:99
 clearweather: 99
 
 //---------------------------------------------------------------
-// 0: Mail System - SQL Only commands - Must be enabled
-
-// Check # of messages.
-checkmail: 1
-
-// List all messages.
-listmail: 1
-
-// List only new mail.
-listnewmail: 1
-
-// Read a message.
-readmail: 1
-
-// Send mail.
-sendmail: 1
-
-// Send priority mail (tagged with Priority and cannot be deleted until read)
-sendprioritymail: 80
-
-// Delete a message.
-deletemail: 1
-
-//---------------------------------------------------------------
 // 100: Disabled commands
 gm: 100
+nuke: 100
+
 
 //---------------------
 // OTHER: not a command
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index c0756b467..927a44054 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -8,91 +8,252 @@
 // With default character, all commands begin by a '#', example: #save SomePlayer
 command_symbol: #
 
-//Give another character a fake name
-fakename: 20
+//--------------------------
+// 0: normal player commands
+// None for security purposes.
 
-//List a chacter's stats
-stats: 40
+//-------------------------
+// 1: Super player commands
 
-//Give another character all stats
-statsall: 40
+//---------------------------
+// 10: Super player+ commands
 
-//List a chacter's items
-itemlist: 40
+//----------------------
+// 20: Mediator commands
+
+//--------------------
+// 40: Sub-GM commands
+
+
+//View the items in a character's cart
+cartlist: 40
 
 //Apply an effect onto another character
 effect: 40
 
+//View the exp of a character
+exp: 40
+
+//List a chacter's items
+itemlist: 40
+
+//View the jail time remaining
+jailtime: 40
+
+//Refresh a character
+refresh: 40
+
+//List a chacter's stats
+stats: 40
+
 //List a chacter's storage items
 storagelist: 40
 
-//Rename another character's pet
-petrename: 50
+//---------------------
+// 50: Sub-GM+ commands
 
-//Make another character's pet friendly/not
-petfriendly: 50
+//Change a character's clothing color
+dye: 50
+
+//Give another character a fake name
+fakename: 50
+
+//Open the hatch dialog for a character
+hatch: 50
+
+//Change a character's hair color
+hcolor: 50
+haircolor: 50
+
+//Change a character's hair style
+hstyle: 50
+hairstyle: 50
 
 // Changes character's model
 model: 50
 
-//Apply a certain option to another character
-option: 60
+//Give or remove a peco from a character
+mount: 50
+mountpeco: 50
 
-//Save another character
-save: 60
+//Make another character's pet friendly/not
+petfriendly: 50
 
-//Performs a stat and skill reset on someone else
-reset: 60
+//Rename another character's pet
+petrename: 50
 
-//Give another character spiritball effect
-spiritball: 60
+//Change a character's size
+size: 50
+
+//----------------
+// 60: GM commands
+
+//Resurrects a dead character
+alive: 60
+
+//Give a player all the skills available to him/her
+allskill: 60
+allskills: 60
+skillall: 60
+skillsall: 60
+
+//Give a character the maximum possible stats
+allstat: 60
+allstats: 60
+statall: 60
+statsall: 60
+
+//Change another character's base level (3 same commands)
+blvl: 60
+blevel: 60
+baselvl: 60
+baselevel: 60
+
+// Changes the sex of an online player (all characters on the account)
+changesex: 60
+
+//Delete items from a character
+delitem: 60
+
+//Disguise a character
+disguise: 60
+undisguise: 60
+
+//Resets another character's designated maps
+feelreset: 60
+
+//Change the guild level for a character's guild
+glvl: 60
+glevel: 60
+guildlvl: 60
+guildlevel: 60
+
+//Open guild storage for a character
+gstorage: 60
+
+//Heal a character
+heal: 60
+
+//Invoke GM Hide on a character
+hide: 60
+
+//Increase a character's homunculus' level
+hlvl: 60
+hlevel: 60
+homlvl: 60
+homlevel: 60
+
+//Evolve a character's homunculus
+homevolve: 60
+homevolution: 60
+
+//Change a character's homunculus' friendly value
+homfriendly: 60
+
+//Change a character's homunculus' hunger value
+homhungry: 60
+
+//View a character's homunculus' stats
+hominfo: 40
 
 //Give another character an item
 item: 60
 
+//Create a specific item (with cards, refines, etc
+item2: 60
+
+//Remove all of a character's possessions
+itemreset: 60
+
 //Change another character's job (2 same commands)
 job: 60
 jobchange: 60
 
-//Give another character zeny
-zeny: 60
-
-//Change another character's base level (3 same commands)
-baselvl: 60
-blvl: 60
-baselvlup: 60
-
 //Change another character's job level (3 same commands)
-joblvl: 60
 jlvl: 60
-joblvlup: 60
+jlevel: 60
+joblvl: 60
+joblevel: 60
 
-//Give another character a platinum skill
-questskill: 60
+//Allow a character to attack anybody
+killer: 60
+
+//Make a character killable by anybody
+killable: 60
+
+//Return a character to their respawn point
+load: 60
 
 //Take away a character's platinum skill
 lostskill: 60
 
-// Resets another character's status, skills
-streset: 60
-skreset: 60
+//Make a character immune to monsters
+monsterignore: 60
 
+//Apply a certain option to another character
+option: 60
 
-// Gives another character status points
-stpoint: 60
+//Change a character's pet's hungry value
+pethungry: 60
+
+//Produce forged equipment on a character (as if he/she was a blacksmith)
+produce: 60
+
+//Give another character a platinum skill
+questskill: 60
+
+//Performs a stat and skill reset on someone else.
+reset: 60
+
+//Save another character
+save: 60
 
 // Gives another character skill points
 skpoint: 60
 
-// Changes the sex of an online player (all characters on the account)
-changesex: 60
+//Change a character's walking speed
+speed: 60
+
+//Give another character spiritball effect
+spiritball: 60
+
+//Open storage for a character
+storage: 60
+
+// Gives another character status points
+stpoint: 60
+
+//Change a character's stats
+str: 60
+agi: 60
+vit: 60
+int: 60
+dex: 60
+luk: 60
+
+// Resets another character's status, skills
+streset: 60
+skreset: 60
 
 // Warp a player somewhere else (3 same commands)
 warp: 60
 rura: 60
 rura+: 60
 
-//Resets another character's designated maps
-feelreset: 60
+//----------------------
+// 80: GM Chief commands
+
+//Refine a character's equipment
+refine: 80
+
+//Give another character zeny
+zeny: 80
+
+//---------------------------
+// 99: Administrator commands
+
+//---------------------------------------------------------------
+// 100: Disabled commands
+
 
 import: conf/import/charcommand_conf.txt