From 741230435bd23aa692f552649664b67a43a358c0 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 30 Jan 2011 00:25:44 +0000
Subject: * 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
---
 conf/maps_athena.conf | 53 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

(limited to 'conf/maps_athena.conf')

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 ---------------------------
 
-- 
cgit v1.2.3-60-g2f50