* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7349 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 76 insertions, 40 deletions

diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index d779acf66..6fcb410a8 100644
--- a/npc/warps/cities/rachel.txt
+++ b/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

-//-----------------------------------------
\ No newline at end of file
+