* Added Rachel NPCs:

	~ Added Official warps of Rachel. About 50% of them. Will get the rest soon. [erKURITA]
	~ Added the Tool/Armor/Weapon dealer, aswell as a Vegetable Gardener. [erKURITA]
	~ Added the guards + guide locations. Also added the Zondaman location. [erKURITA]
	~ Added Rachel Inn npc. [erKURITA]
\- Special thanks to RockmanEXE for all the info above.
* eAAC update to the vending machine, disguiser and quest warper. [erKURITA]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7349 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -36,6 +36,14 @@ Musashiden
 
 Date		Added
 ======
+06/27
+	* Added Rachel NPCs:
+		~ Added Official warps of Rachel. About 50% of them. Will get the rest soon. [erKURITA]
+		~ Added the Tool/Armor/Weapon dealer, aswell as a Vegetable Gardener. [erKURITA]
+		~ Added the guards + guide locations. Also added the Zondaman location. [erKURITA]
+		~ Added Rachel Inn npc. [erKURITA]
+	\- Special thanks to RockmanEXE for all the info above.
+	* eAAC update to the vending machine, disguiser and quest warper. [erKURITA]
 06/26
 	* Added BIT-WISE perm variables info quest_variables.txt [Lupus]
 06/25

npc/cities/rachel.txt

@@ -0,0 +1,23 @@
+//===== eAthena script =======================================
+//= Rachel Town script
+//===== By: ==================================================
+//= erKURITA & RockmanEXE
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any eAthena Version; RO Episode XX
+//===== Description: =========================================
+//= Rachel Town Npcs
+//============================================================
+//===== Additional Comments: =================================
+//=	1.0 Temporal NPC Locations. Will add 2 of these npc's
+//=	    true script. Special thanks to RockmanEXE. [erKURITA]
+//============================================================
+
+rachel.gat,109,138,4	script	Zondaman#Rachel	874,{end;}
+
+rachel.gat,138,146,5	script	Guide#Rachel	934,{end;}
+ra_fild12.gat,45,231,2	script	Guard#Field1	934,{end;}
+rachel.gat,268,120,2	script	Guard#Field3	934,{end;}
+rachel.gat,31,130,2	script	Guard#Field4	934,{end;}
+rachel.gat,125,33,5	script	Guard#Field5	934,{end;}

npc/custom/eAAC_Scripts/disguiser.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= PalasX (http://cashaan.dontexist.org)
 //===== Current Version: ===================================== 
-//= v1.21 Unified
+//= v1.20 Unified
 //===== Compatible With: ===================================== 
 //= SVN 5690+ (getmonsterinfo)
 //===== Description: ========================================= 
@@ -16,38 +16,37 @@
 //= Uses GetMonsterInfo to pull monster names from server, but
 //=     without sql_query, the mob IDs are set statically
 //= Went crazy with the functions, the script is TINY now :)
-//= 1.21 Removed Duplicates [Silent]
 //============================================================ 
 
 //////////////////////////
 //Places all of our NPCs//
 //////////////////////////
-prt_fild05.gat,277,226,5	script	Dullahan Master#01	736,{
+prt_fild05.gat,277,226,5	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",0,quest_disguise;
 Close;
 }
 
-moc_fild10.gat,34,283,4	script	Dullahan Master#02	736,{
+moc_fild10.gat,34,283,4	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",1,quest_disguise;
 close;
 }
 
-gef_fild00.gat,97,123,4	script	Dullahan Master#03	736,{
+gef_fild00.gat,97,123,4	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",2,quest_disguise;
 close;
 }
 
-pay_fild01.gat,369,305,4	script	Dullahan Master#04	736,{
+pay_fild01.gat,369,305,4	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",3,quest_disguise;
 close;
 }
 
-pay_fild03.gat,313,40,4	script	Dullahan Master#05	736,{
+pay_fild03.gat,313,40,4	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",4,quest_disguise;
 close;
 }
 
