Removed charcommand code while allowing atcommand code to support its functionality.

Charcommands still retain their '#' symbol but now looks for a character name as the first parameter instead of last.
Atcommand configs now support charcommand level configurations by comma seperation (e.g. 60,99)
As a result of this, all atcommands that don't affect multiple users already (@kickall, @doom, @mapexit) are capable of remote usage.

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

3 files changed, 288 insertions, 562 deletions

diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index af2fd1c26..d8ef70652 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -9,8 +9,9 @@
 // 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".
+// The following settings in this file use the format "<command name>: level(@),level(#)".
 // They define the minimum GM level required to execute the associated command.
+// @ = self use, # = useable on other players
 // 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.
@@ -46,728 +47,728 @@ command_symbol: @
 // 1: Super player commands
 
 // Displays a list of @ commands available to the player.
-commands: 1
+commands: 1,1
 
 // Displays the server rates.
-rates: 1
+rates: 1,1
 
 // Show server uptime
-uptime: 1
+uptime: 1,1
 
 // Shows/Hides the "there is a delay after a skill" message.
-showdelay: 1
+showdelay: 1,1
 
 // Displays current levels and % progress.
-exp: 1
+exp: 1,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
+email: 1,1
 
 // Show Monster info (rates, stats, drops, MVP stuff)
-mobinfo: 1
-monsterinfo: 1
-mi: 1
+mobinfo: 1,1
+monsterinfo: 1,1
+mi: 1,1
 
 // Show Item info (type, price, etc)
-iteminfo: 1
-ii: 1
+iteminfo: 1,1
+ii: 1,1
 
 // Show who drops an item (mobs with highest drop rate)
-whodrops: 1
+whodrops: 1,1
 
 // Syncs the player's position on the client with the one stored on the server.
-refresh: 1
+refresh: 1,1
 
 // Give server time. (6 same commands)
-time: 1
-date: 1
-serverdate: 1
-servertime: 1
+time: 1,1
+date: 1,1
+serverdate: 1,1
+servertime: 1,1
 
 // Displays SVN version of the server.
-version: 1
+version: 1,1
 
 // Suicide your character.
-die: 1
+die: 1,1
 
 // Enables you to rename your pet.
-petrename: 1
+petrename: 1,1
 
 // Organize a new party, with you as the party leader.
-party: 1
+party: 1,1
 
 // Brings up your personal storage wherever you are.
-storage: 1
+storage: 1,1
 
 // Opens your mailbox.
-mail: 1
+mail: 1,1
 
 // Opens auctions window.
-auction: 1
+auction: 1,1
 
 // Locate someone on a map, returns your coordinates if the person isn't on.
-where: 1
+where: 1,1
 
 // Duel organizing commands
-duel: 1
-invite: 1
-accept: 1
-reject: 1
-leave: 1
+duel: 1,1
+invite: 1,1
+accept: 1,1
+reject: 1,1
+leave: 1,1
 
 // Away messsage
-away: 1
-aw: 1
+away: 1,1
+aw: 1,1
 
 // Main chat
-main: 1
+main: 1,1
 
 // Autorejecting Deals/Invites
-noask: 1
+noask: 1,1
 
 // Displays remaining jail time
-jailtime: 1
+jailtime: 1,1
 
 // Homunculus commands for players
-hominfo: 1
-homstats: 1
+hominfo: 1,1
+homstats: 1,1
 
 // Kill Steal Protection
-noks: 1
+noks: 1,1
 
 //---------------------------
 // 10: Super player+ commands
 
 // Displays/Hides Experience gained
-showexp: 10
+showexp: 10,10
 
 // Displays/Hides Zeny gained
-showzeny: 10
+showzeny: 10,10
 
 // Warps you to predefined locations in major cities.
-go: 10
+go: 10,10
 
 // Enables/disables autolooting from killed mobs.
-autoloot: 10
+autoloot: 10,10
 
 // Enables/disables autolooting an item.
-alootid: 10
+alootid: 10,10
 
 // Allows you continue vending offline.
-autotrade: 10
-at: 10
+autotrade: 10,10
+at: 10,10
 
 // Change Guild Master of your Guild
-changegm: 10
+changegm: 10,10
 
 // Change the leader of your party.
