Update config for new code

This config will only work with tmwa v13.9.12 or higher.
If you need an old version, please stay on the 'unsupported' branch.

16 files changed, 220 insertions, 1105 deletions

diff --git a/login/conf/ladmin_athena.conf b/login/conf/ladmin_athena.conf
index 2a91a35b..651826c5 100644
--- a/login/conf/ladmin_athena.conf
+++ b/login/conf/ladmin_athena.conf
@@ -1,28 +1,7 @@
 // Athena Ladmin configuration file.
- 
-// Encoding type of the password
-// 0: not encoded
-// 1: key+password
-// 2: password+key
-passenc: 2
 
-// Language of ladmin
-// F: Français
-// E: English (default)
-defaultlanguage: E
-
-// Log Filename. All operations done by the software are logged in this file.
+// Log for all actions.
 ladmin_log_filename: log/ladmin.log
 
-// Indicate how to display date in logs, to players, etc.
-// 0: 31-12-2004 23:59:59
-// 1: 12-31-2004 23:59:59
-// 2: 2004-31-12 23:59:59
-// 3: 2004-12-31 23:59:59 (default)
-date_format: 3
-
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
 // local settings for this server in this file
 import: conf/ladmin_local.conf
diff --git a/login/conf/ladmin_local.conf.example b/login/conf/ladmin_local.conf.example
index a0706b2b..aaef5fb3 100644
--- a/login/conf/ladmin_local.conf.example
+++ b/login/conf/ladmin_local.conf.example
@@ -1,10 +1,11 @@
 // Athena Ladmin local configuration file.
 
 // Login Server IP
-login_ip:127.0.0.1
+login_ip: 127.0.0.1
 // Login Server Port
 login_port: 6901
 
 // Administrative password, used to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
+// NOTICE: You should change its value for security.
+// This is also in login_local.conf
 admin_pass: admin
diff --git a/login/conf/lan_support.conf b/login/conf/lan_support.conf
index 2f49419c..73d5362b 100644
--- a/login/conf/lan_support.conf
+++ b/login/conf/lan_support.conf
@@ -1,4 +1,4 @@
-// Note: this file is used by both the char-server and the login-server
+// Note: used by the login-server; another copy is used by the char-server
 
 // This file is necessary to connect to your server locally:
 // by using it's internal (LAN) IP address, or localhost (127.0.0.1)
@@ -26,33 +26,20 @@
 // on different machines (unless you do some internal port-forwarding)
 
 
-// the IP LAN players should use to connect to the char-server
+// the IP that LAN players should use to connect to the char-server
 lan_char_ip: 127.0.0.1
-// lan_char_ip: 192.168.1.100
-
-// the IP that LAN players should use to connect to the map-server
-lan_map_ip: 127.0.0.1
-// lan_map_ip: 192.168.1.100
+//lan_char_ip: 192.168.1.100
 
 // put here the Subnet mask of your LAN
 // see output of ifconfig (Linux) or ipconfig (Windows)
-subnet: 127.0.0.1
-subnetmask: 255.255.255.255
-// subnetmask: 255.0.0.0
-
+lan_subnet: 127.0.0.1
+//lan_subnet: 127.0.0.1/255.0.0.0
 
 // Common subnets (if you have a subnet that is not one of these,
 // you probably don't need to be reading this)
-
-// subnet: 10.0.0.0
-// subnetmask: 255.0.0.0
-
-// subnet: 172.16.0.0
-// subnetmask: 255.240.0.0
-
-// subnet: 192.168.0.0
-// subnetmask: 255.255.0.0
+//lan_subnet: 10.0.0.0/8
+//lan_subnet: 172.16.0.0/12
+//lan_subnet: 192.168.0.0/16
 
 // Many home routers only use a portion:
-// subnet: 192.168.1.0
-// subnetmask: 255.255.255.0
+//lan_subnet: 192.168.1.0/255.255.255.0
diff --git a/login/conf/login_athena.conf b/login/conf/login_athena.conf
index 6f393c92..7e59d192 100644
--- a/login/conf/login_athena.conf
+++ b/login/conf/login_athena.conf
@@ -1,17 +1,7 @@
 // Athena Login Server configuration file.
-// Translated by Peter Kieser <pfak@telus.net>
- 
-// Level of new GM created with @gm command. (default: 60)
-// If you set to 0, you disable creation of new GM with @gm.
-// To be able to create a gm with @gm, you must:
-// - give a level to this value (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100)
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command
-level_new_gm: 60
-
-// Can you make new accounts on the server? (1 for Yes, 0 for no)
-new_account: 1
+
+// Can you make new accounts on the server?
+new_account: yes
 
 // Account flatfile database, stores account information.
 account_filename: save/account.txt
@@ -19,98 +9,89 @@ account_filename: save/account.txt
 // What account AIDs have GM privs, and what level?
 gm_account_filename: save/gm_account.txt
 
-// Timer to check if GM_account file has been changed and reload GM account automaticaly
-// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
+// Time, in seconds, to poll the gm file for changes.
+// Please use ladmin instead of editing the file manually.
 gm_account_filename_check_timer: 15
 
-// Log Filename. All operations received by the server are logged in this file.
+// General log.
 login_log_filename: log/login.log
 
-// Name of the file of that logs the unknown packets (for debug or hack check)
+// Log for unknown packets.
 login_log_unknown_packets_filename: log/login_unknown_packets.log
 
-// Indicate if the unknown packets are saved or not
-//(the unknown packets coming from the char-server or ladministration does not relate to, which is always saved)
-// Be careful: if you receive an attack, your hard disk can cause lag...
-// So, active this option with a speed hard disk or for debug only.
-save_unknown_packets: 0
+// Are unknown packets from the client saved?
+// (unknown internal packets are always saved)
+// This is not nice to your hard drive.
+save_unknown_packets: no
 
-// Indicate if you want display the parse of the packets received in a normal connection
-// It's useful for debug. Possible values: 0: no (default), 1: yes
-display_parse_login: 0
+// Print basic header information about incoming client packets.
+// Also print a little more about client or char auth attempts.
+display_parse_login: no
 
-// Indicate if you want display the parse of the packets received in administration connection
-// It's useful for debug. Possible values: 0: no (default), 1: yes
-display_parse_admin: 0
+// Print basic header information about incoming ladmin packets.
+display_parse_admin: no
 
-// Indicate if you want display the parse of the packets received from a char-server
-// It's useful for debug. Possible values: 0: no (default), 1: yes (without packet 0x2714), 2: all packets
+// Print basic header information about incoming char-server packets.
+// 0: no packets
+// 1: all packets except 0x2714
+// 2: all packets, including 0x2714
 display_parse_fromchar: 0
 
-// Indicate how to display date in logs, to players, etc.
-// 0: 31-12-2004 23:59:59
-// 1: 12-31-2004 23:59:59
-// 2: 2004-31-12 23:59:59
-// 3: 2004-12-31 23:59:59 (default)
-date_format: 3
-
-// Indicate the minimum GM level of player that the server accepts to connection.
-// 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x
+// Accounts must have this GM level to log in.
+// 0: all players, 1-99: GM level at least this.
 min_level_to_connect: 0
 
-// Give possibility to adjust (ladmin command: timeadd) the time of an unlimited account.
-// If set to on/1/yes..., the adjustment is be done from actual time to set the final time of the account.
-// If set to no/0/no..., the adjustment can not be done on an unlimited account. You must set (ladmin command: timeset) a final time before to adjust (ladmin command: timeadd)
+// Behavior of relative time adjustments for unlimited accounts.
+// If true, ladmin timeadd will first set the limit to right now.
+// If false, ladmin timeadd will do nothing on unlimited accounts.
+// In either case, you can use ladmin timeset.
 add_to_unlimited_account: off
 
-// Starting additional sec from now for the limited time at creation of account
-// -1: new account are created with UNlimited time (default value)
-// 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)
+// Time, in seconds, that a new account has before it expires.
+// Set to -1 for unlimited time.
+// Use of this setting is not condoned by The Mana World.
 start_limited_time: -1
 