-prt_fild08.gat,362,185,4	script	Dullahan Master#06	736,{
+prt_fild08.gat,362,185,4	script	Dullahan Master	736,{
 	callfunc "PXC_Disguiser",5,quest_disguise;
 	close;
 

npc/custom/eAAC_Scripts/quest_warper.txt

@@ -4,7 +4,7 @@
 //= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
 //= Huge Rewrite by Neouni
 //===== Current Version: ==========================================
-//= 2.1
+//= 2.0b
 //===== Compatible With: ==========================================
 //= Any eAthena Version
 //===== Description: ==============================================
@@ -72,8 +72,6 @@
 // - Old Dungeon fee system removed, all dungeon fees now set to 0
 //-2.0b
 // - Special warpname menu option name bug fixed
-//-2.1
-// - Removed Duplicates [Silent]
 //=================================================================
 
 //========================Function=&=Script========================
@@ -1869,274 +1867,274 @@ binget:
 }
 //============================Warpras==============================
 
-alb2trea.gat,73,101,4	script	Warpra#01	113,{
+alb2trea.gat,73,101,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-ama_fild01.gat,178,325,1	script	Warpra#02	113,{
+ama_fild01.gat,178,325,1	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-gef_fild10.gat,71,339,4	script	Warpra#03	113,{
+gef_fild10.gat,71,339,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-izlu2dun.gat,104,82,4	script	Warpra#04	113,{
+izlu2dun.gat,104,82,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-mjolnir_02.gat,85,363,4	script	Warpra#05	113,{
+mjolnir_02.gat,85,363,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_fild04.gat,207,331,4	script	Warpra#06	113,{
+moc_fild04.gat,207,331,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_fild19.gat,106,97,4	script	Warpra#07	113,{
+moc_fild19.gat,106,97,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_ruins.gat,64,166,4	script	Warpra#08	113,{
+moc_ruins.gat,64,166,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-niflheim.gat,197,192,3	script	Warpra#09	113,{
+niflheim.gat,197,192,3	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-pay_arche.gat,39,135,4	script	Warpra#10	113,{
+pay_arche.gat,39,135,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-prt_fild05.gat,273,215,4	script	Warpra#11	113,{
+prt_fild05.gat,273,215,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-tur_dun01.gat,148,239,4	script	Warpra#12	113,{
+tur_dun01.gat,148,239,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-valkyrie.gat,48,35,8	script	Warpra#13	113,{
+valkyrie.gat,48,35,8	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
-yuno_fild03.gat,37,135,4	script	Warpra#14	113,{
+yuno_fild03.gat,37,135,4	script	Warpra	113,{
 	callfunc "Q_Warpra",1;
 }
 
-alberta.gat,32,240,4	script	Warpra#15	113,{
+alberta.gat,32,240,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",1,"Alberta Town";
 	close;
 }
-aldebaran.gat,146,118,4	script	Warpra#16	113,{
+aldebaran.gat,146,118,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",2,"Aldebaran Town";
 	close;
 }
-ayothaya.gat,216,171,5	script	Warpra#17	113,{
+ayothaya.gat,216,171,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",4,"Ayotaya Town";
 	close;
 }
-amatsu.gat,193,81,1	script	Warpra#18	113,{
+amatsu.gat,193,81,1	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",3,"Amatsu Town";
 	close;
 }
-comodo.gat,195,158,4	script	Warpra#19	113,{
+comodo.gat,195,158,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",5,"Comodo Town";
 	close;
 }
-einbroch.gat,229,196,5	script	Warpra#20	113,{
+einbroch.gat,229,196,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",7,"Einbroch Town";
 	close;
 }
-einbech.gat,173,131,5	script	Warpra#21	113,{
+einbech.gat,173,131,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",6,"Einbech Town";
 	close;
 }
-geffen.gat,116,66,4	script	Warpra#22	113,{
+geffen.gat,116,66,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",8,"Geffen Town";
 	close;
 }
-gonryun.gat,152,130,4	script	Warpra#23	113,{
+gonryun.gat,152,130,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",9,"Gonryun Town";
 	close;
 }