-changeleader: 10
+changeleader: 10,10
 
 // Change the party exp- and item share rules.
-partyoption: 10
+partyoption: 10,10
 
 // Command what the player's pet will say.
-pettalk: 10
+pettalk: 10,10
 
 // Command what the player's homunculus will say.
-homtalk: 10
+homtalk: 10,10
 
 // Locates and displays the position of a certain mob on the current map.
-mobsearch: 10
+mobsearch: 10,10
 // Locates and displays the position of a certain mob on your mini-map
-showmobs: 10
+showmobs: 10,10
 // Prints out in which maps a monster normally spawns at (does not count script-invoked mobs)
-whereis: 10
+whereis: 10,10
 
 // Resets a Star Gladiator's marked maps
-feelreset: 10
+feelreset: 10,10
 
 //----------------------
 // 20: Mediator commands
 
 // Displays helpfile in eAthena base directory (2 same commands).
-help: 20
-h: 20
-help2: 20
-h2: 20
+help: 20,20
+h: 20,20
+help2: 20,20
+h2: 20,20
 
 // Warp yourself to a person (3 same commands + /shift).
-jumpto: 20
-goto: 20
-warpto: 20
+jumpto: 20,20
+goto: 20,20
+warpto: 20,20
 
 // Displays the motd file to all players
-gmotd: 20
+gmotd: 20,20
 
 // Follow a player (including warping to them)
-follow: 20
+follow: 20,20
 
 // Sends a request to all connected GMs (via the gm whisper system)
-request: 20
+request: 20,20
 
 // Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
-kick: 20
+kick: 20,20
 
 // Changes your appearance.
-model: 20
+model: 20,20
 
 // To get a peco to (un)ride (2 same commands).
-mountpeco: 20
-mount: 20
+mountpeco: 20,20
+mount: 20,20
 
 // Returns list of logged in characters with their position (2 same commands).
-who: 20
-whois: 20
+who: 20,20
+whois: 20,20
 
 // Returns list of logged in characters with their job.
-who2: 20
+who2: 20,20
 
 // Returns list of logged in characters with their party/guild.
-who3: 20
+who3: 20,20
 
 // Returns list of logged in characters with their position in a specifical map.
-whomap: 20
+whomap: 20,20
 
 // Returns list of logged in characters with their job in a specifical map.
-whomap2: 20
+whomap2: 20,20
 
 // Returns list of logged in characters with their party/guild in a specifical map.
-whomap3: 20
+whomap3: 20,20
 
 // Displays GMs online. For those who are higher GM level than yourself,
 // only the name is shown, for the rest, it displays the same info of
 // @who+@who2+who3
-whogm: 20
+whogm: 20,20
 
 // Change your appearence to other players to a mob.
-disguise: 20
+disguise: 20,20
 
 // Restore your normal appearance.
-undisguise: 20
+undisguise: 20,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
+me: 20,20
 
 // Changes your name to your choice temporarily.
-fakename: 20
+fakename: 20,20
 
 // Changes your size.
-size: 20
+size: 20,20
 
 // Can command what other npcs (by name) can say.
-npctalk: 20
+npctalk: 20,20
 
 //--------------------
 // 40: Sub-GM commands
 
 // Broadcast to the whole server. Using (1 command + /nb, /b).
-broadcast: 40
+broadcast: 40,40
 
 // Broadcast to the map you are on (1 command + /lb, /nlb).
-localbroadcast: 40
+localbroadcast: 40,40
 
 // Broadcast (with or without name)
-kami: 40
+kami: 40,40
 // Same as kami but with blue color
-kamib: 40
+kamib: 40,40
 // Same as kami but you can choose the color (uses different packet)
-kamic: 40
+kamic: 40,40
 
 // Enables GvG on a map (2 same commands).
-gvgon: 40
-gpvpon: 40
+gvgon: 40,40
+gpvpon: 40,40
 
 // Turns GvG (Guild vs. Guild) off on a map (2 same commands).
-gvgoff: 40
-gpvpoff: 40
+gvgoff: 40,40
+gpvpoff: 40,40
 
 // Activate/Deactivate kill steal protection on a map
-allowks: 40
+allowks: 40,40
 
 // Modifies your HP/SP.
-heal: 40
+heal: 40,40
 
 // GM Hide (total invisibility to characters and monsters) (1 command + /hide).
