- Added `libconfig` (configuration file library: http://www.hyperrealm.com/libconfig/):

   - Updated VS9/10 project files.
   - Updated `configure` & `Makefile`s.
 - New GM, Commands & Permissions system:
   - '''This is a backwards compatibility breaking update''', please read tid:58877
   - Replaced GM levels with Player Groups.
   - Commands permissions & other privileges now depend on group, not GM level.
 - `@help` command improvements: requires "commandname" param and shows more detailed info about commands.
 - Modified GM whisper system to deliver messages basing on permissions, not GM level.
 - Remote trade request is now possible only if player is allowed to use `@trade` command as well.
 - Added a proper permission to use `/changemaptype` command.
 - `clif_displaymessage` is now capable of displaying multiline messages.
 - All `ACMD_FUNC`s are static now, and the only way to invoke them is with `is_atcommand()`; all client commands (starting with `/`) are now translated into corresponding atcommands (with exception of `/kick` used on monster, as there is no atcommand to kill single monster).
 - Removed nonsense "bot check" triggering when player blocked (`/ex`) Server.
 - Merged `@monster`, `@monsterbig` and `@monstersmall`.
 - Improved flow of atcommand execution to avoid revealing info about online players or existing commands to non-privileged players.
 - Merged `atcommand` and `charcommand` script functions (`charcommand` is aliased to `atcommand`).
   - Fixed `atcommand` script function reading unknown memory area (possible access violation).

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

1 files changed, 60 insertions, 753 deletions

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