-hugel.gat,90,127,5	script	Warpra#24	113,{
+hugel.gat,90,127,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",10,"Hugel Town";
 	close;
 }
-jawaii.gat,107,182,5	script	Warpra#25	113,{
+jawaii.gat,107,182,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",12,"Jawaii Town";
 	close;
 }
-izlude.gat,132,116,4	script	Warpra#26	113,{
+izlude.gat,132,116,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",11,"Izlude Town";
 	close;
 }
-lighthalzen.gat,153,100,5	script	Warpra#27	113,{
+lighthalzen.gat,153,100,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",13,"Lighthalzen Town";
 	close;
 }
-louyang.gat,211,106,4	script	Warpra#28	113,{
+louyang.gat,211,106,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",14,"Louyang Town";
 	close;
 }
-morocc.gat,157,95,4	script	Warpra#29	113,{
+morocc.gat,157,95,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",16,"Morroc Town";
 	close;
 }
-nif_fild01.gat,319,77,1	script	Warpra#30	113,{
+nif_fild01.gat,319,77,1	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",17,"Niflheim Town";
 	close;
 }
-payon.gat,183,110,4	script	Warpra#31	113,{
+payon.gat,183,110,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",18,"Payon Town";
 	close;
 }
-prontera.gat,147,172,5	script	Warpra#32	113,{
+prontera.gat,147,172,5	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",0,"Prontera Town";
 	close;
 }
-umbala.gat,133,130,4	script	Warpra#33	113,{
+umbala.gat,133,130,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",19,"Umbala Town";
 	close;
 }
-xmas.gat,151,136,4	script	Warpra#34	113,{
+xmas.gat,151,136,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",15,"Lutie Town";
 	close;
 }
-yuno.gat,138,162,4	script	Warpra#35	113,{
+yuno.gat,138,162,4	script	Warpra	113,{
 	callfunc "QWS_Town_Warpra",20,"Yuno Town";
 	close;
 }
 
-abyss_02.gat,274,266,1	script	Warpra#36	113,{
+abyss_02.gat,274,266,1	script	Warpra	113,{
 	callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake";
 	close;
 }
 
-ama_dun02.gat,192,118,5	script	Warpra Helper#01	112,{
+ama_dun02.gat,192,118,5	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon";
 	close;
 }
 
-anthell02.gat,170,165,3	script	Warpra Helper#02	112,{
+anthell02.gat,170,165,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon";
 	close;
 }
 
-ayo_dun02.gat,258,193,5	script	Warpra Helper#03	112,{
+ayo_dun02.gat,258,193,5	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon";
 	close;
 }
 
-ein_dun02.gat,292,282,1	script	Warpra Helper#04	112,{
+ein_dun02.gat,292,282,1	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon";
 	close;
 }
 
-iz_dun03.gat,202,47,2	script	Warpra Helper#05	112,{
+iz_dun03.gat,202,47,2	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon";
 	close;
 }
 
-c_tower3.gat,129,106,4	script	Warpra Helper#06	112,{
+c_tower3.gat,129,106,4	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon";
 	close;
 }
 
-mjo_dun02.gat,39,25,4	script	Warpra Helper#07	112,{
+mjo_dun02.gat,39,25,4	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon";
 	close;
 }
 
-prt_sewb2.gat,176,30,3	script	Warpra Helper#08	112,{
+prt_sewb2.gat,176,30,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon";
 	close;
 }
 
-gefenia03.gat,137,34,0	script	Warpra Helper#09	112,{
+gefenia03.gat,137,34,0	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon";
 	close;
 }
 
-gef_dun02.gat,218,61,2	script	Warpra Helper#10	112,{
+gef_dun02.gat,218,61,2	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon";
 	close;
 }
 
-glast_01.gat,371,308,3	script	Warpra Helper#11	112,{
+glast_01.gat,371,308,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon";
 	close;
 }
 
-gon_dun01.gat,167,273,4	script	Warpra Helper#12	112,{
+gon_dun01.gat,167,273,4	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon";
 	close;
 }
 
