* Merged changes from trunk [14636:14686/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 53 insertions, 57 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 4cbff02fe..e726d3f61 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,9 @@
 Date	Added
 
+2011/01/13
+	* Rev. 14667 Removed ladmin settings (ladmin_athena.conf) and login-server settings for ladmin (login_athena.conf) (topic:262934). [Ai4rei]
+2010/12/30
+	* Rev. 14643 Updated mapcache up to 2010-12-01. Adds Bifrost, Dewata and Malangdo maps. [Ai4rei]
 2010/12/12
 	* Rev. 14587 Corrected wording of the setting homunculus_autoloot (since r12203). [Ai4rei]
 2010/12/10
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index b34ce4fcc..6bbedeb8c 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -124,10 +124,6 @@ accept: 1,1
 reject: 1,1
 leave: 1,1
 
-// Away messsage
-away: 1,1
-aw: 1,1
-
 // Main chat
 main: 1,1
 
diff --git a/conf/import-tmpl/ladmin_conf.txt b/conf/import-tmpl/ladmin_conf.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/conf/import-tmpl/ladmin_conf.txt
+++ /dev/null
diff --git a/conf/ladmin_athena.conf b/conf/ladmin_athena.conf
deleted file mode 100644
index 5c4257af7..000000000
--- a/conf/ladmin_athena.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-// Athena Ladmin configuration file.
- 
-// Login Server IP
-login_ip:127.0.0.1
-// Login Server Port
-login_port: 6900
-
-// Administrative password, used to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
-admin_pass: admin
-
-// Encoding type of the password
-// 0: not encoded
-// 1: key+password
-// 2: password+key
-passenc: 2
-
-// Log Filename. All operations done by the software are logged in this file.
-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 redirected output contains escape sequences (color codes)
-stdout_with_ansisequence: no
-
-import: conf/import/ladmin_conf.txt
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index cf7883cfa..7f1f40d4b 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -35,16 +35,6 @@ stdout_with_ansisequence: no
 //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
 console_silent: 0
 
-// Whether remote administration is enabled or disabled
-admin_state: no
-
-// Administrative password, used by ladmin to connect remotely to server.
-// NOTICE: you should change this value for security if you use ladmin.
-admin_pass: admin
-
-// Indicate the IP/host that the server accepts for remote administration.
-admin_allowed_host: 127.0.0.1
-
 // Console Commands
 // Allow for console commands to be used on/off
 // This prevents usage of >& log.file
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index c62645122..514a642a7 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -898,8 +898,7 @@ map: spl_in01
 map: spl_in02
 
 // 3rd Job Maps
-// -- 2009-05-27??
-map: moc_para01
+// -- 2009-01-29rdata_k2.gpf
 map: job3_arch01
 map: job3_arch02
 map: job3_arch03
@@ -915,16 +914,24 @@ map: job3_war01
 map: job3_war02
 map: jupe_core2
 
+// ???
+// -- 2009-05-27rdata_k.gpf
+map: moc_para01
+
 // Brasilis Maps
-// -- 2009-08-05??
+// -- 2009-08-05rdata_k.gpf
 map: brasilis
 map: bra_in01
 map: bra_fild01
 map: bra_dun01
 map: bra_dun02
 
+// ???
+// -- 2009-09-30rdata_k.gpf
+map: s_atelier
+
 // 13.3 El Discastes
-// -- 2009-12-23
+// -- 2009-12-09rdata_k.gpf
 map: dicastes01
 map: dicastes02
 map: dic_in01
@@ -933,7 +940,6 @@ map: dic_fild02
 map: dic_dun01
 map: dic_dun02
 map: job3_gen01
-map: s_atelier
 map: job3_sha01
 
 // Localized Event Maps
@@ -946,6 +952,43 @@ map: job3_sha01
 //ac_cl_room
 //jp_s_dun11
 
+// 14.1 Bifrost
+// -- 2010-06-09rdata_x.gpf
+map: mora
+map: bif_fild01
+map: bif_fild02
+map: 1@mist
+
+// Dewata Maps
+// -- 2010-09-15rdata_x.gpf
+map: dewata
+map: dew_in01
+map: dew_fild01
+map: dew_dun01
+map: dew_dun02
+
+// ???
+// -- 2010-10-06rdata_x.gpf
+map: que_house_s
+
+// Malangdo Maps
+// -- 2010-11-03rdata_x.gpf
+map: malangdo
+map: mal_in01
+map: mal_in02
+map: mal_dun01
+map: 1@pump
+map: 2@pump
+map: 1@cash
+
+// Undersea Tunnel Expansion
+// -- 2010-11-10rdata_x.gpf
+map: iz_dun05
+
+// ???
+// -- 2010-12-01data_x.gpf
+map: evt_mobroom
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
 
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index ef9fda3da..1c9b994c0 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -453,13 +453,7 @@
 //541: %.0s%.0sSomeone got %s
 542: '%s' stole %s's %s (chance: %0.02f%%)
 //542: %.0s%.0sSomeone stole %s
-// @Away message bits
-543: (Automessage has been sent)
-544: Away [AT] - "%s"
-545: Away - "%s"
-546: Away automessage has been activated.
-547: Away automessage has been disabled.
-548: Usage: @away,@aw <message>. Enter empty message for disable it.
+// 543~548 are not used (previously @away messages)
 // @Autotrade
 549: You should be vending to use @autotrade.