From c6987906e69d910f37589d8872cde9449dd5ddc7 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 25 Jan 2014 09:50:09 -0800
Subject: Add new unified config files

---
 login/conf/tmwa-admin.conf           |  4 ++++
 login/conf/tmwa-login.conf           |  5 +++++
 world/conf/tmwa-char.conf            |  6 ++++++
 world/map/conf/atcommand_athena.conf |  6 ------
 world/map/conf/battle_athena.conf    |  6 ------
 world/map/conf/tmwa-map.conf         | 20 ++++++++++++++++++++
 6 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 login/conf/tmwa-admin.conf
 create mode 100644 login/conf/tmwa-login.conf
 create mode 100644 world/conf/tmwa-char.conf
 create mode 100644 world/map/conf/tmwa-map.conf

diff --git a/login/conf/tmwa-admin.conf b/login/conf/tmwa-admin.conf
new file mode 100644
index 00000000..4584fa13
--- /dev/null
+++ b/login/conf/tmwa-admin.conf
@@ -0,0 +1,4 @@
+// Master config file for The Mana World Athena (admin component)
+// This file is used since version 14.x.y
+
+import: conf/ladmin_athena.conf
diff --git a/login/conf/tmwa-login.conf b/login/conf/tmwa-login.conf
new file mode 100644
index 00000000..89eb61ae
--- /dev/null
+++ b/login/conf/tmwa-login.conf
@@ -0,0 +1,5 @@
+// Master config file for The Mana World Athena (login component)
+// This file is used since version 14.x.y
+
+import: conf/login_athena.conf
+import: conf/lan_support.conf
diff --git a/world/conf/tmwa-char.conf b/world/conf/tmwa-char.conf
new file mode 100644
index 00000000..a55cff1f
--- /dev/null
+++ b/world/conf/tmwa-char.conf
@@ -0,0 +1,6 @@
+// Master config file for The Mana World Athena (char component)
+// This file is used since version 14.x.y
+
+import: conf/char_athena.conf
+import: conf/lan_support.conf
+import: conf/inter_athena.conf
diff --git a/world/map/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf
index 4dfd61a6..1ce846dd 100644
--- a/world/map/conf/atcommand_athena.conf
+++ b/world/map/conf/atcommand_athena.conf
@@ -118,7 +118,6 @@ charmodel: 99
 party: 99
 partyrecall: 99
 partyspy: 99
-memo: 99
 charitemlist: 99
 charstoragelist: 99
 charcartlist: 99
@@ -131,11 +130,6 @@ mapexit: 99
 gat: 99
 packet: 99
 mapinfo: 99
-reloaditemdb: 99
-reloadmobdb: 99
-reloadskilldb: 99
-reloadscript: 99
-reloadgmdb: 99
 storage: 99
 
 // local settings for this server in this file
diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 0e4906a3..e1e6265e 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -214,12 +214,6 @@ prevent_logout: yes
 // If skill fails by delay, should it display or not.  (Note 1)
 display_delay_skill_fail: yes
 
-// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)
-chat_warpportal: no
-
-// Can a monster be warped by a warp portal? (Note 1)
-mob_warpportal: no
-
 // Is a monster summoned via dead branch aggresive? (Note 1)
 dead_branch_active: yes
 
diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf
new file mode 100644
index 00000000..0c64f61a
--- /dev/null
+++ b/world/map/conf/tmwa-map.conf
@@ -0,0 +1,20 @@
+// Master config file for The Mana World Athena (map component)
+// This file is used since version 14.x.y
+
+// Do NOT change the order of the slave includes
+// 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
+
+item_db: db/item_db.txt
+mob_db: db/mob_db.txt
+mob_skill_db: db/mob_skill_db.txt
+skill_db: db/skill_db.txt
+magic_conf: conf/magic.conf
+
+// Set in conf/map_athena.conf actually ...
+//motd_txt: conf/motd.txt
-- 
cgit v1.2.3-70-g09d2