-juperos_02.gat,127,154,5	script	Warpra Helper#13	112,{
+juperos_02.gat,127,154,5	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave";
 	close;
 }
 
-kh_dun01.gat,14,224,3	script	Warpra Helper#14	112,{
+kh_dun01.gat,14,224,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon";
 	close;
 }
 
-lhz_dun02.gat,156,151,5	script	Warpra Helper#15	112,{
+lhz_dun02.gat,156,151,5	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab";
 	close;
 }
 
-lou_dun02.gat,168,264,4	script	Warpra Helper#16	112,{
+lou_dun02.gat,168,264,4	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon";
 	close;
 }
 
-mag_dun02.gat,46,41,3	script	Warpra Helper#17	112,{
+mag_dun02.gat,46,41,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon";
 	close;
 }
 
-odin_tem01.gat,115,148,3	script	Warpra Helper#18	112,{
+odin_tem01.gat,115,148,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",18,"Odin Temple";
 	close;
 }
 
-orcsdun01.gat,185,11,3	script	Warpra Helper#19	112,{
+orcsdun01.gat,185,11,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon";
 	close;
 }
 
-pay_dun03.gat,162,143,3	script	Warpra Helper#20	112,{
+pay_dun03.gat,162,143,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon";
 	close;
 }
 
-moc_pryd02.gat,101,95,3	script	Warpra Helper#21	112,{
+moc_pryd02.gat,101,95,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon";
 	close;
 }
 
-in_sphinx2.gat,274,268,1	script	Warpra Helper#22	112,{
+in_sphinx2.gat,274,268,1	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon";
 	close;
 }
 
-tha_t07.gat,111,162,3	script	Warpra Helper#23	112,{
+tha_t07.gat,111,162,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower";
 	close;
 }
 
-treasure02.gat,104,40,3	script	Warpra Helper#24	112,{
+treasure02.gat,104,40,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon";
 	close;
 }
 
-xmas_dun02.gat,124,131,3	script	Warpra Helper#25	112,{
+xmas_dun02.gat,124,131,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon";
 	close;
 }
 
-um_dun02.gat,44,28,3	script	Warpra Helper#26	112,{
+um_dun02.gat,44,28,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon";
 	close;
 }
 
-tur_dun02.gat,162,23,3	script	Warpra Helper#27	112,{
+tur_dun02.gat,162,23,3	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon";
 	close;
 }
-prt_maze02.gat,102,69,4	script	Warpra Helper#28	112,{
+prt_maze02.gat,102,69,4	script	Warpra Helper	112,{
 	callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon";
 	close;
 }

npc/custom/eAAC_Scripts/vendmachine.txt

@@ -1,12 +1,10 @@
 //=====================================
 // Vending Machine Script
-// v2.4
+// v2.3
 //=====================================
 // by Celestria
 //=====================================
 // Changelog:
-// 2.4 - Removed Duplicates [Silent]
-//
 // 2.3 - Added in "Slam" feature, as well as admin ability to turn machine on and off.
 // - Added admin menu. Allows GMs to put machines in/out of service, and to clear
 // all jammed items.
@@ -295,4 +293,4 @@ R_Item:
 		close;}
 	mes "The machine shakes, but nothing happens";
 	close;
-}
+}

npc/merchants/inn.txt

@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -23,6 +23,9 @@
 //= to arguments.[kobra_k88]
 //= 1.2 Rewrote inn script [Playtester]
 //= 1.3 Removed Duplicates [Silent]
+//= 1.4 Added Rachel Inn. Temporal NPC getarg(0) and warp location,
+//= 	  but the location and sprites are correct. Special thanks
+//=	  to RockmanEXE for the information. [erKURITA]
 //============================================================ 
 
 
@@ -82,6 +85,13 @@ morocc_in.gat,80,100,5	script	Inn Maid::Shala	53,{
 	warp "morocc_in.gat",74,128;
 }
 