-hide: 40
+hide: 40,40
 
 // Changes your job to one you specify (2 same commands).
-job: 40
-jobchange: 40
+job: 40,40
+jobchange: 40,40
 
 // Enables you to to jump randomly on a map (that you are already on).
-jump: 40
+jump: 40,40
 
 // Warps you to your last save point (2 same commands).
-load: 40
-return: 40
+load: 40,40
+return: 40,40
 
 // Warps you to a specific npc
-tonpc: 40
+tonpc: 40,40
 
 // Saves a warp point.
-memo: 40
+memo: 40,40
 
 // Set your character display options. (Visual effects of your character)
-option: 40
+option: 40,40
 
 // Sets the level of intemecy of your pet.
-petfriendly: 40
+petfriendly: 40,40
 
 // Sets hunger level of your pet.
-pethungry: 40
+pethungry: 40,40
 
 // Turns PvP (Person vs. Person) off on a map.
-pvpoff: 40
+pvpoff: 40,40
 
 // Enables PvP on a map.
-pvpon: 40
+pvpon: 40,40
 
 // Permanently adds/removes a quest skill
-questskill: 40
-lostskill: 40
+questskill: 40,40
+lostskill: 40,40
 
 // Sets the speed you can walk/attack at. Default is 150.
-speed: 40
+speed: 40,40
 
 // Summons spirit spheres around you.
-spiritball: 40
+spiritball: 40,40
 
 // Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
-mapmove: 40 // (also /mm or /mapmove)
-rura: 40
-warp: 40
+mapmove: 40,40 // (also /mm or /mapmove)
+rura: 40,40
+warp: 40,40
 
 // Changes GM clothes color (2 same commands)
-dye: 40
-ccolor: 40
+dye: 40,40
+ccolor: 40,40
 
 // Changes GM hair style (2 same commands)
-hairstyle: 40
-hstyle: 40
+hairstyle: 40,40
+hstyle: 40,40
 
 // Changes GM hair color (2 same commands)
-haircolor: 40
-hcolor: 40
+haircolor: 40,40
+hcolor: 40,40
 
 // Deletes all your items.
-itemreset: 40
+itemreset: 40,40
 
 // Does a skill/stat reset.
-reset: 40
+reset: 40,40
 
 // Displays distribution of players on the server per map (% on each map which has players)
-users: 40
+users: 40,40
 
 // Deletes floor items in your range of sight
-cleanmap: 40
+cleanmap: 40,40
 
 // Kill all monsters in map (without drops)
-killmonster2: 40
+killmonster2: 40,40
 
 // Sets your spawn point (aka save point).
-save: 40
+save: 40,40
 
 // Do some visual effect on your character
-effect: 40
+effect: 40,40
 
 // Do some visual effect on your character (misceffect)
-misceffect: 40
+misceffect: 40,40
 
 // GM's magnifier
-identify: 40
+identify: 40,40
 
 // Drop all your items
-dropall: 40
+dropall: 40,40
 
 // Store all your items
-storeall: 40
+storeall: 40,40
 
 // Allow other players to hit you out of PvP
-killable: 40
+killable: 40,40
 
 // Look up a skill by name
-skillid: 40
+skillid: 40,40
 
 // Use a skill by id
-useskill: 40
+useskill: 40,40
 
 // What skills are required to get this skill
-skilltree: 40
+skilltree: 40,40
 
 // Marriage commands
-marry: 40
-divorce: 40
+marry: 40,40
+divorce: 40,40
 
 // Adopt a novice into a family
-adopt: 40
+adopt: 40,40
 
 // Play a Sound!
-sound: 40
+sound: 40,40
 
 //---------------------
 // 50: Sub-GM+ commands
 
 // Creates a new guild, with you as the guildmaster.
-guild: 50
+guild: 50,50
 
 // Brings up your guild storage wherever you are.
-gstorage: 50
+gstorage: 50,50
 
 // Spawns a monster, and a certain amount (2 same commands + /monster).
-monster: 50
-spawn: 50
+monster: 50,50
+spawn: 50,50
 
 // Spawns a smaller sized version of a monster.
-monstersmall: 50
+monstersmall: 50,50
 
 // Spawns a larger sized version of a monster.
