* Added new maps to maps_athena.conf, and corresponding mapflags.

- Also added several missing maps, and cloned maps.
* Added new maps from today's kRO Sakray patch to the mapcache.
- Mapcache still uses OLD Morroc and Morroc Ruins map data. Sunken Morroc will have to wait.
- Added several 'cloned' maps to the mapcache and map_index.
* Updated castles database with data for the 5 new castles.
* Added warp between Juno and Juno's WoE Satellite.

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

11 files changed, 89 insertions, 1 deletions

diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 8f9a894e4..6ce0bcd9e 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,8 @@
 Date	Added
 
+2007/09/18
+	* Rev. 11241 Added new maps to maps_athena.conf, and corresponding mapflags. [L0ne_W0lf]
+	- Also added several missing maps, and cloned maps.
 2007/09/17
 	* Added missing force_4-1 and force_5-1 maps to the map list [ultramage]
 2007/09/13
diff --git a/conf-tmpl/mapflag/gvg.txt b/conf-tmpl/mapflag/gvg.txt
index 2729acfbd..16046e4e0 100644
--- a/conf-tmpl/mapflag/gvg.txt
+++ b/conf-tmpl/mapflag/gvg.txt
@@ -41,6 +41,12 @@ prtg_cas02	mapflag	gvg_castle
 prtg_cas03	mapflag	gvg_castle
 prtg_cas04	mapflag	gvg_castle
 prtg_cas05	mapflag	gvg_castle
+schg_cas01	mapflag	gvg_castle
+schg_cas02	mapflag	gvg_castle
+schg_cas03	mapflag	gvg_castle
+schg_cas04	mapflag	gvg_castle
+schg_cas05	mapflag	gvg_castle
+
 //Uncomment to disable monsters teleporting (prevents them from "escaping" when rude attacked)
 //aldeg_cas01	mapflag	monster_noteleport
 //aldeg_cas02	mapflag	monster_noteleport
@@ -62,6 +68,11 @@ prtg_cas05	mapflag	gvg_castle
 //prtg_cas03	mapflag	monster_noteleport
 //prtg_cas04	mapflag	monster_noteleport
 //prtg_cas05	mapflag	monster_noteleport
+//schg_cas01	mapflag	monster_noteleport
+//schg_cas02	mapflag	monster_noteleport
+//schg_cas03	mapflag	monster_noteleport
+//schg_cas04	mapflag	monster_noteleport
+//schg_cas05	mapflag	monster_noteleport
 
 // Novice Guild Castles ===
 //n_castle	mapflag	gvg_castle
diff --git a/conf-tmpl/mapflag/night.txt b/conf-tmpl/mapflag/night.txt
index c5c5aa36c..3feb96c6e 100644
--- a/conf-tmpl/mapflag/night.txt
+++ b/conf-tmpl/mapflag/night.txt
@@ -60,6 +60,9 @@ moc_fild16	mapflag	nightenabled
 moc_fild17	mapflag	nightenabled
 moc_fild18	mapflag	nightenabled
 moc_fild19	mapflag	nightenabled
+moc_fild20	mapflag	nightenabled
+moc_fild21	mapflag	nightenabled
+moc_fild22	mapflag	nightenabled
 moc_ruins	mapflag	nightenabled
 morocc	mapflag	nightenabled
 pay_arche	mapflag	nightenabled
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index ecf813578..1a33a862d 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -139,6 +139,13 @@ prtg_cas02	mapflag	nobranch
 prtg_cas03	mapflag	nobranch
 prtg_cas04	mapflag	nobranch
 prtg_cas05	mapflag	nobranch
+//schg_gld
+schg_cas01	mapflag	nobranch
+schg_cas02	mapflag	nobranch
+schg_cas03	mapflag	nobranch
+schg_cas04	mapflag	nobranch
+schg_cas05	mapflag	nobranch
+
 //n_castle	mapflag	nobranch
 nguild_alde	mapflag	nobranch
 nguild_gef	mapflag	nobranch
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 048d4e53e..a27e4cc90 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -116,6 +116,11 @@ prtg_cas02	mapflag	noicewall
 prtg_cas03	mapflag	noicewall
 prtg_cas04	mapflag	noicewall
 prtg_cas05	mapflag	noicewall
+schg_cas01	mapflag	noicewall
+schg_cas02	mapflag	noicewall
+schg_cas03	mapflag	noicewall
+schg_cas04	mapflag	noicewall
+schg_cas05	mapflag	noicewall
 // Novice Guild Castles ===
 nguild_alde	mapflag	noicewall
 nguild_gef	mapflag	noicewall
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index ea214267e..e5ea69811 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -434,6 +434,11 @@ nguild_alde	mapflag	nomemo
 nguild_gef	mapflag	nomemo
 nguild_pay	mapflag	nomemo
 nguild_prt	mapflag	nomemo