+//======================== Rachel ====================================
+ra_in01.gat,376,69,4	script	Inn Keeper	931,{
+
+	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01.gat",375,58;
+	warp "ra_in01.gat",384,128;
+}
+
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);
@@ -105,7 +115,6 @@ function	script	F_InnMaid	{
 		mes "I hope you";
 		mes "enjoy your rest~";
 		close2;
-
 		set Zeny,Zeny - 5000;
 		percentheal 100,100;
 		return;

npc/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=	  shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
 //= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
 //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
+//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
 //============================================================ 
 
 
@@ -267,6 +268,15 @@ prt_in.gat,171,140,1	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:
 //prt_in.gat,56,69,4	shop	Miner	48,1010:-1,1011:-1
 prt_in.gat,164,140,4	shop	Weapon Dealer	66,1146:-1,1245:-1
 
+//=======================================================
+//RACHEL
+//=======================================================
+ra_in01.gat,175,364,3	shop	Armor Dealer	919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
+ra_in01.gat,254,300,3	shop	Tool Dealer	931,512:-1,513:-1
+ra_in01.gat,257,269,3	shop	Tool Dealer	919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
+ra_in01.gat,176,389,3	shop	Weapon Dealer	931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1
+rachel.gat,65,80,0	shop	Vegetable Gardener	919,515:-1,535:-1,516:-1
+
 //=======================================================
 //TURTLE ISLAND
 //=======================================================

npc/warps/cities/rachel.txt

@@ -1,3 +1,56 @@
+//===== Athena Script ========================================
+//= Rachel Warp Script
+//===== By: ==================================================
+//= erKURITA & RockmanEXE
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Rachel City, shops & other locations
+//===== Additional Comments: =================================
+//= 1.0 Added the official warps and commented out the 
+//= 	  "custom duplicates" for future checkout. Special thanks
+//= 	  to RockmanEXE who provided all the info. [erKURITA]
+//============================================================
+
+//| Official warps under this comment. Needs separation though...
+//| There are a few warps missing that will be done soon.
+
+ra_in01.gat,172,392,0	warp	rachel01	1,1,rachel.gat,42,114
+rachel.gat,42,87,0	warp	rachel02	1,1,ra_in01.gat,171,359
+rachel.gat,42,109,0	warp	rachel03	1,1,ra_in01.gat,171,389
+ra_in01.gat,171,355,0	warp	rachel04	1,1,rachel.gat,42,82 
+rachel.gat,83,78,0	warp	rachel05	1,1,ra_in01.gat,249,266
+ra_in01.gat,249,262,0	warp	rachel05	1,1,rachel.gat,83,75
+rachel.gat,115,149,0	warp	rachel06	1,1,ra_in01.gat,386,43
+ra_in01.gat,386,40,0	warp	rachel07	1,1,rachel.gat,115,144
+ra_in01.gat,165,369,0	warp	rachel10	1,1,ra_in01.gat,122,334
+ra_in01.gat,126,334,0	warp	rachel11	1,1,ra_in01.gat,169,369
+ra_in01.gat,178,370,0	warp	rachel12	1,1,ra_in01.gat,113,385
+ra_in01.gat,109,385,0	warp	rachel13	1,1,ra_in01.gat,174,370
+ra_in01.gat,357,61,0	warp	rachel15	1,1,ra_in01.gat,310,62
+ra_in01.gat,314,62,0	warp	rachel16	1,1,ra_in01.gat,361,61
+ra_in01.gat,309,70,0	warp	rachel17	1,1,rachel.gat,108,175
+rachel.gat,105,171,0	warp	rachel18	1,1,ra_in01.gat,309,65
+ra_in01.gat,297,59,0	warp	rachel19	1,1,ra_in01.gat,339,116
+ra_in01.gat,339,120,0	warp	rachel20	1,1,ra_in01.gat,297,63
+ra_in01.gat,375,109,0	warp	rachel21	1,1,rachel.gat,116,154
+rachel.gat,116,158,0	warp	rachel22	1,1,ra_in01.gat,375,114
+ra_in01.gat,135,286,0	warp	rachel22	1,1,rachel.gat,216,164
+rachel.gat,216,160,0	warp	rachel23	1,1,ra_in01.gat,135,282
+ra_in01.gat,213,79,0	warp	rachel24	1,1,rachel.gat,108,195
+rachel.gat,108,200,0	warp	rachel25	1,1,ra_in01.gat,213,83
+ra_in01.gat,192,152,0	warp	rachel26	1,1,rachel.gat,90,193
+rachel.gat,90,189,0	warp	rachel27	1,1,ra_in01.gat,192,148
+rachel.gat,25,125,0	warp	rachel28	1,1,ra_fild11.gat,353,226
+ra_fild12.gat,36,225,0	warp	rachel29	1,1,rachel.gat,270,125
+//
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~ Custom warps starts here ~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 //Rachel Sanctuary Sky Map
 ra_temsky.gat,99,117,0	warp	rasky001	1,1,ra_temsky.gat,99,140
 ra_temsky.gat,99,135,0	warp	rasky002	1,1,ra_temsky.gat,99,112
@@ -6,11 +59,6 @@ ra_temsky.gat,137,139,0	warp	rasky004	1,1,ra_temsky.gat,108,143
 ra_temsky.gat,87,143,0	warp	rasky005	1,1,ra_temsky.gat,58,139
 ra_temsky.gat,62,139,0	warp	rasky004	1,1,ra_temsky.gat,91,143
 
-//Rachel City
-rachel.gat,149,249,0	warp	rachel001	1,1,ra_temple.gat,119,28
-rachel.gat,273,125,0	warp	rachel009	1,1,ra_fild12.gat,41,225
-rachel.gat,25,125,0	warp	rachel010	1,1,ra_fild11.gat,357,225
-
 //Rachel Temple
 ra_temple.gat,119,21,0	warp	rachel002	1,1,rachel.gat,149,244
 ra_temple.gat,119,181,0	warp	rachel003	1,1,ra_temin.gat,169,22
@@ -20,7 +68,6 @@ ra_temin.gat,312,252,0	warp	rachel006	1,1,ra_temin.gat,206,88
 ra_temin.gat,130,93,0	warp	rachel007	1,1,ra_temin.gat,238,257
 ra_temin.gat,238,252,0	warp	rachel008	1,1,ra_temin.gat,130,88
 
-
 ra_temin.gat,276,326,0	script	Statue#Rachel	111,{
 	mes "Welcome to the temporary Rachel";
 	mes "Sanctuary entrance npc!";
@@ -36,44 +83,33 @@ ra_temin.gat,276,326,0	script	Statue#Rachel	111,{
 	close;
 }
 
