4 files changed, 49 insertions, 131 deletions
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