From d39236e84fa896c0b809615399a6bd17e5071bfa Mon Sep 17 00:00:00 2001
From: Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 9 Nov 2006 09:30:36 +0000
Subject: fixed Lighthalzen, Swaltzwalt Quest Part 1, added Hugel-Bingo warps,
 added Airship mobs, fixed Hunte job quest typos, added pet shop into Light

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9182 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/merchants/inn.txt   | 10 +++++++++-
 npc/merchants/shops.txt |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'npc/merchants')

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index cf41d3a8c..1f30e8078 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: ========================================= 
@@ -24,6 +24,7 @@
 //= 1.2 Rewrote inn script [Playtester]
 //= 1.3 Added (finally) Rachel Inn Maid. Official warp
 //=	  and save points[erKURITA]
+//= 1.4 Added Hugel inn [erKurita]
 //============================================================ 
 
 
@@ -90,6 +91,13 @@ ra_in01.gat,376,69,4	script	Inn Keeper	931,{
 	warp "ra_in01.gat",384,128;
 }
 
+//======================== Hugel ====================================
+hu_in01.gat,246,107,3	script	Inn Maid::Receptionist	53,{
+
+	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01.gat",263,95;
+	warp "hu_in01",267,5;
+}
+
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index b9dd34cf6..67bbff1cb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9a
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -23,6 +23,7 @@
 //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
 //= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
 //= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
+//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
 //============================================================ 
 
 
@@ -169,6 +170,7 @@ lighthalzen.gat,69,75,5 	shop	Fruit Gardener	102,512:-1,513:-1
 lighthalzen.gat,112,44,8	shop	Flower Girl	90,712:-1,744:-1,748:-1
 lighthalzen.gat,126,126,4	shop	Food Seller	83,7456:-1,7452:-1
 lighthalzen.gat,124,129,8	shop	Vegetable Gardener	91,515:-1,516:-1,535:-1
+lighthalzen.gat,222,191,4	shop	Pet Merchant	125,537:-1,643:-1,10013:-1,10014:-1
 lhz_in02.gat,286,95,4	shop	Begginer's Merchant	62,1621:-1,5112:-1,2416:-1,2113:-1,2512:-1
 lhz_in02.gat,271,99,4	shop	Armor Dealer	851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
 lhz_in02.gat,276,99,4	shop	Weapon Dealer	851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1771:-1
-- 
cgit v1.2.3-70-g09d2