-//=========================================
-//==        RACHEL INTERIOR WARPS        ==
-//=========================================
-//-- v 1.0                               --
-//-- by Celestria                        --
-//--                                     --
-//-- Note: All warps temporary until     --
-//-- Rachel is added to kRO.             --
-//-----------------------------------------
-
-
 //== WEAPON SHOP ==========================
-rachel.gat,42,108,0	warp	ra_in001	2,2,ra_in01.gat,171,389
-ra_in01.gat,171,393,0	warp	ra_in001a	2,2,rachel.gat,41,112
-rachel.gat,42,88,0	warp	ra_in002	2,2,ra_in01.gat,171,358
-ra_in01.gat,171,354,0	warp	ra_in002a	2,2,rachel.gat,42,84
-ra_in01.gat,179,370,0	warp	ra_in003	2,2,ra_in01.gat,112,385
-ra_in01.gat,108,385,0	warp	ra_in003a	2,2,ra_in01.gat,175,370
-ra_in01.gat,164,370,0	warp	ra_in004	2,2,ra_in01.gat,123,334
-ra_in01.gat,127,334,0	warp	ra_in004a	2,2,ra_in01.gat,168,370
+//rachel.gat,42,108,0	warp	ra_in001	2,2,ra_in01.gat,171,389
+//ra_in01.gat,171,393,0	warp	ra_in001a	2,2,rachel.gat,41,112
+//rachel.gat,42,88,0	warp	ra_in002	2,2,ra_in01.gat,171,358
+//ra_in01.gat,171,354,0	warp	ra_in002a	2,2,rachel.gat,42,84
+//ra_in01.gat,179,370,0	warp	ra_in003	2,2,ra_in01.gat,112,385
+//ra_in01.gat,108,385,0	warp	ra_in003a	2,2,ra_in01.gat,175,370
+//ra_in01.gat,164,370,0	warp	ra_in004	2,2,ra_in01.gat,123,334
+//ra_in01.gat,127,334,0	warp	ra_in004a	2,2,ra_in01.gat,168,370
 
 //== ITEM SHOP ============================
