* Rachel update. Official (to iRO) quests and town NPCs

- Added a few missing warps as well to both town and dungeon warps for Rachel.
* Updated map flags for Rachel quest maps.

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

3 files changed, 16 insertions, 3 deletions

diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index 1cf60a1e0..84fd9f6b8 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
-//= 1.2
+//= 1.2a
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 	  to RockmanEXE who provided all the info. [erKURITA]
 //= 1.1 Added warp to Veins Field [Playtester]
 //= 1.2 Fully official rachel warps [Playtester]
+//= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
 //============================================================
 
 rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
@@ -117,3 +118,6 @@ ra_in01,309,70,0	warp	rachel83	1,1,rachel,108,175
 rachel,105,171,0	warp	rachel84	1,1,ra_in01,309,65
 ra_in01,375,109,0	warp	rachel85	1,1,rachel,116,154
 rachel,116,158,0	warp	rachel86	1,1,ra_in01,375,114
+
+//Additional Temple warp
+ra_temin,275,243,0	warp	rachel87	1,1,ra_temin,131,131
\ No newline at end of file
diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index 769bed933..fc4920c13 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 Initial version [Playtester]
 //= 1.1 Official warps [Playtester]
+//= 1.2 Added quest warp. FLoor 4 to floor 3. [L0ne_W0lf[
 //============================================================
 
 ice_dun01,157,10,0	warp	ice001	1,1,ra_fild01,233,327
@@ -18,3 +19,5 @@ ice_dun01,146,161,0	warp	ice002	1,1,ice_dun02,151,139
 ice_dun02,151,145,0	warp	ice003	1,1,ice_dun01,146,157
 ice_dun02,150,285,0	warp	ice004	1,1,ice_dun03,149,24
 ice_dun03,149,19,0	warp	ice005	1,1,ice_dun02,150,280
+//Additional Warp (4th floor -> 3rd)
+ice_dun04,33,140,0	warp	ice006	1,1,ice_dun03,149,1300
diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt
index a320f2f10..932609912 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/rachel_dun.txt
@@ -3,7 +3,7 @@
 //==== By ================================================
 //= Playtester
 //==== Current Version :==================================
-//= 1.3
+//= 1.4
 //==== Compatible With :==================================
 //= Any Athena Version
 //==== Description :======================================
@@ -12,9 +12,12 @@
 //= 1.1 Added $ephiroth's warps [Playtester]
 //= 1.2 Replaced old versions with jAthena's [Playtester]
 //= 1.3 Official warps [Playtester]
+//= 1.4 Added quest map warp to random warp. [L0ne_W0lf]
+//=	Added Dungeon exit back into temple.
 //========================================================
 
 ra_san01,139,13,0	script	sanctuary01	45,1,1,{
+	if (ra_tem_q == 21) { warp "que_san04",119,110; end; }
 	switch(rand(3)) {
 		case 1:  warp "ra_san02",213,275; break;
 		case 2:  warp "ra_san03",119,283; break;
@@ -35,3 +38,6 @@ ra_san03,5,149,0	warp	sanctuary11	1,1,ra_san02,284,149
 ra_san02,213,4,0	warp	sanctuary12	1,1,ra_san04,35,216
 ra_san04,35,221,0	warp	sanctuary13	1,1,ra_san02,213,9
 ra_san02,30,21,0	warp	sanctuary14	1,1,ra_san05,14,149
+
+//Additional Dungeon warp. (Exit)
+ra_san01,139,139,0	warp	sanctuary15	1,1,ra_temin,27,314
\ No newline at end of file