diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-08 20:53:35 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-08 20:53:35 +0000 |
| commit | 4dabf8bbf64098d5ec9d260bb0203626a9378703 (patch) | |
| tree | a5741157fce1b707f915fabb32724a8908b4d577 /npc | |
| parent | b14a29b01e52692e95fcabfc387e9300a8f98845 (diff) | |
| download | hercules-4dabf8bbf64098d5ec9d260bb0203626a9378703.tar.gz hercules-4dabf8bbf64098d5ec9d260bb0203626a9378703.tar.bz2 hercules-4dabf8bbf64098d5ec9d260bb0203626a9378703.tar.xz hercules-4dabf8bbf64098d5ec9d260bb0203626a9378703.zip | |
Removed unofficial inn maid from Alberta.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13053 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/merchants/inn.txt | 14 |
2 files changed, 5 insertions, 10 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 643a6bb9f..3b8c6bde6 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,7 @@ Date Added ====== 2008/08/08 + * Rev. 103053 Removed unofficial inn maid from Alberta. [L0en_W0lf] * Rev. 13052 Slew up NPC bug fixes and other updates. [L0ne_W0lf] - Corrected item checking in Dancer job quest. (buggreport:1987) - Fixed infinite dialog in novice grounds. (buggreport:1998) 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,{ |