-rachel.gat,83,179,0	warp	ra_in005	2,2,ra_in01.gat,249,264
-ra_in01.gat,249,260,0	warp	ra_in005a	2,2,rachel.gat,83,74
-ra_in01.gat,240,300,0	warp	ra_in006	2,2,ra_in01.gat,193,312
-ra_in01.gat,195,312,0	warp	ra_in006a	2,2,ra_in01.gat,244,300
+//rachel.gat,83,179,0	warp	ra_in005	2,2,ra_in01.gat,249,264
+//ra_in01.gat,249,260,0	warp	ra_in005a	2,2,rachel.gat,83,74
+//ra_in01.gat,240,300,0	warp	ra_in006	2,2,ra_in01.gat,191,312
+//ra_in01.gat,195,312,0	warp	ra_in006a	2,2,ra_in01.gat,244,300
 
 //== INN ==================================
-rachel.gat,115,149,0	warp	ra_in007	2,2,ra_in01.gat,386,42
-ra_in01.gat,386,38,0	warp	ra_in007a	2,2,rachel.gat,115,145
-rachel.gat,116,158,0	warp	ra_in008	2,2,ra_in01.gat,375,111
-ra_in01.gat,375,108,0	warp	ra_in008a	2,2,rachel.gat,116,155
-rachel.gat,105,170,0	warp	ra_in009	2,2,ra_in01.gat,310,67
-ra_in01.gat,310,71,0	warp	ra_in009a	2,2,rachel.gat,105,175
-ra_in01.gat,356,61,0	warp	ra_in010	2,2,ra_in01.gat,311,62
-ra_in01.gat,315,62,0	warp	ra_in010a	2,2,ra_in01.gat,360,61
-ra_in01.gat,297,58,0	warp	ra_in011	2,2,ra_in01.gat,340,117
-ra_in01.gat,338,120,0	warp	ra_in011a	2,2,ra_in01.gat,297,62
+//rachel.gat,115,149,0	warp	ra_in007	2,2,ra_in01.gat,386,42
+//ra_in01.gat,386,38,0	warp	ra_in007a	2,2,rachel.gat,115,145
+//rachel.gat,116,158,0	warp	ra_in008	2,2,ra_in01.gat,375,111
+//ra_in01.gat,375,108,0	warp	ra_in008a	2,2,rachel.gat,116,155
+//rachel.gat,105,170,0	warp	ra_in009	2,2,ra_in01.gat,310,67
+//ra_in01.gat,310,71,0	warp	ra_in009a	2,2,rachel.gat,105,175
+//ra_in01.gat,356,61,0	warp	ra_in010	2,2,ra_in01.gat,311,62
+//ra_in01.gat,315,62,0	warp	ra_in010a	2,2,ra_in01.gat,360,61
+//ra_in01.gat,297,58,0	warp	ra_in011	2,2,ra_in01.gat,340,117
+//ra_in01.gat,338,120,0	warp	ra_in011a	2,2,ra_in01.gat,297,62
 
 
 //== HOUSES ===============================
@@ -83,4 +119,4 @@ ra_in01.gat,293,372,0	warp	ra_in013	2,2,ra_in01.gat,225,379
 ra_in01.gat,220,379,0	warp	ra_in013a	2,2,ra_in01.gat,289,372
 ra_in01.gat,313,374,0	warp	ra_in014	2,2,ra_in01.gat,358,373
 ra_in01.gat,354,373,0	warp	ra_in014a	2,2,ra_in01.gat,308,374
-//-----------------------------------------
+