+schg_cas01	mapflag	nomemo
+schg_cas02	mapflag	nomemo
+schg_cas03	mapflag	nomemo
+schg_cas04	mapflag	nomemo
+schg_cas05	mapflag	nomemo
 //To Protect Novices Guilds from level abusers
 n_castle	mapflag	nomemo
 
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index c010d1504..7bfe836c3 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -173,6 +173,11 @@ prtg_cas02	mapflag	nosave	SavePoint
 prtg_cas03	mapflag	nosave	SavePoint
 prtg_cas04	mapflag	nosave	SavePoint
 prtg_cas05	mapflag	nosave	SavePoint
+schg_cas01	mapflag	nosave	SavePoint
+schg_cas02	mapflag	nosave	SavePoint
+schg_cas03	mapflag	nosave	SavePoint
+schg_cas04	mapflag	nosave	SavePoint
+schg_cas05	mapflag	nosave	SavePoint
 nguild_alde	mapflag	nosave	SavePoint
 nguild_gef	mapflag	nosave	SavePoint
 nguild_pay	mapflag	nosave	SavePoint
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index 0950377c5..81907d513 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -157,6 +157,11 @@ prtg_cas02	mapflag	noteleport
 prtg_cas03	mapflag	noteleport
 prtg_cas04	mapflag	noteleport
 prtg_cas05	mapflag	noteleport
+schg_cas01	mapflag	noteleport
+schg_cas02	mapflag	noteleport
+schg_cas03	mapflag	noteleport
+schg_cas04	mapflag	noteleport
+schg_cas05	mapflag	noteleport
 nguild_alde	mapflag	noteleport
 nguild_gef	mapflag	noteleport
 nguild_pay	mapflag	noteleport
diff --git a/conf-tmpl/mapflag/nowarp.txt b/conf-tmpl/mapflag/nowarp.txt
index 6ddfa56a8..07767a589 100644
--- a/conf-tmpl/mapflag/nowarp.txt
+++ b/conf-tmpl/mapflag/nowarp.txt
@@ -30,6 +30,11 @@ prtg_cas02	mapflag	nowarp
 prtg_cas03	mapflag	nowarp
 prtg_cas04	mapflag	nowarp
 prtg_cas05	mapflag	nowarp
+schg_cas01	mapflag	nowarp
+schg_cas02	mapflag	nowarp
+schg_cas03	mapflag	nowarp
+schg_cas04	mapflag	nowarp
+schg_cas05	mapflag	nowarp
 n_castle	mapflag	nowarp
 nguild_alde	mapflag	nowarp
 nguild_gef	mapflag	nowarp
diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt
index cf4e65b93..15fba8d65 100644
--- a/conf-tmpl/mapflag/nowarpto.txt
+++ b/conf-tmpl/mapflag/nowarpto.txt
@@ -29,6 +29,11 @@ prtg_cas02	mapflag	nowarpto
 prtg_cas03	mapflag	nowarpto
 prtg_cas04	mapflag	nowarpto
 prtg_cas05	mapflag	nowarpto
+schg_cas01	mapflag	nowarpto
+schg_cas02	mapflag	nowarpto
+schg_cas03	mapflag	nowarpto
+schg_cas04	mapflag	nowarpto
+schg_cas05	mapflag	nowarpto
 //Novice Guild
 n_castle	mapflag	nowarpto
 nguild_alde	mapflag	nowarpto
diff --git a/conf-tmpl/maps_athena.conf b/conf-tmpl/maps_athena.conf
index cce5d30ae..57f14af53 100644
--- a/conf-tmpl/maps_athena.conf
+++ b/conf-tmpl/maps_athena.conf
@@ -591,7 +591,6 @@ map: ein_in01
 map: que_sign01
 map: que_sign02
 
-
 // --- Einbroch and Lightalzen ---
 // -- 2005-05-10sdata_k.gpf --
 map: ein_fild03
@@ -774,6 +773,25 @@ map: abbey03
 map: poring_w01
 map: poring_w02
 
+// --- ??? ---
+// -- 2007-??-??
+map: 06guild_r
+map: 06guild_01
+map: 06guild_02
+map: 06guild_03
+map: 06guild_04
+map: 06guild_05
+map: 06guild_06
+map: 06guild_07
+map: 06guild_08
+map: z_agit
+map: que_temsky
+map: itemmall
+map: bossnia_01
+map: bossnia_02
+map: bossnia_03
+map: bossnia_04
+
 // --- Moscovia ---
 // -- 2007-06-???
 map: moscovia
@@ -785,6 +803,22 @@ map: mosk_dun01
 map: mosk_dun02
 map: mosk_dun03
 
+// --- Episode 12: Satan Morroc & Schwaltzvalt Seige ---
+// -- 2007-09-19sdata_k.gpf
+map: schg_cas01
+map: schg_cas02
+map: schg_cas03
+map: schg_cas04
+map: schg_cas05
+map: sch_gld
+map: cave
+map: moc_fild20
+map: moc_fild21
+map: moc_fild22
+map: que_ba
+map: que_moc_16
+map: que_moon
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------