-// It's to check IP of a player between login-server and char-server (part of anti-hacking system)
-// If player doesn't have same IP, connection is refused.
-// Set to 0/off/no to not check IP of player.
-// Set to 1/on/yes if you want to check (default)
-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
-//       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
+// Check that a player has the same IP when switching from login to char.
+// To use this, your lan_support.conf files MUST be correct.
+// Disabling this setting is not supported.
 check_ip_flag: yes
 
-// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
-// (how to use 'allow' and 'deny' information)
-//order: allow,deny
-
-// Indicate the IP that the server accept.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
+// How the IP allow/deny lists (below) are interpreted.
+// Possible values:
+//  "deny, allow" (default):
+//      if in deny list, deny
+//      if not in deny list, accept
+//  "allow, deny"
+//      if in allow list, accept
+//      if not in allow list, deny
+//  "mutual-failure"
+//      if in deny list, deny
+//      if not in deny list, if in allow list, allow
+//      if in no list, deny
+// In any case, if both lists are empty, all IPs are allowed.
+// In future, all this will go away: instead the latest setting will apply.
+// NOTE: in any case, it's probably better to use iptables:
+//   - iptables happens before the connection is established
+//   - iptables can be changed without restarting the login-server
+// Note: internally this is called 'access_order'.
+order: deny, allow
+
+// List of IPs (or prefixes or masks) on the allow list.
+// The meaning is determined by the 'order' setting.
+// Note: internally this is called 'access_allow'.
 //allow: all
 
-// Indicate the IP that the server refuse.
-// Add as many IP's as you wish, as long as you put deny: before it.
+// List of IPs (or prefixes or masks) on the deny list.
+// The meaning is determined by the 'order' setting.
+// Note: internally this is called 'access_deny'.
 //deny: 123.123.123.123
 //deny: 234.234.234.234
 
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
-//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
-use_MD5_passwords: no
-
-//Ban features: read readme for more info if you dont know this.
-ipban: 1
-dynamic_pass_failure_ban: 1
-dynamic_pass_failure_ban_time: 5
-dynamic_pass_failure_ban_how_many: 3
-dynamic_pass_failure_ban_how_long: 60
-dynamic_account_ban: 1
-dynamic_account_ban_class: 0
-
-// Anti-freeze system enable
-anti_freeze_enable: 0
-// Anti-freeze system interval (in seconds)
+// If true, unresponsive char-servers will be kicked.
+anti_freeze_enable: no
+// Interval, in seconds, for one step of the antifreeze timer.
+// Five of these must pass before the kick will happen.
 anti_freeze_interval: 15
 
 // local settings for this server in this file
diff --git a/login/conf/login_local.conf.example b/login/conf/login_local.conf.example
index 37c7713f..3ef8f3b6 100644
--- a/login/conf/login_local.conf.example
+++ b/login/conf/login_local.conf.example
@@ -1,27 +1,42 @@
 // Athena Login Server local configuration file.
- 
-// Port to bind Login Server to (always binds to all IP addresses)
+
+// Port to bind Login Server to (always binds to all IPv4 addresses)
 login_port: 6901
 
-// Whether remote administration is enabled or disabled (1 for enabled, 0 for disabled)
-admin_state: 1
+// Whether remote administration is enabled or disabled
+admin_state: yes
 
-// Administrative password, used by ladmin (perl software) to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
+// Administrative password, used by ladmin to connect remotely to server.
+// NOTICE: You should change its value for security.
+// This is also in ladmin_local.conf
 admin_pass: admin
 
-// Indicate the IP that the server accepts for remote administration.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
-ladminallowip: all
+// List of IPs that the server accepts for remote administration.
+// This can be repeated, with one entry per line.
+// Each line can be an IP prefix (xxx.xxx.), a full IP, or a network/mask.
+// Particularly, it *cannot* be a hostname.
+// The special value 'all' allows all IPs.
+// The special value 'clear' empties the list (useful for includes).
+// Note: internally this is called 'access_ladmin'.
+//ladminallowip: all
+//ladminallowip: clear
+ladminallowip: 127.0.0.1
 
-// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
+// Gamemaster password, used with the @gm command to obtain GM commands
 // NOTICE: You should also change this one.
 gm_pass: gm
 
+// GM level granted to people using @gm (with the correct password).
+// Builtin default is 60; setting it to 0 will disable the command.
+// To work, @gm also needs to be level 0 in atcommand_local.conf,
+// and atcommand_gm_only needs to be off in battle_local.conf
+level_new_gm: 0
+
 // Update host
-// Tells the client that an alternative updatehost is available if the client
-// supports this. If left out nothing will be sent. max length 127.
+// If not empty, send address for client to download data.
+// This must contain news.txt and resources.xml
 update_host: http://updates.themanaworld.org/
+
+// Which world should appear first to the players.
+// see server_name in world/conf/char_local.conf
+main_server: The Mana World
diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf
index 38b494e6..d71f90f4 100644
--- a/world/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -1,83 +1,59 @@
 // Athena Character configuration file.
 
-// Option to force a player to create an e-mail.
-// If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow:
-// - Create at least 1 character
-// - Select 1 character
-// - Select DEL to enter his/her e-mail. (if OK is choosen, client says to the player: 'invalid e-mail')
-// - If his/her e-mail is correct, the player enter in the game (an e-mail is saved definitively).
-// - If his/her e-mail is incorrect, he/she have 'incorrect e-mail' and must select again DEL.
-// - After entering in the game (when the player arrives on a map), DEL and SEL/OK button work normaly for all next connections.
-// Resume: If a player have "incorrect/invalid e-mail" when he/she click on 'OK' button,
-//         the player must click 'DEL' button and register his/her NEW e-mail to enter in the game
-// So, default is 0, because administrator must explain to their players before to activate this option.
-email_creation: 0
-
-// Is Character server in maintainence mode?
-char_maintenance: 0
-
-// Enable or disable creation of new characters.
-char_new: 0
-
-// Maximum users able to connect to the server. Set to 0 for unlimited.
+// Maximum number of user connections permitted on this world.
+// 0 means unlimited, but the current network code has a hard-coded limit
+// of just under 1024 per server (but a world may be many servers).
 max_connect_user: 0
 
-// It's to check IP of a player between char-server and other servers (part of anti-hacking system)
-// If player doesn't have same IP, connection is refused.
-// Set to 0/off/no to not check IP of player.
-// Set to 1/on/yes if you want to check (default)
-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
+// Check that a player has the same IP when switching from char to map.
+// To use this, your lan_support.conf files MUST be correct.
+// Disabling this is not supported.
 check_ip_flag: yes
 
-// How often should the server save all files? (In seconds)
+// Interval, in seconds, between saves of the flatfile databases.
 autosave_time: 300
 
 // Character server flatfile database
 char_txt: save/athena.txt
 
-// Choose to create or not backup file (yes/no, 0/1, etc...)
-// default is 'no', because backup file take time for nothing. Actually, there is no problem on characters file creation and save.
-backup_txt_flag: no
-
-// Character server flatfile database (backup)
-backup_txt: save/athena_backup.txt
-
-// Start point, Map name followed by coordinates (x,y)
+// Location where new characters first appear
+// Format: mapname,x,y. There must be no spaces.
 start_point: 042-2.gat,26,26
 
-// Starting weapon for new characters (deprecated)
-start_weapon: 0
-
-// Starting armor for new characters (deprecated)
-start_armor: 0
-
-// Starting zeny for new characters (deprecated)
-start_zeny: 0
-
-// Name used for unknown characters
-unknown_char_name: Unknown
-
 // Log Filename
 char_log_filename: log/char.log
 
-// Allow or not identical name for characters but with a different case (upper/lower):
-// example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
-name_ignoring_case: 0
-
-// Manage possible letters/symbol in the name of charater. Control character (0x00-0x1f) are never accepted. Possible values are:
-// 0: no restriction (default)
-// 1: only letters/symbols in 'char_name_letters' option.
-// 2: Letters/symbols in 'char_name_letters' option are forbidden. All others are possibles.
+// Manage possible letters/symbol in the name of charater.
+// Control character (0x00-0x1f) are never accepted. Possible values are:
+// 0: no restriction (builtin default, but please don't use)
+// 1: only letters/symbols in 'char_name_letters' option
+// 2: Letters/symbols in 'char_name_letters' option are forbidden.
+//      All others are possible (please don't use this).
+// Setting this to anything but 1 is not recommended.
 char_name_option: 1
 