-monsterbig: 50
+monsterbig: 50,50
 
 // Spawns mobs that treat you as their master (they disappear after some time)
-summon: 50
+summon: 50,50
 
 // It will spawn a supportive clone of the given player.
-clone: 50
+clone: 50,50
 
 // It will spawn a supportive clone of the given player that follows the creator around.
-slaveclone: 50
+slaveclone: 50,50
 
 // It will spawn an aggresive clone of the given player.
-evilclone: 50
+evilclone: 50,50
 
 
 //----------------
 // 60: GM commands
 
 // Add or Remove Cash/Kafra points to yourself
-cash: 60
-points: 60
+cash: 60,60
+points: 60,60
 
 // Starts Guild Wars
-agitstart: 60
+agitstart: 60,60
 
 // Ends Guild Wars
-agitend: 60
+agitend: 60,60
 
 // Resurects yourself.
-alive: 60
+alive: 60,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
+blvl: 60,60
+lvup: 60,60
+blevel: 60,60
+baselvl: 60,60
+baselvup: 60,60
+baselevel: 60,60
+baselvlup: 60,60
 
 // Raises your job level (6 same commands).
-jlvl: 60
-jlevel: 60
-joblvl: 60
-joblvup: 60
-joblevel: 60
-joblvlup: 60
+jlvl: 60,60
+jlevel: 60,60
+joblvl: 60,60
+joblvup: 60,60
+joblevel: 60,60
+joblvlup: 60,60
 
 // Changes the sex of yourself
-changesex: 60
+changesex: 60,60
 
 // Levels your guild to specified level (2 same commands).
-glvl: 60
-glevel: 60
-guildlvl: 60
-guildlvup: 60
-guildlevel: 60
-guildlvlup: 60
+glvl: 60,60
+glevel: 60,60
+guildlvl: 60,60
+guildlvup: 60,60
+guildlevel: 60,60
+guildlvlup: 60,60
 
 // Find an itemID based on item name
-idsearch: 60
+idsearch: 60,60
 
 // Creates an item of your choosing, either Item ID or Name (1 command + /item).
-item: 60
+item: 60,60
 
 // Creates a complet item (card, etc...) of your choosing, either Item ID or Name.
-item2: 60
+item2: 60,60
 
 // Kill another character without hitting them.
-kill: 60
+kill: 60,60
 
 // Kill all monsters in map (with drops)
-killmonster: 60
+killmonster: 60,60
 
 // Creates yourself a pet egg.
-makeegg: 60
+makeegg: 60,60
 
 // Hatches an egg
-hatch: 60
+hatch: 60,60
 
 // Instantly kills player whose name is entered and deals insane damage to everything around
-nuke: 60
+nuke: 60,60
 
 // Enable hitting a player even when not in PvP
-killer: 60
+killer: 60,60
 
 // Creates weapon of desired element.
-produce: 60
+produce: 60,60
 
 // Warps a character to you (1 command + /recall).
-recall: 60
+recall: 60,60
 
 // Refines all weapons in your items list.
-refine: 60
+refine: 60,60
 
 // Will repair all broken items in inventory.
-repairall: 60
+repairall: 60,60
 
 // Change Status of your character
-str: 60
-agi: 60
-vit: 60
-int: 60
-dex: 60
-luk: 60
+str: 60,60
+agi: 60,60
+vit: 60,60
+int: 60,60
+dex: 60,60
+luk: 60,60
 
 // Gets all skills (4 same commands)
-allskill: 60
-allskills: 60
-skillall: 60
-skillsall: 60
+allskill: 60,60
+allskills: 60,60
+skillall: 60,60
+skillsall: 60,60
 
 // Sets GM stats to maximum (4 same commands)
-statall: 60
-statsall: 60
-allstats: 60
-allstat: 60
+statall: 60,60
+statsall: 60,60
+allstats: 60,60
+allstat: 60,60
 
 // Gives you job points.
-stpoint: 60
+stpoint: 60,60
 
 // Gives you skill points of desired amount.
-skpoint: 60
+skpoint: 60,60
 
 // Warps all online character of a guild to you. (at least one member of that guild must be on.)
-guildrecall: 60
+guildrecall: 60,60
 
 // Warps all online character of a party to you. (at least one party member must be online.)
