summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-06 20:21:43 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-06 20:21:43 +0000
commitc87c721fe0cdcb1c7bfa660dbe87fe3126ec7531 (patch)
treeb46079b7329b03916bd11c365872c7c985b2d2b6 /npc/merchants
parent180c626bef428190edbcd8a8a6d1ef1ef03ce808 (diff)
downloadhercules-c87c721fe0cdcb1c7bfa660dbe87fe3126ec7531.tar.gz
hercules-c87c721fe0cdcb1c7bfa660dbe87fe3126ec7531.tar.bz2
hercules-c87c721fe0cdcb1c7bfa660dbe87fe3126ec7531.tar.xz
hercules-c87c721fe0cdcb1c7bfa660dbe87fe3126ec7531.zip
* Updated Juno and Comodo NPCs.
- Updated Monster Museum NPCs as well. - Updated doomed swords quest, moved unrelated NPCs to proper files. - Added the end of the Comodo and Juno doomed swords quests. * Fixed "[Kafra Employee]" being shown twice at one instance. * Fixed the Geffen Inn NPC. * Updated the NPC names for the Geffen Kafra. * Updated the PVP script to official. Includes Event mode. - Added warps for the PVP Cross room. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10858 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/inn.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index d51ceea57..6f5edbedb 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
//= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -28,9 +28,10 @@
//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
//= - Small corrections to the prontera Inns.
//= - Removed the Cancel dialog.
-//= 1.6 More fixed, changed progression of "Rest"ing.
+//= 1.6 More fixes, changed progression of "Rest"ing.
//= - Corrected Morroc NPCs. [L0ne_W0lf]
//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
+//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
//============================================================
@@ -63,10 +64,10 @@ alberta_in,55,142,8 script Inn Maid::Tina 53,{
}
//====================== Geffen ======================================
-geffen_in,70,64,5 script Inn Maid::Betty 53,{
+geffen_in,70,64,5 script Inn Employee::Cena 53,{
- callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in",74,60;
- warp "geffen_in",106,106; end;
+ callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
+ warp "geffen_in",31,31; end;
}
//======================= Payon ======================================