-// Set the letters/symbols that you want use with the 'char_name_option' option.
-// Note: add 'space' between 2 others letters/symbols.
-// default: void.
-// char_name_letters: [ ] { } , . | - # @ ! ~ ` ; : " " ? / \ = + < >
+// Set the letters/symbols that you want use with 'char_name_option'.
+// This is a cumulative option; specify nothing to reset it.
+// Note: if you want to add a space, it can't be at the beginning or end.
+// default: empty.
 // Note: some characters are problematic:
-// : is used as a separator
-char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) ; ' < > , . ? / ~ ` | \
+// " is needed for GM quoting
+// # is used for string formatting
+// / is the command prefix (but it's still allowed!)
+// : is used as a separator in script menus
+// I'm not sure why []{} are not included though
+char_name_letters:
+//char_name_letters: "#
+char_name_letters: ! $%&'()*+,-./
+char_name_letters: 0123456789
+//char_name_letters: :
+char_name_letters: ;<=>?
+char_name_letters: ABCDEFGHIJKLMNOPRSTQUVWXYZ
+//char_name_letters: []
+char_name_letters: @\^_`
+char_name_letters: abcdefghijklmnoprstquvwxyz
+//char_name_letters: {}
+char_name_letters: |~
 
 // Filename of the file which receives the online players list in text
 online_txt_filename: online.txt
@@ -85,41 +61,17 @@ online_txt_filename: online.txt
 // Filename of the file which receives the online players list, but in html version
 online_html_filename: online.html
 
-// Choose how to display online players.
-// (sorting operation with a lot of online players can take time on a slow computer)
-// 0: no sorting (default)
-// 1: by alphabetical order of their name
-// 2: by number of their zenys
-// 3: by their base level
-// 4: by their job (and job level inside the same job)
-// 5: by alphabetical order of their actual map location
-online_sorting_option: 0
-
-// Choose which columns that you want display in the online files. Do the addition of these values:
-// (if value is 0, no file is done)
-// 1: name (just the name, no function like 'GM')
-// 2: job
-// 4: levels
-// 8: map name
-// 16: mapname and coordonates
-// 32: zenys
-// 64: name (with 'GM' if the player is a GM)
-// default value: 1 (only name)
-online_display_option: 64
-
-// minimum GM level to display 'GM' when we want to display it (default: 1)
+// minimum GM level to display 'GM' when we want to display it (default: 20)
 online_gm_display_min_level: 60
 
 // refresh time (in sec) of the html file in the explorer (default 20)
 online_refresh_html: 20
 
-// Anti-freeze system enable
+// Should we kick an unresponsive map-server?
 anti_freeze_enable: 0
 // Anti-freeze system interval (in seconds)
+// 5 of these must pass before a map-server is kicked.
 anti_freeze_interval: 6
 
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
 // local settings for this server in this file
 import: conf/char_local.conf
diff --git a/world/conf/char_local.conf.example b/world/conf/char_local.conf.example
index 168b5155..4beab7c9 100644
--- a/world/conf/char_local.conf.example
+++ b/world/conf/char_local.conf.example
@@ -19,4 +19,3 @@ login_port: 6901
 char_ip:127.0.0.1
 // Character Server Port
 char_port: 6122
-
diff --git a/world/conf/inter_athena.conf b/world/conf/inter_athena.conf
index 72a88bd9..2577deae 100644
--- a/world/conf/inter_athena.conf
+++ b/world/conf/inter_athena.conf
@@ -6,26 +6,6 @@ storage_txt: save/storage.txt
 // Party flatfile database, for party names, members and other party info.
 party_txt: save/party.txt
 
-// Guild flatfile database, for guild names, members, and other guild info.
-guild_txt: save/guild.txt
-
-// Pet flatfile database, for pet names, and other pet info.
-pet_txt: save/pet.txt
-
-// Castle flatfile database, for emperium war castles, etc.
-castle_txt: save/castle.txt
-
-// Inter Log Filename
-inter_log_filename: log/inter.log
-
-// Level range for sharing within a party
+// Maximum level difference for XP sharing within a party.
+// 0 to always allow sharing.
 party_share_level: 10
-
-// The lowest GM level on your server
-lowest_gm_level: 1
-
-// How often the GM accounts will be reloaded by the map-server in minutes
-read_gm_interval: 10
-
-
-
diff --git a/world/conf/lan_support.conf b/world/conf/lan_support.conf
index 2f49419c..b3a6a57a 100644
--- a/world/conf/lan_support.conf
+++ b/world/conf/lan_support.conf
@@ -1,4 +1,4 @@
-// Note: this file is used by both the char-server and the login-server
+// Note: used by the char-server; another copy is used by the login-server
 
 // This file is necessary to connect to your server locally:
 // by using it's internal (LAN) IP address, or localhost (127.0.0.1)
@@ -26,33 +26,20 @@
 // on different machines (unless you do some internal port-forwarding)
 
 
-// the IP LAN players should use to connect to the char-server
-lan_char_ip: 127.0.0.1
-// lan_char_ip: 192.168.1.100
-
 // the IP that LAN players should use to connect to the map-server
 lan_map_ip: 127.0.0.1
 // lan_map_ip: 192.168.1.100
 
 // put here the Subnet mask of your LAN
 // see output of ifconfig (Linux) or ipconfig (Windows)
-subnet: 127.0.0.1
-subnetmask: 255.255.255.255
-// subnetmask: 255.0.0.0
-
+lan_subnet: 127.0.0.1
+//lan_subnet: 127.0.0.1/255.0.0.0
 
 // Common subnets (if you have a subnet that is not one of these,
 // you probably don't need to be reading this)
-
-// subnet: 10.0.0.0
-// subnetmask: 255.0.0.0
-
-// subnet: 172.16.0.0
-// subnetmask: 255.240.0.0
-
-// subnet: 192.168.0.0
-// subnetmask: 255.255.0.0
+//lan_subnet: 10.0.0.0/8
+//lan_subnet: 172.16.0.0/12
+//lan_subnet: 192.168.0.0/16
 
 // Many home routers only use a portion:
-// subnet: 192.168.1.0
-// subnetmask: 255.255.255.0
+//lan_subnet: 192.168.1.0/255.255.255.0
diff --git a/world/map/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf
index 07d85c30..4dfd61a6 100644
--- a/world/map/conf/atcommand_athena.conf
+++ b/world/map/conf/atcommand_athena.conf
@@ -1,520 +1,141 @@
 // Athena atcommand Configuration file.
 
-// Set here the symbol that you want to use for your commands
-// Only 1 character is get (default is '@'). 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
-command_symbol: @
-
-
-// 0: normal player commands
-
-// Displays helpfile in Athena base directory.
+// 0: normal players
 help: 0
-
-// Give server time. (6 same commands)
-time: 0
-date: 0
-server_date: 0
-serverdate: 0
-server_time: 0
 servertime: 0
-
-// 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: 0
+//gm: 100
 
-// To become GM (need password; password is set in login_athena.conf).
-// special!: only a non-GM (player with gm level 0) need to have this command.
-//           if you change the value, be sure of what you do!
-// To be able to create a gm with @gm, you must:
-// - give a level to level_new_gm (parameter of login_athena.conf) (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100) - Only level 0 can give access to this command
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command (gm_pass paramter in login_athena.conf)
-gm: 100
-
-
-//-------------------------
-// 40: "Dev"
-
-// Broadcast to all map-servers.
+// 40: developers
 broadcast: 40
-
-// Broadcast to the current map-server.
-// (Note: TMW currently only uses one map server)
-local_broadcast: 40
-
-// Instantly kills the invoker, regardless of current health.
+localbroadcast: 40
 die: 40
-
-// Locate someone on a map, returns your coordinates if the person isn't on.
 where: 40
-
-// Warp the invoker to set points in major cities.
-go: 40
-
-// Warp yourself to a person.
 goto: 40
-
-// Cause the invoker to follow a specified character, including warps. (Disabled)
-follow: 40
-
-// Disconnects a user from the server.
 kick: 40
-
-// Returns list of logged in characters with their position.
 who: 40
-
-// Returns list of logged in characters with their party/guild.
 whogroup: 40
-
-// Returns list of logged in characters with their position in a specified map.
 whomap: 40
-
-// Returns list of logged in characters with their party/guild in a specified map.
 whomapgroup: 40
-
-// Like @who, but only lists GM characters.
 whogm: 40
-
-// Send information to the invoker about the specified character's stats.
 charstats: 40
-
-// Heals the invoker to full HP/SP, regardless of previous health.
 heal: 40
-
-// Hides the invoker from monsters and most reporting functions.
-// Will not cause the invoker to be hidden from other clients in visual range.
 hide: 40
-
-// Enables you to to jump randomly on a map (where you already are).
 jump: 40
-
-// Warp the invoker to his last save point.
 return: 40
-
-// Warp the invoker to a certain map, at (x,y) coordinates.
 warp: 40
-
-// Change the GM clothes color, 2 same commands. (Disabled)
 dye: 40
 ccolor: 40
-
-// Alters the invokers hair style to the specified ID.
 hairstyle: 40
-
-// Alters the invokers hair color to the specified ID.
 haircolor: 40
-
-// Deletes all your items.
 itemreset: 40
-
-// Sets the invokers soawn/save/home point. Defaults to the current location if no coordinates are specified.
 save: 40
-
-// No effect. The sole purpose of this command is for it, and all arguments, to be implicity logged along with all arguments.
-// This and/or @t should be used to log rationale for any uncommon use of the commands.
 log: 40
 l: 40
-
-// Sends a message normally, as if it had not been preceded with @t. This serves when issuing official warnings.
-// This and/or @l should be used to log rationale for any uncommon use of the commands.
 tee: 40
 t: 40
 
-//--------------------
-// 50: Event coordinators
-
-// Causes the invoker to become invisible to other clients.
-// No other effect is taken, for instance aggressive mobs may still attack the invoker.
+// 50: event coordinators
 invisible: 50
-
-// Removes any invisible status set by the above command and immediately announces the invokers presence to all clients in range.
 visible: 50
-
-// Spawns the specified monster in the specified amount, or one monster if no amount specified.
-// These monsters act as if spawned normally but without any attached scripts on their death, such as monster points.
 spawn: 50
-
-// Summons a specified monster in the specified amount, or one monster if no amount is specified.
-// These monsters act as if spawned normally but without any attached scripts on their death, such as monster points.
 summon: 50
 
-//--------------------
-// 60: "GM"
-
-// Enable all whispers for a player.
-// Not used by TMW, which has client-side ignore lists
-inall: 60
-
-// Disable all whispers for a player.
-// Not used by TMW, which has client-side ignore lists
-exall: 60
-
-// Returns stats of all characters connected to the map server.
+// 60: game masters
 charstatsall: 60
-
-// Turns PvP off on a map.
 pvpoff: 60
-
-// Enables PvP on a map.
 pvpon: 60
-
-// Sets the speed you can walk/attack at. Default is 150.
 speed: 60
-
-// Kill all monsters in map (with drops).
 killmonster: 60
-
-// Kill all monsters in map (without drops).
 killmonster2: 60
-
-// Check which characters are online from a characters IP address.
 ipcheck: 60
-
-// Store all the invokers items.
 storeall: 60
-
-// Allow other players to hit the invoker out of PvP.
 killable: 60
-
-// Look up a skill by name.
-skillid: 60
-
-// Use a skill by ID.
-useskill: 60
-
-// Make another player killable.
 charkillable: 60
-
-// Resurrects yourself.
 alive: 60
-
-// Alters the invokers base level by the specified delta.
 blvl: 60
-
-// Alters the invokers job level by the specified delta.
 jlvl: 60
-
-// A command that removes the NOCHAT status effect from a specified character if active.
-// As there is currently no way for this status effect to be set, this has no use.
-unmute: 60
-
-// Alters the specified characters base level by the specified delta.
-charblvl: 60
-
-// Change the sex of an online player, including all characters on the account.
+charbaselvl: 60
 charchangesex: 60
-
-// Remove items from a character.
 chardelitem: 60
-
-// Alters the specified characters job level by the specified delta.
 charjlvl: 60
-
-// Give to another character status points.
 charstpoint: 60
-
-// Give to another character skill points.
 charskpoint: 60
-
-// Resets another character's stats.
 charreset: 60
-
-// Resets another character's status.
 charstreset: 60
-
-// Resets another character's skills.
 charskreset: 60
-
-// Resets a character back to when it was first created.
 charwipe: 60
-
-// Saves the respawn point of another character.
 charsave: 60
-
-// Kill another character without hitting them.
 kill: 60
-
-// Enable hitting a player even when not in PvP.
 killer: 60
-
-// Warp a character to the invoker.
 recall: 60
-
-// Revives a character and heals them.
 revive: 60
-
-// Warp another person to a certain map, at (x,y) coordinates.
 charwarp: 60
-
-// Change the stats of the invoker's character.
 str: 60
 agi: 60
 vit: 60
 int: 60
 dex: 60
 luk: 60
-
-// Get all skills.
-allskills: 60
-
-// Set GM stats to maximum.
 allstats: 60
-
-// Give to the invoker job points of the desired amount.
 stpoint: 60
-
-// Give to the invoker skill points of the desired amount.
 skpoint: 60
-
-// Blocks ab account with no expiry date.
 block: 60
-
-// Removes any block on an account.
 unblock: 60
-
-// Bans an account for the specified time, or adjusts an existing ban by the specified delta.
 ban: 60
-
-// Removes any ban on an account.
 unban: 60
-
-// Send a specified character in jail.
-// The map is hardboded in and irrelevant for TMW content.
-jail: 60
-
-// To discharge a prisoner.
-// The map is hardboded in and irrelevant for TMW content.
-unjail: 60
-
-// Drop a players possessions on the ground.
 chardropall: 60
-
-// Put a players possessions in storage.
 charstoreall: 60
-
-// Iterate over all characters connected to the map server forward.
 hugo: 60
-
-// Iterate over all characters connected to the map server backwards.
 linus: 60
 
-//----------------------
-// 80: "eA Dev"
-
-// Sets magic properties on a character.
+// 80: greater dev
 setmagic: 80
-
-// Lists magic properties on a character.
 magicinfo: 80
-
-// Sets the option bits of the invoker, specifically the opt1, opt2, and option variables. opt3 may not be set using this command.
-// Do not use this command unless you are familiar enough with the code base to know exactly what it does.
 option: 80
-
-// Gives you money of the desired amount.
 zeny: 80
-
-// Changes another character's amount of money.
 charzeny: 80
-
-// As with @option, but on a specified character.
 charoption: 80
-
-// Create a static warp portal that lasts until the next reboot.
 addwarp: 80
-
-// Set the map you are on to day.
-// Irrelevant to TMW
-day: 80
-
-// Kills everyone on the server.
 doom: 80
-
-// Kills everyone on the map you are on.
 doommap: 80
-
-// Set the map you are currently on to night.
-// Irrelevant to TMW
-night: 80
-
-// Recalls everyone to your coordinates.
 recallall: 80
-
-// Revives all players on the map.
 raisemap: 80
-
-// Revives all players on the server.
 raise: 80
-
-// Enables a NPC.
 enablenpc: 80
-
-// Disables a NPC.
 disablenpc: 80
-
-// Moves a NPC.
 npcmove: 80
-
-// Turn skills on for a map.
-skillon: 80
-
-// Turn skills off for a map.
-skilloff: 80
-
-// Lose a "quest skill"
 lostskill: 80
-
-// Find ID of an item by name.
 idsearch: 80
-
-// Creates an item of your choosing, either Item ID or Name.
 item: 80
-
-// Creates weapon of desired element.
-produce: 80
-
-// Check if all your items are in the item_db
 itemcheck: 80
 
-
-//---------------------------
-// 99: "Admin"
-
-// Drop all of the invokers items on the ground.
+// 99: server admin
 dropall: 99
-
-// Enables GvG on a map (2 same commands).
-gvgon: 99
-gpvpon: 99
-
-// Turns GvG off on a map (2 same commands).
-gvgoff: 99
-gpvpoff: 99
-
-// Enables skills.
 questskill: 99
-
-// Display your ignore list, people from which you ignore whispers.
-// Not used by TMW, which has client-side ignore lists
-ignorelist: 99
-
-// Display ignore list of a player, people from which you ignore whispers.
-// Not used by TMW, which has client-side ignore lists
-charignorelist: 99
-
-// Brings up your guild storage wherever you are.
-gstorage: 99
-
-// Do some visual effect on your character.
 effect: 99
-
-// Changes character's model.
 charmodel: 99
-
-// Starts Guild Wars.
-agitstart: 99
-
-// Ends Guild Wars.
-agitend: 99
-
-// Levels your guild to specified level.
-guildlvl: 99
-
-// Create a guild.
-guild: 99
-
-// Create a party.
 party: 99
-
-// Warps all online character of a guild to you, at least one member of that guild must be on.
-guildrecall: 99
-
-// Warps all online character of a party to you, at least one party member must be online.
 partyrecall: 99
-
-// Allows you to spy on any Guilds Guild chat, at least one member of that guild must be on.
-guildspy: 99
-
-//Allows you to spy on any party's party chat, at least one party member must be online.
 partyspy: 99
-
-// Saves a warp point.
 memo: 99
-
-// To get a peco to (un)ride for another player.
-charmountpeco: 99
-
-// Change your appearence to other players to a mob.
-disguise: 99
-
-// Restore your normal appearence.
-undisguise: 99
-
-// To change disguise of another player/GM.
-chardisguise: 99
-charundisguise: 99
-
-// Display all items of a player. (Disabled)
 charitemlist: 99
-
-// Display all items of a player's storage. (Disabled)
 charstoragelist: 99
-
-// Display all items of a player's cart. (Disabled)
 charcartlist: 99
-
-// Enables platinum skills of another player.
 charquestskill: 99
-
-// Enables lost skills of another player.
 charlostskill: 99
-
-// Changes your apperance.
 model: 99
-
-// Ride or unride a peco
-// Irrelevant to TMW
-mountpeco: 99
-
-// Broadcast, with or without name.
 kami: 99
-kamib: 99
-
-// Disconnect all users from the server.
 kickall: 99
-
-// Closes map-server.
 mapexit: 99
-
-// Give information about the area.
 gat: 99
-
-// Enables debugging. Broken and may crash the server.
 packet: 99
-
-// Shows information about the map.
 mapinfo: 99
-
-// Re-load item database.
 reloaditemdb: 99
-
-// Re-load monsters database.
 reloadmobdb: 99
-
-// Re-load skills database.
 reloadskilldb: 99
-
-// Re-load scripts.
 reloadscript: 99
-
-// Re-load GM level.
 reloadgmdb: 99
-
-// Brings up your personal storage wherever you are.
 storage: 99
 
 // local settings for this server in this file
diff --git a/world/map/conf/atcommand_local.conf.example b/world/map/conf/atcommand_local.conf.example
index 916a092c..3935db1b 100644
--- a/world/map/conf/atcommand_local.conf.example
+++ b/world/map/conf/atcommand_local.conf.example
@@ -1 +1,8 @@
 // Athena atcommand Local Configuration file.
+
+// Command to become a GM. Only players who are not a GM can use this.
+// In addition to changing this to 0, you must also:
+//  - set level_new_gm in login_athena.conf to something other than 0
+//  - set atcommand_gm_only to false in battle_athena.conf
+//  - give the correct password (gm_pass in login_athena.conf)
+gm: 100
diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 593fe227..0e4906a3 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -1,13 +1,4 @@
-//--------------------------------------------------------------
-//eAthena Battle Configuration File
-// Made in to plainer english by Ancyker
-//--------------------------------------------------------------
-//Note 1: Directives can be set using on/off, yes/no or 1/0.
-//Note 2: All rates are in percents, 100 would mean 100%, 200
-//   would mean 200%, etc
-// Other Information:
-//  1000 miliseconds is 1 second.
-//--------------------------------------------------------------
+// eAthena Battle Configuration File
 
 // Do you want to debug warp points? If set to yes, warp points will appear as flags.(Note 1)
 warp_point_debug: no
@@ -39,15 +30,6 @@ castrate_dex_scale: 150
 // Is 'Skills add a delay before you can attack' enabled? (Note 1)
 skill_delay_attack_enable: no
 
-// Whether or not cards and attributes in the left hand are enabled (Note 1)
-left_cardfix_to_right: yes
-
-// Increase player's attack range (in cells)
-player_skill_add_range: 0
-
-// If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
-skill_out_range_consume: no
-
 // Increase Monsters attack range
 monster_skill_add_range: 0
 
@@ -55,24 +37,15 @@ monster_skill_add_range: 0
 // (Setting to no will be like always endure)
 player_damage_delay: no
 
-// Damaged delay rate (Note 2)
-player_damage_delay_rate: 100
-
-// Is a player's defense NOT dependant on an enemies attack? (Note 1)
-defunit_not_enemy: yes
-
-// Are summoned monsters level greater then your base level? (I think this is for dead branches) (Note 1)
-random_monster_checklv: yes
-
 // The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
 atcommand_spawn_quantity_limit: 100
 
-// Does HP recover if hit by an attribute that's same as your own? (Note 1)
-attribute_recover: yes
-
 // If an item is droped, does it go stright into the users inventory? (Note 1)
 item_auto_get: no
 
+// How far away does drop protection apply?
+drop_pickup_safety_zone: 20
+
 // How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds)
 flooritem_lifetime: 120000
 
@@ -89,61 +62,12 @@ item_second_get_time: 10000
 // So, It Is Like First Person's Time + Second Person's Time + Third Person's Time  = Time Before Third Person Can Get The Items
 item_third_get_time: 5000
 
-// How long before the first person who did the most damage to a MVP can get the item? (in milliseconds)
-mvp_item_first_get_time: 10000
-
-// How long before the second person who did the second most damage to a MVP can get the item? (in milliseconds)
-// (It Adds Time From The First Persons Time)
-// So, It Is Like First Person's Time + Second Person's Time  = Time Before Second Person Can Get The Items
-mvp_item_second_get_time: 10000
-
-// How long before the third person who did the third most/least damage to a MVP can get the item
-//(Note the Amount is in Milliseconds and It Adds Time From The First Persons Time And Second Persons Time)
-//So It Is Like First Person's Time + Second Person's Time + Third Person's Time  = Time Before Third Person Can Get The Items
-mvp_item_third_get_time: 2000
-
-// Item drop rates (Note 2)
-
-// The rate the common items are droped (Items that are in the ETC tab, besides card)
-item_rate_common: 100
-item_drop_common_min: 1
-item_drop_common_max: 10000
-
-// The rate healing items are droped (items that restore HP or SP)
-item_rate_heal: 100
-item_drop_heal_min: 1
-item_drop_heal_max: 10000
-
-// The rate at which usable items (in the item tab) other then healing items are droped.
-item_rate_use: 100
-item_drop_use_min: 1
-item_drop_use_max: 10000
-
-// The rate at which equipment is droped.
-item_rate_equip: 100
-item_drop_equip_min: 1
-item_drop_equip_max: 10000
-
-// The rate at which cards are droped
-item_rate_card: 100
-item_drop_card_min: 1
-item_drop_card_max: 10000
-
-item_drop_mvp_min: 1
-item_drop_mvp_max: 10000
-
-// Can the monster's drop rate become 0? (Note 1)
-drop_rate0item: no
-
 // Rate at which exp. is given. (Note 2)
 base_exp_rate: 100
 
 // Rate at which job exp. is given. (Note 2)
 job_exp_rate: 100
 
-// PVP exp.  Do players get exp during pvp
-pvp_exp: yes
-
 // When a player dies, how should we penalize them?
 // 0 = No penalty.
 // 1 = Lose % of current level when killed.
@@ -156,9 +80,6 @@ death_penalty_base: 100
 // Job exp. penalty rate (Each 100 is 1% of their exp)
 death_penalty_job: 100
 
-// When a player dies, how much zeny should we penalize them with?
-zeny_penalty: 0
-
 // The amount of HP a player will respawn with, 0 is default.
 // (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
 restart_hp_rate: 0
@@ -167,15 +88,6 @@ restart_hp_rate: 0
 // (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
 restart_sp_rate: 0
 
-// [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)
-mvp_hp_rate: 100
-
-// [MVP] Item drop rate, that is, the overall drop rate for items droped by an MVP. (Note 2)
-mvp_item_rate: 100
-
-// [MVP] Exp. rate. (Note 2)
-mvp_exp_rate: 100
-
 // The HP rate of normal monsters (that is monsters that are not MVP's) (Note 2)
 monster_hp_rate: 100
 
@@ -187,145 +99,32 @@ monster_max_aspd: 199
 // set to 'Yes', Normal players (gm level 0) can never use a GM command even if you set the command level to 0.
 atcommand_gm_only: no
 
-// [GM] Can use all skills? (No or mimimum GM level)
-gm_all_skill: no
-
-// [GM] Can use all abracadabra skills? (No minimum GM level)
-gm_all_skill_add_abra: no
-
 // [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
 gm_all_equipment: no
 
-// [GM] Raise skills unconditionally, that is, put points in to a skill not in thier jobs skill tree? (no or minimum gm level)
-gm_skill_unconditional: no
-
-// Can a normal player by-pass the skill tree? (Note 1)
-player_skillfree: no
-
-// When doing a skill reset, whether the skill's restriction is to be ignored or not. (Note 1)
-player_skillup_limit: yes
-
-// Forging success rate. (Note 2)
-weapon_produce_rate: 100
-
-// Prepare Potion succsss rate. (Note 2)
-potion_produce_rate: 100
+// Should GMs be given a hashed IP instead of the real one?
+mask_ip_gms: 1
 
 // Allow monsters to be aggresive and attack first? (Note 1)
 monster_active_enable: yes
 
-// Monster damage delay rate (Note 1)
-monster_damage_delay_rate: 100
-
-// Looting monster actions.
-// 0 = Monster will consume the item.
-// 1 = Monster will not consume the item.
-monster_loot_type: 0
-
 // Enable monster skills? (Note 1)
 mob_skill_use: yes
 
 // Rate of monsters on a map, 200 would be twice as many as normal. (Note 2)
 mob_count_rate: 100
 
-// Quest skills can be learned? (Note 1)
-// Setting this to yes can open an exploit on your server!
-quest_skill_learn: yes
-
-// When skills are reset, quest skills are reset as well? (Note 1)
-// Setting this to yes can open an exploit on your server!
-quest_skill_reset: no
-
 // You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
 basic_skill_check: yes
 
-// Item to require when making a guild. Setting this to
-// 0 will disable the check. Using item 1337 for now
-// to disable creation (as it's unallocated)
-guild_emperium_check: 1337
-
-// Maximum tax limit on a guild member.
-guild_exp_limit: 50
-
-// Maximum castles one guild can own (0 - unlimited)
-guild_max_castles: 0
-
 // When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds)
 // That is, when you go to a map and don't move, how long before the monsters will notice you.
 // If you attack a monster, it will attack you back regaurdless of this setting. (I think)
 player_invincible_time: 5000
 
-// [PET] Rate for catching pets (Note 2)
-pet_catch_rate: 100
-
-// [PET] Can you name a pet more then once? (Note 1)
-pet_rename: no
-
-// [PET] The rate a pet will get friendly by feeding it. (Note 2)
-pet_friendly_rate: 100
-
-// [PET] The rate at which a pet will become hungry. (Note 2)
-pet_hungry_delay_rate: 100
-
-// [PET] If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
-// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
-pet_hungry_friendly_decrease: 5
-
-// [PET] Does Pet's Attack Damage Based On Str (Note 1)
-pet_str: yes
-
-// [PET] Whether or not the pet's will use skills. (Note 1)
-pet_status_support: yes
-
-// [PET] Does the pet need its equipment before it does its skill? (Note 1)
-pet_equip_required: yes
-
-// [PET] Will all pets attack? (Note 1)
-// Do NOT use this with pet skills!
-pet_attack_support: no
-
-// [PET] When the master receives damage from the monster, whether or not the pet attacks back.
-pet_damage_support: no
-
-// [PET] Rate at which a pet will support it's owner in battle. (Note 2)
-pet_support_rate: 100
-
-// [PET] Does the pets owner receive exp from the pets damage?
-pet_attack_exp_to_master: no
-
-// [PET] The rate exp. is gained from the pet attacking monsters
-pet_attack_exp_rate: 100
-
 // Will there be a minimum skill dmg even if there is a miss?
 skill_min_damage: no
 
-// Which finger offensive style can be used?
-// 0 = Aegis style
-// 1 = Athena style
-finger_offensive_type: 0
-
-// The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.
-// The balance of the exp. rate is best used with 5 to 10)
-heal_exp: 0
-
-// The rate of exp. that is gained by the process of resurrection, a unit is 0.01%.
-// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.
-resurrection_exp: 0
-
-// The rate of job exp. when using discount and overcharge on an NPC (100 is normal, 200 is double.)
-// The way it is calculated is (money recieved * skill lv) * shop_exp / 100.
-shop_exp: 0
-
-// The delay rate of monk's combo (Note 2)
-combo_delay_rate: 100
-
-// Item check? (Note 1)
-// When logged in or moving in map if the item the player is holding isn't correct there will be a check.
-item_check: no
-
-// Will tuxedo and wedding dresses be shown when worn? (Note 1)
-wedding_modifydisplay: yes
-
 // The time interval for HP to restore naturally. (in milliseconds)
 natural_healhp_interval: 6000
 
@@ -338,8 +137,8 @@ natural_heal_skill_interval: 10000
 // The maximum weight for a character to carry when the character stops healing naturally. (in %)
 natural_heal_weight_rate: 50
 
-// Override item names from GRF file? (Note 1)
-item_name_override_grffile: yes
+// Multiplier for healing from items.
+itemheal_regeneration_factor: 1
 
 // Are arrows are consumed when used on a bow? (Note 1)
 arrow_decrement: yes
@@ -366,24 +165,6 @@ max_parameter: 99
 // Max weight carts can hold.
 max_cart_weight: 8000
 
-// Display player skill errors in console? (for debug only) (default: off) (Note 1)
-player_skill_log: off
-
-// Display monster skill errors in console? (for debug only) (default: off) (Note 1)
-monster_skill_log: off
-
-// Display battle log? (for debug only) (default: off) (Note 1)
-battle_log: off
-
-// Display save log? (for debug only) (default: off) (Note 1)
-save_log: off
-
-// Display errors? (for debug only) (default: off) (Note 1)
-error_log: off
-
-// Display other stuff? (for debug only) (default: off) (Note 1)
-etc_log: off
-
 // Save Clothes color. (This will degrade performance [in txt?]) (Note 1)
 save_clothcolor: yes
 
@@ -393,13 +174,6 @@ save_clothcolor: yes
 // 2 = both
 undead_detect_type: 2
 
-// Operational mode of automatic counter.
-// 0 = disregard DEF and HIT+20 . CRI*2, 1 = 100% critical
-// Players
-player_auto_counter_type: 0
-// Monsters
-monster_auto_counter_type: 0
-
 // Type of penalty that is applied to FLEE when more than agi_penaly_count monsters are targetting player
 // 0 = no penalty is applied
 // 1 = agi_penaly_num is reduced from FLEE as a %
@@ -424,59 +198,8 @@ vit_penaly_count: 3
 // Amount of VIT defense penalized per each attacking monster more than vit_penaly_count
 vit_penaly_num: 5
 
-// When the player attacks an object, the calculation method of DEF.
-// With 0 this will be ignored specification, at 1 or more def = subtraction of (DEF* value).
-player_defense_type: 0
-
-// When the monster attacks an object, the calculation method of DEF.
-// With 0 this will be ignored, at 1 or more def = subtraction of (DEF* value).
-monster_defense_type: 0
-
-// When the pet attacks an object, the calculation method of DEF.
-// With 0 this will be ignored specification, at 1 or more def = subtraction of (DEF* value).
-pet_defense_type: 0
-
-//MDEF‚same as above....(MDEF*value)
-magic_defense_type: 0
-
-// Whether or not, ground skills of the players' will stack. (Note 1)
-player_skill_reiteration: no
-
-//Whether or not, ground skills of the monsters' will pile up. (Note 1)
-monster_skill_reiteration: no
-
-//Whether or not ground based skills of a certain type such as traps can be cast straight onto other players. (Note 1)
-player_skill_nofootset: yes
-
-//Whether or not ground based skills of a certain type such as traps can be cast straight onto monsters. (Note 1)
-monster_skill_nofootset: yes
-
-// When a player is cloaking, Whether the wall is checked or not. (Note 1)
-// Note: Gravity announced that they were changing cloaking so it would
-// not need a wall, but this was never implemented. I set to no, for fun.
-player_cloak_check_type: no
-
-// When a monster is cloaking, Whether the wall is checked or not. (Note 1)
-monster_cloak_check_type: no
-
-// Melee damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 100
-
-// Ranged damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 100
-
-// Magic damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 100
-
-// Misc damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 100
-
-// When the empelium is broken with WoE mode on, How Long Before The Declaration Of Castle Owner
-// and Removal of Monsters/Players from Castle. (in milliseconds)
-gvg_eliminate_time: 7000
-
-// Whether or not skill is used vis-a-vis the user at the time of MOB skill motion of condition skillused. (Note 1)
-// Not sure what this means, something about monsters changing target?
+// When a defensive skill is  used, is the mob's target temporarily
+// set to the attacking player first, and restored afterwards?
 mob_changetarget_byskill: no
 
 // Player's Direction Changed When Attacking? (Note 1)
@@ -485,33 +208,6 @@ player_attack_direction_change: yes
 // Monsters's Direction Changed When Attacking? (Note 1)
 monster_attack_direction_change: yes
 
-// If the player has Undead Elemental Equipment, should they be frozen or not. (Note 1)
-player_undead_nofreeze: no
-
-// Will Player Skills Stay Within Land Limit or not? (Note 1)
-player_land_skill_limit: yes
-
-// Will Monster Skills Stay Within Land Limit or not? (Note 1)
-monster_land_skill_limit: yes
-
-// If a party uses a skill with penalties do they apply? (Note 1)
-party_skill_penaly: yes
-
-// If monster's class is changed will it fully recover HP and SP and Ailments? (Note 1)
-monster_class_change_full_recover: no
-
-// Do produced items have the maker's name on them? (Note 1)
-produce_item_name_input: yes
-
-// Do produced potions have the maker's name on them? (Note 1)
-produce_potion_name_input: yes
-
-// Do crafted arrows have the maker's name on them? (Note 1)
-making_arrow_name_input: yes
-
-// Does created holy water have the maker's name on it? (Note 1)
-holywater_name_input: yes
-
 // Stop logout for 10 seconds after a hit? (Note 1)
 prevent_logout: yes
 
@@ -527,33 +223,9 @@ mob_warpportal: no
 // Is a monster summoned via dead branch aggresive? (Note 1)
 dead_branch_active: yes
 
-// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
-vending_max_value: 10000000
-
 // If someone loots, show name in party? (Note 1)
 show_steal_in_same_party: no
 
-// Allow upper class (Advanced 2nd Class)? (Note 1)
-// Just leave this at yes
-enable_upper_class: yes
-
-// Is a usual attack of a pet delivered withOUT an attribute? (Note 1)
-pet_attack_attr_none: no
-
-// Is a usual attack of a player delivered withOUT an attribute? (Note 1)
-pc_attack_attr_none: no
-
-// Is a usual attack of a monster delivered withOUT an attribute? (Note 1)
-mob_attack_attr_none: no
-
-// mob attacks againsts players wearing ghostring armor do full damage
-mob_ghostring_fix: no
-
-// Does the Golden Thief Bug card only work during pvp?
-// no or 0 - gtb works all the time
-// 1 - 100 - percentage of magic damage reduced only during pvp (or gvg)
-gtb_pvp_only: no
-
 // How to count the number of the enemies who do an agi penalty...
 // 1 or less: It is a count altogether.
 // 2: Full evasion exclusion
@@ -568,42 +240,13 @@ agi_penaly_count_lv: 2
 // Four or more: Except all.
 vit_penaly_count_lv: 3
 
-// Grandcross Settings (Dont mess with these)
-// Even if MOB (PC) has overlapped, it HIT(s) compulsion 3. (Default no)
-gx_allhit: no
-// The effect of the arms card of a damage %UP system is set also to GX at -L effect. (default no)
-gx_cardfix: no
-// The attribute affinity of GX is calculated doubly. (Default yes)
-gx_dupele: yes
-// Grandcross display type (Default 1)
-// 0: Yellow character
-// 1: White character
-gx_disptype: 1
-
-// If no than you can use the ensemble skills alone. (Note 1)
-player_skill_partner_check: yes
-
 // Is the character of a GM account set as the object of a display by @ command etc. or not?
 hide_GM_session: no
 
-// ƒ†ƒjƒbƒgˆÚ“®�ˆ-�•û-@�B0‚Å-{ŽIŽd-l(‰ñ�ü•‰‰×�¨�d�AŽI�ˆ-��¨Œy)�A1‚ÅAthenaŽd-l(‰ñ�ü•‰‰×�¨Œy�AŽI�ˆ-��¨�d)
-// translation (babelfish):
-// Unit portable place - ? @.
-// With 0 - {mackerel SI -l (circuit load -> heavily, the mackerel place - the ? ? lightly),
-// With 1 - Athena SI -l (circuit load -> lightly, the mackerel place - the ? ? it is heavy)
-unit_movement_type: 0
-
 // Are other requests accepted during [various things[party,guild]] a request or not?
 // It does not accept by no accepted by yes.
 invite_request_check: yes
 
-// ƒŠƒ€�[ƒuƒgƒ‰ƒbƒv‚ÌŽd-l 0:-{ŽIŽd-l�Aã©1ŒÂ 1:AthenaŽd-l�AŽg‚Á‚½ƒAƒCƒeƒ€‚ðŽg‚Á‚½ŒÂ�”
-// translation (babelfish):
-// SI of ???????? -l
-// 0: - {Mackerel SI -l, trap 1
-// 1:Athena SI -l, the quantity which used the item which was used
-skill_removetrap_type: 0
-
 // Will display experience gained from killing a monster. (Note 1)
 disp_experience: no
 
@@ -623,16 +266,6 @@ drops_by_luk: 0
 // Do all monsters ignore GMs unless attacked? (Note 1)
 monsters_ignore_gm: no
 
-// Turn equipment breaking on. (Note 1)
-// Turning this one will allow equipment to break in battles,
-// as well as some skills that have chance to break equipmen.
-equipment_breaking: no
-
-// Overall rate of which equipment can break. (Note 2) [100 = .01% chance to break equipment before penalties.]
-// Critical attacks will double chance to break equipment, and other skills (such as Power Thrust) will increase weapon breaking chance as well.
-// This does not effect Sage weapon enchantment failure chance.
-equipment_break_rate: 100
-
 // PK Server Mode.  Turns entire server pvp(excluding towns).  Experience loss is doubled if killed by another player.
 // When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items.
 // There is a nopvp.txt for setting up maps not to have pk on in this mode.  Novices cannot be attacked and cannot attack.
@@ -642,33 +275,6 @@ pk_mode: no
 // Turn this on to allow a player to level up more than once from a kill. (Note 1)
 multi_level_up: yes
 
-// Does using bow to do a backstab give a 50% damage penalty? (Note 1)
-backstab_bow_penalty: yes
-
-// Choose if server begin with night (yes) or day (no)
-night_at_start: no
-
-// Define duration in msec of the day (default: 7,200,000 = 2 hours)
-// Set to 0 to disable day cycle (but not @day GM command).
-// Except 0, minimum is 60000 (1 minute).
-day_duration: 0
-
-// Define duration in msec of the night (default: 1,800,000 = 30 min)
-// Set to 0 to disable night cycle (but not @night GM command).
-// Except 0, minimum is 60000 (1 minute).
-night_duration: 0
-
-// Will display a mob's hp/maxhp when the mouse cursor is over them. (Note 1)
-// Will not display guardian or emperium hp.
-//
-// Still under testing (works but doesn't update)
-show_mob_hp: no
-
-// Ban people that try to use an other name of its name (spoof name).
-// Duration of the ban, in minutes (default: 5). Value from 0 to 32767
-// to disable the ban, set 0
-ban_spoof_namer: 5
-
 // Set here minimum level of a (online) GM that can receive all informations about any player that try to hack, spoof a name, etc.
 // Values are from 0 to 100.
 // 100: disable information
@@ -681,30 +287,12 @@ hack_info_GM_level: 60
 // default: 20 (first level after normal player or super'normal' player)
 any_warp_GM_min_level: 20
 
-// Set here which client version do you accept. Add all values of clients:
-//  1: Clients before 2004-07-06 (old clients)
-//  2: 2004-07-06 kRO client
-//  4: 2004-07-13 kRO client
-//  8: 2004-07-26 kRO client
-// 16: 2004-08-09 kRO / 2004-08-16aSakray / 2004-08-17aSakray client
-// 32: 2004-09-06aSakray client
-// default value: 63 (all clients)
-packet_ver_flag: 63
-
-// Allow GMs to mute players or not?
-muting_players: no
-
-// Mail system - Only function in sql version
-mail_system: no
-
 // valid range of dye's and styles on the client
+// Note: this is also hard-coded in the char-server
 min_hair_style: 0
 max_hair_style: 19
 min_hair_color: 0
 max_hair_color: 11
-// Not for tA-style dyed clothes
-min_cloth_color: 0
-max_cloth_color: 4
 
 // Visible area size (how many squares away from a player can they see)
 area_size: 14
@@ -738,7 +326,7 @@ packet_spam_kick: 1
 // -1: classic
 // 0: all PCs on same tile
 // 1 or more: all PCs within radius, if also within range
-mob_splash_radius: 1
+mob_splash_radius: -1
 
 // local settings for this server in this file
 import: conf/battle_local.conf
diff --git a/world/map/conf/battle_local.conf.example b/world/map/conf/battle_local.conf.example
index c9ba222c..8e56b42b 100644
--- a/world/map/conf/battle_local.conf.example
+++ b/world/map/conf/battle_local.conf.example
@@ -1 +1,16 @@
-// Nothing needs to be done here.
+// Local config for battle conf.
+
+// Display monster skill errors in console? (for debug only)
+monster_skill_log: off
+
+// Display battle log? (for debug only)
+battle_log: off
+
+// Display save log? (for debug only)
+save_log: off
+
+// Display errors? (for debug only)
+error_log: off
+
+// Display other stuff? (for debug only)
+etc_log: off
diff --git a/world/map/conf/help.txt.example b/world/map/conf/help.txt.example
index c12b1a89..5a9eb28a 100644
--- a/world/map/conf/help.txt.example
+++ b/world/map/conf/help.txt.example
@@ -1,3 +1,5 @@
+// This file will eventually be hard-coded into the server.
+// It is full of inaccuracies.
 // put at first, the minimum level to display the line
   0:To use one command, type it inside the message window where you usually type to chat.
   0:@help - display this help.
@@ -5,7 +7,7 @@
  80:
  80:@setmagic
  80:@magicinfo
-  0: 
+  0:
   0:--- INFORMATION CMD ---
   0:@servertime - Display the date/time of the server
  99:@ignorelist - Displays your ignore list
@@ -20,15 +22,15 @@
  60:@charcartlist <char name> - Displays all items of a player's cart.
  60:@ipcheck <char name> - Display all characters online from a characters IP address
  99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
- 99: 
+ 99:
  99:@guildspy <guild_name/id> - You will receive all messages of the guild channel
  99:@partyspy <party_name/id> - You will receive all messages of the party channel
- 60: 
+ 60:
  60:--- MESSAGE CMD ---
  60:@broadcast <message> - Broadcasts a GM message with name of the GM
  60:@kami/@kamib <message> - Broadcasts a GM message without name of the GM
  60:@localbroadcast <message> - Broadcasts a GM message with name of the GM
- 40: 
+ 40:
  40:--- CHANGE GM STATE CMD ---
  40:@die ---- suicide
  40:@hide - Makes you invisible to monsters and other reporting functions. Type @hide again become visible.
@@ -50,7 +52,7 @@
  40:
  40:@log/@l - Send text to the GM log
  40:@tee/@t - Send text to the GM log and local chat
- 40: 
+ 40:
  60:@alive - Revives yourself from death
  40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
  40:
@@ -88,13 +90,13 @@
  60:@skillid <name> - look up a skill by name
  60:@useskill <skillid> <skillv> <target> - use a skill on target
  80:@addwarp <map name> <x coord> <y coord>
- 60: 
+ 60:
  60:--- MONSTERS CMD ---
  60:@spawn <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
  60:@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
  60:@killmonster [map] - kill all monsters of the map (they drop)
  60:@killmonster2 - kill all monsters of your map (without drops)
- 40: 
+ 40:
  40:--- ITEMS CMD ---
  40:@storage - Opens storage
  99:@gstorage - Opens guild storage
@@ -105,7 +107,7 @@
  60:@produce <equip name or equip ID> <element> <# of very's>
  60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
  60:	It has separately with fragment 3 of the attribute + stars, you can apply.
- 60: 
+ 60:
  60:--- PVP CMD ---
  60:@pvpon - Turns pvp on on the current map
  60:@pvpoff - Turns pvp off on the current map
@@ -113,14 +115,14 @@
  99:@gvgoff/@gpvpoff - Turns gvg off on the current map
  99:@agitstart - Starts War of Emperium
  99:@agitend - End War of Emperium
- 99: 
+ 99:
  99:--- GROUPS CMD ---
  99:@party <party_name> - Create a party.
  99:@guild <guild_name> - Create a guild.
  99:@guildlvl <# of levels> - Raise Guild by desired number of levels
  99:@guildrecall <guild_name/id> - Warps all online characters of a guild to you.
  99:@partyrecall <party_name/id> - Warps all online characters of a party to you.
- 40: 
+ 40:
  40:--- REMOTE CHAR CMD ---
  60:@kill <char name> - Kills specified character.
  60:@charkillable <char name> - make another character killable
@@ -168,13 +170,13 @@
  80:@doommap - Kills all non GM characters on the map.
  80:@raise - Resurrects all characters on the server.
  80:@raisemap - Resurrects all characters on the map.
- 80: 
+ 80:
  80:--- ENVIRONMENT CMD ---
  80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.
  80:@day - Uses @option 00 00 00 on all characters.
  80:@skillon - turn skills on for a map
  80:@skilloff - turn skills on for a map
- 80: 
+ 80:
  80:--- ADMIN CMD ---
  99:@reloaditemdb - Reload item database (admin command)
  99:@reloadmobdb - Reload monster database (admin command)
@@ -186,8 +188,8 @@
  80:@enablenpc <NPC_name> - Enable a NPC (admin command)
  80:@disablenpc <NPC_name> - Disable a NPC (admin command)
  80:@npcmove
- 80: 
+ 80:
  99:@gat - For debugging (you inspect around gat)
  99:@packet - For debugging (packet variety)
- 99: 
+ 99:
 100:@GM <password> - it becomes GM!
diff --git a/world/map/conf/map_local.conf.example b/world/map/conf/map_local.conf.example
index 493d8718..894a43d3 100644
--- a/world/map/conf/map_local.conf.example
+++ b/world/map/conf/map_local.conf.example
@@ -5,11 +5,14 @@ userid: s1
 passwd: p1
 
 // Character Server IP
-char_ip:127.0.0.1
+char_ip: 127.0.0.1
 // Character Server Port
 char_port: 6122
 
 // Map Server IP
-map_ip:127.0.0.1
+map_ip: 127.0.0.1
 // Map Server Port
 map_port: 5122
+
+// Log of map actions, disabled by default because this is huge.
+//map_log: log/map.log
diff --git a/world/map/conf/motd.txt.example b/world/map/conf/motd.txt.example
index 86f03275..548a95cd 100644
--- a/world/map/conf/motd.txt.example
+++ b/world/map/conf/motd.txt.example
@@ -1,3 +1 @@
-Welcome to The Mana World! (running on eAthena)
-
-Attention: The interpretation of the "no bots" rule has changed.  Read the November 2011 news update for more information.
+Welcome to The Mana World! (running on tmwAthena)