-partyrecall: 60
+partyrecall: 60,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
+guildspy: 60,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
+partyspy: 60,60
 
 // Gives you money (zeny) of desired amount.
-zeny: 60
+zeny: 60,60
 
 // To block definitively a player (2 same commands)
-block: 60
-charblock: 60
+block: 60,60
+charblock: 60,60
 
 // To unblock a player (2 same commands)
-unblock: 60
-charunblock: 60
+unblock: 60,60
+charunblock: 60,60
 
 // To ban a player for a limited time (4 same commands)
-ban: 60
-banish: 60
-charban: 60
-charbanish: 60
+ban: 60,60
+banish: 60,60
+charban: 60,60
+charbanish: 60,60
 
 // To unban a player (4 same commands)
-unban: 60
-unbanish: 60
-charunban: 60
-charunbanish: 60
+unban: 60,60
+unbanish: 60,60
+charunban: 60,60
+charunbanish: 60,60
 
 // To send specified character in jails
-jail: 60
+jail: 60,60
 
 // To discharge a prisoner (2 same commands)
-unjail: 60
-discharge: 60
+unjail: 60,60
+discharge: 60,60
 
 // Timed jailing
-jailfor: 60
+jailfor: 60,60
 
 // Create a static warp portal that lasts until the next reboot
-addwarp: 60
+addwarp: 60,60
 
 // Open a trade window with any player
-trade: 60
+trade: 60,60
 
 // Changes the player's appearance (headgear)
-changelook: 60
+changelook: 60,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
+hlvl: 60,60
+hlevel: 60,60
+homlvl: 60,60
+homlvup: 60,60
+homlevel: 60,60
+homevolve: 60,60
+homevolution: 60,60
+makehomun: 60,60
+homfriendly: 60,60
+homhungry: 60,60
 
 // Re-calculates stats, as if the homun was sent back to level 1 and re-leveled
-homshuffle: 60
+homshuffle: 60,60
 
 //----------------------
 // 80: GM Chief commands
 
 // Set the map you are on to day.
-day: 80
+day: 80,80
 
 // Kills everyone on the server.
-doom: 80
+doom: 80,80
 
 // Kills everyone on the map you are on.
-doommap: 80
+doommap: 80,80
 
 // Set the map you are currently on to night.
-night: 80
+night: 80,80
 
 // Recalls Everyone To Your Coordinates
-recallall: 80
+recallall: 80,80
 
 // Revives all players on the map.
-raisemap: 80
+raisemap: 80,80
 
 // Revives all players on the server.
-raise: 80
+raise: 80,80
 
 // Hides a NPC.
-hidenpc: 80
+hidenpc: 80,80
 
 // Unhides a NPC.
-shownpc: 80
+shownpc: 80,80
 
 // Loads a Script
-loadnpc: 80
+loadnpc: 80,80
 
 // Unloads a NPC
-unloadnpc: 80
+unloadnpc: 80,80
 
 // Move a NPC
-npcmove: 80
+npcmove: 80,80
 
 // turn skills on for a map
-skillon: 80
+skillon: 80,80
 
 // turn skills off for a map
-skilloff: 80
+skilloff: 80,80
 
 // Mute a player (prevents talking, usage of skills and commands)
-mute: 80
+mute: 80,80
 
 // Unmute a player
-unmute: 80
+unmute: 80,80
 
 //---------------------------
 // 99: Administrator commands
 
 // Disconnect all users from the server
-kickall: 99
+kickall: 99,99
 
 // Closes Map-Server
-mapexit: 99
+mapexit: 99,99
 
 // Used for testing packet sends from the client (debug function)
-send: 99
+send: 99,99
 
 // Give information about terrain/area (debug function)
-gat: 99
+gat: 99,99
 
 // Displays a status change without really applying it (debug function)
-displaystatus: 99
+displaystatus: 99,99
 
 // Displays the animation of a skill without really using it (debug function)
-displayskill: 99
+displayskill: 99,99
 
 // Shows information about the map
-mapinfo: 99
+mapinfo: 99,99
 
 // Set Map Flags (WIP)
-mapflag: 99
+mapflag: 99,99
 
 // Re-load item database (admin command)
-reloaditemdb: 99
+reloaditemdb: 99,99
 
 // Re-load monsters database (admin command)
