* 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

2 files changed, 22 insertions, 3 deletions

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 218fc5d1b..b6dea80c5 100644
--- a/npc/merchants/inn.txt
+++ b/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;

diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 9c829471b..0e391b382 100644
--- a/npc/merchants/shops.txt
+++ b/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]

 //============================================================ 

 

 

@@ -268,6 +269,15 @@ prt_in.gat,171,140,1	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:
 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

 //=======================================================

 tur_dun01.gat,158,54,6	shop	Tool Dealer	99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,645:-1,656:-1