Update conf for tmwa 15.1.23

7 files changed, 16 insertions, 36 deletions

diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf
index 73aab23c..ee2cba1b 100644
--- a/world/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -5,11 +5,6 @@
 // of just under 1024 per server (but a world may be many servers).
 max_connect_user: 0
 
-// 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
-
 // Interval, in seconds, between saves of the flatfile databases.
 autosave_time: 300
 
@@ -23,15 +18,6 @@ start_point: 029-2.gat,22,24
 // Log Filename
 char_log_filename: log/char.log
 
-// 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 '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.
diff --git a/world/conf/char_local.conf.example b/world/conf/char_local.conf.example
index 4beab7c9..920d7892 100644
--- a/world/conf/char_local.conf.example
+++ b/world/conf/char_local.conf.example
@@ -7,9 +7,6 @@ passwd: p1
 // Server name, no more than 19 characters
 server_name: The Mana World
 
-// Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
-wisp_server_name: Server
-
 // Login Server IP
 login_ip:127.0.0.1
 // Login Server Port
diff --git a/world/conf/tmwa-char-old.conf b/world/conf/tmwa-char-old.conf
new file mode 100644
index 00000000..b7e37735
--- /dev/null
+++ b/world/conf/tmwa-char-old.conf
@@ -0,0 +1,8 @@
+// Master config file for The Mana World Athena (char component)
+// This file is used since version 14.x.y
+
+version-lt: 15.1.23
+
+import: conf/char_athena.conf
+import: conf/lan_support.conf
+import: conf/inter_athena.conf
diff --git a/world/conf/tmwa-char.conf b/world/conf/tmwa-char.conf
index a55cff1f..84213139 100644
--- a/world/conf/tmwa-char.conf
+++ b/world/conf/tmwa-char.conf
@@ -1,6 +1,8 @@
 // Master config file for The Mana World Athena (char component)
-// This file is used since version 14.x.y
+// This file is used since version 14.x.y, but major changes in 15.x.y
 
-import: conf/char_athena.conf
-import: conf/lan_support.conf
-import: conf/inter_athena.conf
+import: conf/tmwa-char-old.conf
+version-ge: 15.1.23
+char_conf: conf/char_athena.conf
+char_lan_conf: conf/lan_support.conf
+inter_conf: conf/inter_athena.conf
diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 8288601d..6e80b1e7 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -99,8 +99,8 @@ 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 equip anything? (No or minimum GM level, can cause client errors.)
-gm_all_equipment: no
+// [GM] Can equip anything? (0 to disable, or minimum GM level, can cause client errors.)
+gm_all_equipment: 0
 
 // Should GMs be given a hashed IP instead of the real one?
 mask_ip_gms: 1
@@ -131,9 +131,6 @@ natural_healhp_interval: 6000
 // The time interval for SP to restore naturally. (in milliseconds)
 natural_healsp_interval: 8000
 
-// Automatic healing skill's time interval. (in milliseconds)
-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
 
@@ -211,12 +208,6 @@ prevent_logout: yes
 // If skill fails by delay, should it display or not.  (Note 1)
 display_delay_skill_fail: yes
 
-// Is a monster summoned via dead branch aggresive? (Note 1)
-dead_branch_active: yes
-
-// If someone loots, show name in party? (Note 1)
-show_steal_in_same_party: 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
diff --git a/world/map/conf/map_athena.conf b/world/map/conf/map_athena.conf
index f03c0123..f0f59fd7 100644
--- a/world/map/conf/map_athena.conf
+++ b/world/map/conf/map_athena.conf
@@ -6,9 +6,6 @@ autosave_time: 60
 // Message of the day file, when a character logs on, this message is displayed.
 motd_txt: conf/motd.txt
 
-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
-help_txt: conf/help.txt
-
 mapreg_txt: save/mapreg.txt
 
 import: npc/scripts.conf
diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf
index 44ac5757..5eea5862 100644
--- a/world/map/conf/tmwa-map.conf
+++ b/world/map/conf/tmwa-map.conf
@@ -5,7 +5,6 @@
 // Older server versions hard-coded the loaders in (mostly) this order,
 // and there may still be code dependencies.
 
-// The plan is to turn some of these into just plain 'import' eventually?
 map_conf: conf/map_athena.conf
 battle_conf: conf/battle_athena.conf
 atcommand_conf: conf/atcommand_athena.conf