From 4dabf8bbf64098d5ec9d260bb0203626a9378703 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 8 Aug 2008 20:53:35 +0000 Subject: Removed unofficial inn maid from Alberta. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13053 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/merchants/inn.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'npc/merchants') diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index faf41aeaf..90da9bada 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== -//= 2.5 +//= 2.6 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -40,6 +40,7 @@ //= 2.3 Added Lighthalzen Inn from Lighthalzen town file. [L0ne_W0lf] //= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. //= 2.5 Added Moskovia Gostinitsa (Inn) from jA +//= 2.6 Updated Alberta inn to official. [L0ne_W0lf] //============================================================ @@ -58,18 +59,11 @@ prt_in,61,141,2 script Inn Employee#Ahlma 53,{ } //======================== Alberta ==================================== -// North -------------------------- -alberta_in,32,142,5 script Inn Maid#Moira 53,{ +alberta_in,32,142,3 script Inn Employee#Moira 53,{ - callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138; + callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142; warp "alberta_in",18,188; end; } -// South ----------------------------- -alberta_in,55,142,8 script Inn Maid#Tina 53,{ - - callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140; - warp "alberta_in",68,188; end; -} //====================== Geffen ====================================== geffen_in,70,64,5 script Inn Employee#Cena 53,{ -- cgit v1.2.3-70-g09d2