Official Rachel warps

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

3 files changed, 107 insertions, 95 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2e836427d..6c0eac9c1 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/04/22
+	* Official Rachel warps [Playtester]
 2007/04/21
 	* Fixed a small scripts_custom.conf typo [ultramage]
 2007/04/15
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 390ce8ad8..84d6c89a1 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -583,7 +583,7 @@ rachel,155,243,3	script	Guard#Ra02	934,{
 	close;
 }
 
-ra_temple,119,179,3	script	#door1	45,2,2,{
+ra_temple,119,180,3	script	#door1	45,2,2,{
 
 OnTouch:
 	mes "** The door is locked. **";
@@ -602,7 +602,7 @@ L_weap:
 L_enter:
 	mes "** The door opens. **";
 	close2;
-	warp "ra_temin",169,22;
+	warp "ra_temin",169,23;
 	end;
 }
 
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index a9ecd75e2..1cf60a1e0 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -13,97 +13,107 @@
 //= 	  "custom duplicates" for future checkout. Special thanks
 //= 	  to RockmanEXE who provided all the info. [erKURITA]
 //= 1.1 Added warp to Veins Field [Playtester]
+//= 1.2 Fully official rachel warps [Playtester]
 //============================================================
 
-//| Official warps under this comment. Needs separation though...
-//| There are a few warps missing that will be done soon.
-
-ra_in01,172,392,0	warp	rachel01	1,1,rachel,42,114
-rachel,42,87,0	warp	rachel02	1,1,ra_in01,171,359
-rachel,42,109,0	warp	rachel03	1,1,ra_in01,171,389
-ra_in01,171,355,0	warp	rachel04	1,1,rachel,42,82 
-rachel,83,78,0	warp	rachel05	1,1,ra_in01,249,266
-ra_in01,249,262,0	warp	rachel05	1,1,rachel,83,75
-rachel,115,149,0	warp	rachel06	1,1,ra_in01,386,43
-ra_in01,386,40,0	warp	rachel07	1,1,rachel,115,144
-ra_in01,165,369,0	warp	rachel10	1,1,ra_in01,122,334
-ra_in01,126,334,0	warp	rachel11	1,1,ra_in01,169,369
-ra_in01,178,370,0	warp	rachel12	1,1,ra_in01,113,385
-ra_in01,109,385,0	warp	rachel13	1,1,ra_in01,174,370
-ra_in01,357,61,0	warp	rachel15	1,1,ra_in01,310,62
-ra_in01,314,62,0	warp	rachel16	1,1,ra_in01,361,61
-ra_in01,309,70,0	warp	rachel17	1,1,rachel,108,175
-rachel,105,171,0	warp	rachel18	1,1,ra_in01,309,65
-ra_in01,297,59,0	warp	rachel19	1,1,ra_in01,339,116
-ra_in01,339,120,0	warp	rachel20	1,1,ra_in01,297,63
-ra_in01,375,109,0	warp	rachel21	1,1,rachel,116,154
-rachel,116,158,0	warp	rachel22	1,1,ra_in01,375,114
-ra_in01,135,286,0	warp	rachel22	1,1,rachel,216,164
-rachel,216,160,0	warp	rachel23	1,1,ra_in01,135,282
-ra_in01,213,79,0	warp	rachel24	1,1,rachel,108,195
-rachel,108,200,0	warp	rachel25	1,1,ra_in01,213,83
-ra_in01,192,152,0	warp	rachel26	1,1,rachel,90,193
-rachel,90,189,0	warp	rachel27	1,1,ra_in01,192,148
-rachel,25,125,0	warp	rachel28	1,1,ra_fild11,353,226
-rachel,273,125,0	warp	rachel29	1,1,ra_fild12,41,225
-rachel,130,20,0	warp	rachel30	1,1,ve_fild02,196,379
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//~~~~~~~~~~~~~~~~~~~ Custom warps starts here ~~~~~~~~~~~~~~~~~~~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-//Rachel Sanctuary Sky Map
-ra_temsky,99,117,0	warp	rasky001	1,1,ra_temsky,99,140
-ra_temsky,99,135,0	warp	rasky002	1,1,ra_temsky,99,112
-ra_temsky,112,143,0	warp	rasky003	1,1,ra_temsky,141,139
-ra_temsky,137,139,0	warp	rasky004	1,1,ra_temsky,108,143
-ra_temsky,87,143,0	warp	rasky005	1,1,ra_temsky,58,139
-ra_temsky,62,139,0	warp	rasky006	1,1,ra_temsky,91,143
-
-//Rachel Temple
-ra_temple,119,21,0	warp	rachel002	1,1,rachel,149,244
-//ra_temple,119,181,0	warp	rachel003	1,1,ra_temin,169,22
-ra_temin,169,17,0	warp	rachel004	1,1,ra_temple,119,176
-ra_temin,206,93,0	warp	rachel005	1,1,ra_temin,312,257
-ra_temin,312,252,0	warp	rachel006	1,1,ra_temin,206,88
-ra_temin,130,93,0	warp	rachel007	1,1,ra_temin,238,257
-ra_temin,238,252,0	warp	rachel008	1,1,ra_temin,130,88
-
-//== WEAPON SHOP ==========================
-//rachel,42,108,0	warp	ra_in001	2,2,ra_in01,171,389
-//ra_in01,171,393,0	warp	ra_in001a	2,2,rachel,41,112
-//rachel,42,88,0	warp	ra_in002	2,2,ra_in01,171,358
-//ra_in01,171,354,0	warp	ra_in002a	2,2,rachel,42,84
-//ra_in01,179,370,0	warp	ra_in003	2,2,ra_in01,112,385
-//ra_in01,108,385,0	warp	ra_in003a	2,2,ra_in01,175,370
-//ra_in01,164,370,0	warp	ra_in004	2,2,ra_in01,123,334
-//ra_in01,127,334,0	warp	ra_in004a	2,2,ra_in01,168,370
-
-//== ITEM SHOP ============================
-//rachel,83,179,0	warp	ra_in005	2,2,ra_in01,249,264
-//ra_in01,249,260,0	warp	ra_in005a	2,2,rachel,83,74
-//ra_in01,240,300,0	warp	ra_in006	2,2,ra_in01,191,312
-//ra_in01,195,312,0	warp	ra_in006a	2,2,ra_in01,244,300
-
-//== INN ==================================
-//rachel,115,149,0	warp	ra_in007	2,2,ra_in01,386,42
-//ra_in01,386,38,0	warp	ra_in007a	2,2,rachel,115,145
-//rachel,116,158,0	warp	ra_in008	2,2,ra_in01,375,111
-//ra_in01,375,108,0	warp	ra_in008a	2,2,rachel,116,155
-//rachel,105,170,0	warp	ra_in009	2,2,ra_in01,310,67
-//ra_in01,310,71,0	warp	ra_in009a	2,2,rachel,105,175
-//ra_in01,356,61,0	warp	ra_in010	2,2,ra_in01,311,62
-//ra_in01,315,62,0	warp	ra_in010a	2,2,ra_in01,360,61
-//ra_in01,297,58,0	warp	ra_in011	2,2,ra_in01,340,117
-//ra_in01,338,120,0	warp	ra_in011a	2,2,ra_in01,297,62
-
-//== HOUSES ===============================
-rachel,57,259,0	warp	ra_in012	2,2,ra_in01,295,350
-ra_in01,295,346,0	warp	ra_in012a	2,2,rachel,57,254
-ra_in01,293,372,0	warp	ra_in013	2,2,ra_in01,225,379
-ra_in01,220,379,0	warp	ra_in013a	2,2,ra_in01,289,372
-ra_in01,313,374,0	warp	ra_in014	2,2,ra_in01,358,373
-ra_in01,354,373,0	warp	ra_in014a	2,2,ra_in01,308,374
-
-//Entrance to the Temple
-rachel,149,249,0	warp	rachel001	1,1,ra_temple,119,28
\ No newline at end of file
+rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
+
+rachel,81,33,0	warp	rachel02	1,1,ra_in01,237,198
+rachel,61,33,0	warp	rachel03	1,1,ra_in01,181,198
+rachel,217,55,0	warp	rachel04	1,1,ra_in01,250,34
+rachel,179,220,0	warp	rachel05	1,1,ra_in01,295,352
+rachel,103,240,0	warp	rachel06	1,1,ra_in01,343,193
+rachel,216,160,0	warp	rachel07	1,1,ra_in01,135,282
+rachel,42,87,0	warp	rachel08	1,1,ra_in01,171,359
+rachel,42,109,0	warp	rachel09	1,1,ra_in01,171,388
+rachel,83,78,0	warp	rachel10	1,1,ra_in01,249,266
+rachel,115,149,0	warp	rachel11	1,1,ra_in01,386,43
+rachel,90,189,0	warp	rachel12	1,1,ra_in01,192,148
+rachel,108,200,0	warp	rachel13	1,1,ra_in01,213,83
+
+ra_in01,188,189,0	warp	rachel14	1,1,ra_in01,263,144
+ra_in01,296,144,0	warp	rachel15	1,1,ra_in01,235,189
+ra_in01,175,189,0	warp	rachel16	1,1,ra_in01,132,189
+ra_in01,244,189,0	warp	rachel17	1,1,ra_in01,291,189
+ra_in01,235,21,0	warp	rachel18	1,1,ra_in01,187,31
+ra_in01,312,374,0	warp	rachel19	1,1,ra_in01,359,374
+ra_in01,291,371,0	warp	rachel20	1,1,ra_in01,225,380
+ra_in01,381,200,0	warp	rachel21	1,1,ra_in01,377,268
+ra_in01,367,255,0	warp	rachel22	1,1,ra_in01,326,296
+ra_in01,319,303,0	warp	rachel23	1,1,ra_in01,381,320
+ra_in01,178,370,0	warp	rachel24	1,1,ra_in01,113,385
+ra_in01,165,369,0	warp	rachel25	1,1,ra_in01,122,334
+ra_in01,241,299,0	warp	rachel26	1,1,ra_in01,193,312
+ra_in01,185,303,0	warp	rachel27	1,1,ra_in01,194,249
+ra_in01,357,61,0	warp	rachel28	1,1,ra_in01,310,62
+ra_in01,297,59,0	warp	rachel29	1,1,ra_in01,339,116
+
+ra_temin,130,93,0	warp	rachel30	1,1,ra_temin,239,258
+ra_temin,206,93,0	warp	rachel31	1,1,ra_temin,312,258
+ra_temin,275,332,0	warp	rachel32	1,1,ra_temin,27,305
+
+ra_temin,275,226,0	warp	rachel33	1,1,ra_temsky,99,11
+
+ra_temsky,99,118,0	warp	rachel34	1,1,ra_temsky,99,140
+ra_temsky,112,143,0	warp	rachel35	1,1,ra_temsky,141,139
+ra_temsky,87,143,0	warp	rachel36	1,1,ra_temsky,58,139
+
+ra_temple,120,22,0	warp	rachel37	1,1,rachel,150,243
+
+ra_in01,237,202,0	warp	rachel38	1,1,rachel,81,38
+ra_in01,181,202,0	warp	rachel39	1,1,rachel,61,38
+ra_in01,250,38,0	warp	rachel40	1,1,rachel,217,60
+ra_in01,295,348,0	warp	rachel41	1,1,rachel,179,215
+ra_in01,339,193,0	warp	rachel42	1,1,rachel,98,238
+ra_in01,135,286,0	warp	rachel43	1,1,rachel,216,164
+ra_in01,171,355,0	warp	rachel44	1,1,rachel,42,82
+ra_in01,172,392,0	warp	rachel45	1,1,rachel,42,114
+ra_in01,249,262,0	warp	rachel46	1,1,rachel,83,73
+ra_in01,386,39,0	warp	rachel47	1,1,rachel,115,144
+ra_in01,192,152,0	warp	rachel48	1,1,rachel,90,193
+ra_in01,213,79,0	warp	rachel49	1,1,rachel,108,195
+
+ra_in01,259,144,0	warp	rachel50	1,1,ra_in01,184,189
+ra_in01,231,189,0	warp	rachel51	1,1,ra_in01,292,144
+ra_in01,136,189,0	warp	rachel52	1,1,ra_in01,179,189
+ra_in01,287,189,0	warp	rachel53	1,1,ra_in01,240,189
+ra_in01,183,31,0	warp	rachel54	1,1,ra_in01,239,21
+ra_in01,355,374,0	warp	rachel55	1,1,ra_in01,308,374
+ra_in01,221,380,0	warp	rachel56	1,1,ra_in01,287,371
+ra_in01,381,268,0	warp	rachel57	1,1,ra_in01,387,200
+ra_in01,330,296,0	warp	rachel58	1,1,ra_in01,371,255
+ra_in01,381,324,0	warp	rachel59	1,1,ra_in01,319,299
+ra_in01,109,385,0	warp	rachel60	1,1,ra_in01,174,370
+ra_in01,126,334,0	warp	rachel61	1,1,ra_in01,169,369
+ra_in01,197,312,0	warp	rachel62	1,1,ra_in01,245,299
+ra_in01,194,245,0	warp	rachel63	1,1,ra_in01,190,302
+ra_in01,314,62,0	warp	rachel64	1,1,ra_in01,361,61
+ra_in01,339,120,0	warp	rachel65	1,1,ra_in01,297,63
+
+ra_temin,169,18,0	warp	rachel66	1,1,ra_temple,119,175
+
+ra_temin,239,253,0	warp	rachel67	1,1,ra_temin,130,88
+ra_temin,312,253,0	warp	rachel68	1,1,ra_temin,206,88
+ra_temin,27,299,0	warp	rachel69	1,1,ra_temin,275,328
+
+ra_temsky,99,8,0	warp	rachel70	1,1,ra_temin,275,231
+
+ra_temsky,99,135,0	warp	rachel71	1,1,ra_temsky,99,113
+ra_temsky,137,139,0	warp	rachel72	1,1,ra_temsky,109,143
+ra_temsky,62,139,0	warp	rachel73	1,1,ra_temsky,91,143
+
+rachel,25,125,0	warp	rachel74	1,1,ra_fild11,353,226
+rachel,275,125,0	warp	rachel75	1,1,ra_fild12,40,226
+rachel,130,20,0	warp	rachel76	1,1,ve_fild02,196,379
+
+que_rachel,130,93,0	warp	rachel77	1,1,que_rachel,239,258
+que_rachel,206,93,0	warp	rachel78	1,1,que_rachel,312,258
+que_rachel,275,332,0	warp	rachel79	1,1,que_rachel,27,305
+que_rachel,239,253,0	warp	rachel80	1,1,que_rachel,130,88
+que_rachel,312,253,0	warp	rachel81	1,1,que_rachel,206,88
+que_rachel,27,299,0	warp	rachel82	1,1,que_rachel,275,328
+
+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