5 files changed, 24 insertions, 29 deletions
diff --git a/login/conf/login_athena.conf b/login/conf/login_athena.conf
index 41b038a7..a14cfa6f 100644
--- a/login/conf/login_athena.conf
+++ b/login/conf/login_athena.conf
@@ -16,14 +16,6 @@ gm_account_filename_check_timer: 15
 // General log.
 login_log_filename: log/login.log
 
-// Log for unknown packets.
-login_log_unknown_packets_filename: log/login_unknown_packets.log
-
-// 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
-
 // Print basic header information about incoming client packets.
 // Also print a little more about client or char auth attempts.
 display_parse_login: no
@@ -41,22 +33,6 @@ display_parse_fromchar: 0
 // 0: all players, 1-99: GM level at least this.
 min_level_to_connect: 0
 
-// 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
-
-// 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
-
-// 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
-
 // How the IP allow/deny lists (below) are interpreted.
 // Possible values:
 //  "deny, allow" (default):
diff --git a/login/conf/tmwa-admin-old.conf b/login/conf/tmwa-admin-old.conf
new file mode 100644
index 00000000..7670b002
--- /dev/null
+++ b/login/conf/tmwa-admin-old.conf
@@ -0,0 +1,6 @@
+// Master config file for The Mana World Athena (admin component)
+// This file is used since version 14.x.y
+
+version-lt: 15.1.23
+
+import: conf/ladmin_athena.conf
diff --git a/login/conf/tmwa-admin.conf b/login/conf/tmwa-admin.conf
index 4584fa13..69f333d9 100644
--- a/login/conf/tmwa-admin.conf
+++ b/login/conf/tmwa-admin.conf
@@ -1,4 +1,7 @@
 // Master config file for The Mana World Athena (admin 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/ladmin_athena.conf
+import: conf/tmwa-admin-old.conf
+version-ge: 15.1.23
+
+admin_conf: conf/ladmin_athena.conf
diff --git a/login/conf/tmwa-login-old.conf b/login/conf/tmwa-login-old.conf
new file mode 100644
index 00000000..907ada2e
--- /dev/null
+++ b/login/conf/tmwa-login-old.conf
@@ -0,0 +1,7 @@
+// Master config file for The Mana World Athena (login component)
+// This file is used since version 14.x.y
+
+version-lt: 15.1.23
+
+import: conf/login_athena.conf
+import: conf/lan_support.conf
diff --git a/login/conf/tmwa-login.conf b/login/conf/tmwa-login.conf
index 89eb61ae..44e3adfe 100644
--- a/login/conf/tmwa-login.conf
+++ b/login/conf/tmwa-login.conf
@@ -1,5 +1,8 @@
 // Master config file for The Mana World Athena (login 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/login_athena.conf
-import: conf/lan_support.conf
+import: conf/tmwa-login-old.conf
+version-ge: 15.1.23
+
+login_conf: conf/login_athena.conf
+login_lan_conf: conf/lan_support.conf