* 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, 11 insertions, 2 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;