summaryrefslogtreecommitdiff
path: root/npc/merchants/inn.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/merchants/inn.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/merchants/inn.txt')
-rw-r--r--npc/merchants/inn.txt26
1 files changed, 13 insertions, 13 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 7c4935942..3c5c1874b 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,5 +1,5 @@
//===== Hercules Script ======================================
-//= Inn NPCs
+//= Inn Npcs
//===== By: ==================================================
//= Darkchild (1.1)
//= Playtester (1.2)
@@ -21,7 +21,7 @@
//= to arguments.[kobra_k88]
//= 1.2 Rewrote inn script [Playtester]
//= 1.3 Added (finally) Rachel Inn Maid. Official warp
-//= and save points[erKURITA]
+//= and save points[erKURITA]
//= 1.4 Added Hugel inn [erKurita]
//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
//= - Small corrections to the prontera Inns.
@@ -46,7 +46,7 @@
//============================================================
-//======================== Prontera ===================================
+//========================Prontera ===================================
// West Side Inn -------------------
prt_in,244,135,2 script Inn Employee#Sammy 53,{
@@ -60,28 +60,28 @@ prt_in,61,141,2 script Inn Employee#Ahlma 53,{
warp "prt_in",60,166; end;
}
-//======================== Alberta ====================================
+//========================Alberta ====================================
alberta_in,32,142,3 script Inn Employee#Jennie 53,{
callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
warp "alberta_in",18,188; end;
}
-//====================== Geffen ======================================
+//======================Geffen ======================================
geffen_in,70,64,5 script Inn Employee#Cena 53,{
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 ======================================
+//=======================Payon ======================================
payon_in01,132,62,5 script Inn Employee#Ahee 53,{
callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
warp "payon_in01",132,11; end;
}
-//======================== Morocc ====================================
+//========================Morocc ====================================
// North East --------------------------
/*
morocc_in,147,141,3 script Inn Employee#Hasna 53,{
@@ -97,21 +97,21 @@ morocc_in,80,100,5 script Inn Employee#Manar 53,{
}
*/
-//====================== Aldebaran ===================================
+//======================Aldebaran ===================================
aldeba_in,92,58,5 script Inn Maid#Rilim 53,{
callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
warp "aldeba_in",92,112; end;
}
-//======================== Rachel ====================================
+//========================Rachel ====================================
ra_in01,376,69,4 script Inn Keeper#Annie 931,{
callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
warp "ra_in01",384,128; end;
}
-//====================== Lighthalzen =================================
+//======================Lighthalzen =================================
lhz_in02,230,284,4 script Hotel Employee#01 86,{
mes "[Hotel Employee]";
mes "Welcome to";
@@ -156,14 +156,14 @@ lhz_in02,230,284,4 script Hotel Employee#01 86,{
}
}
-//======================== Hugel ====================================
+//========================Hugel ====================================
hu_in01,246,107,3 script Inn Maid#Receptionist 53,{
callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
warp "hu_in01",267,5; end;
}
-//======================== Veins ====================================
+//========================Veins ====================================
ve_in,157,219,5 script Inn Master#Receptionist 709,{
mes "[Inn Master]";
mes "Good day~";
@@ -201,7 +201,7 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{
}
}
-//======================= Inn Function ==============================
+//=======================Inn Function ==============================
function script F_InnMaid {
mes getarg(0);
mes "Welcome to";