-reloadmobdb: 99
+reloadmobdb: 99,99
 
 // Re-load skills database (admin command)
-reloadskilldb: 99
+reloadskilldb: 99,99
 
 // Re-load scripts (admin command)
-reloadscript: 99
+reloadscript: 99,99
 
 // Change a battle_config flag without rebooting server
-setbattleflag: 99
+setbattleflag: 99,99
 
 // Re-load gm command config (admin command)
-reloadatcommand: 99
+reloadatcommand: 99,99
 
 // Re-load battle config (admin command)
 // Note that some player config settings won't take effect until relog
 // (display exp, display zeny, display skill delay fail, ...)
-reloadbattleconf: 99
+reloadbattleconf: 99,99
 
 // Re-load status database (admin command)
-reloadstatusdb: 99
+reloadstatusdb: 99,99
 
 // Re-load player info database (admin command)
-reloadpcdb: 99
+reloadpcdb: 99,99
 
 // Re-load the Message of the Day (admin command)
-reloadmotd: 99
+reloadmotd: 99,99
 
 // Changes the GM level of another character
 // (lasts until reboot, or gm list reload)
-adjgmlvl: 99
+adjgmlvl: 99,99
 
 // Changes the required GM level of an @ command
 // (effect lasts until restart or command reload)
-adjcmdlvl: 99
+adjcmdlvl: 99,99
 
 // [Un]Disguise All Players (admin command)
-disguiseall: 99
-undisguiseall: 99
+disguiseall: 99,99
+undisguiseall: 99,99
 
 // Mutes every player on screen (admin command)
-mutearea: 99
-stfu: 99
+mutearea: 99,99
+stfu: 99,99
 
 // Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)
-monsterignore: 99
-battleignore: 99
+monsterignore: 99,99
+battleignore: 99,99
 
 //---------------------------------------------------------------
 // 99: Weather effects
 
-snow: 99
+snow: 99,99
 
-clouds: 99
+clouds: 99,99
 
-clouds2: 99
+clouds2: 99,99
 
-fog: 99
+fog: 99,99
 
-fireworks: 99
+fireworks: 99,99
 
-sakura: 99
+sakura: 99,99
 
 leaves:99
 
 // Stop all weather effects
-clearweather: 99
+clearweather: 99,99
 
 //---------------------------------------------------------------
 // 100: Disabled commands
diff --git a/conf/charcommand_athena.conf b/conf/charcommand_athena.conf
deleted file mode 100644
index 4b7bf672f..000000000
--- a/conf/charcommand_athena.conf
+++ /dev/null
@@ -1,275 +0,0 @@
-//--------------------------------------------------------------
-// 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),
-// '%', '$' (party/guild chat speaking) and '/' (standard client commands).
-// The symbol must also be different from from the GM atcommand symbol.
-command_symbol: #
-
-
-//--------------------------
-// 0: normal player commands
-// None for security purposes.
-
-//-------------------------
-// 1: Super player commands
-
-//---------------------------
-// 10: Super player+ commands
-
-//----------------------
-// 20: Mediator commands
-
-// Displays helpfile in eAthena base directory
-help: 20
-
-//--------------------
-// 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
-
-//---------------------
-// 50: Sub-GM+ commands
-
-// 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
-
-// Give or remove a peco from a character
-mount: 50
-mountpeco: 50
-
-// Make another character's pet friendly/not
-petfriendly: 50
-
-// Rename another character's pet
-petrename: 50
-
-// Change a character's size
-size: 50
-
-//----------------
-// 60: GM commands
-
-// Resurrects a dead character
-alive: 60
-revive: 60
-
-// Add or removes cash/kafra points to a character
-cash: 60
-points: 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
-
-// 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
-
-// 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
-
-// Change another character's job level (3 same commands)
-jlvl: 60
-jlevel: 60
-joblvl: 60
-joblevel: 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
-
-// Make a character immune to monsters
-monsterignore: 60
-
-// Apply a certain option to another character
-option: 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
-
-// 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
-
-//----------------------
-// 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
diff --git a/conf/import-tmpl/charcommand_conf.txt b/conf/import-tmpl/charcommand_conf.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/conf/import-tmpl/charcommand_conf.txt
+++ /dev/null