summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-17 15:05:06 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-17 15:05:06 +0000
commit89260738c3fc8bae908442578bc884c61919487b (patch)
tree0bcc64505c33a95fa62799b58d6e56d4fe393481 /npc
parent300c03ec02aadbe88ecfe51b4c021a49b98e3533 (diff)
downloadhercules-89260738c3fc8bae908442578bc884c61919487b.tar.gz
hercules-89260738c3fc8bae908442578bc884c61919487b.tar.bz2
hercules-89260738c3fc8bae908442578bc884c61919487b.tar.xz
hercules-89260738c3fc8bae908442578bc884c61919487b.zip
Now the Inns are like on official servers
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6631 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/merchants/inn.txt52
2 files changed, 4 insertions, 50 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 35aaf4e4d..6a971d4fa 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,8 @@ Evera
Date Added
======
+05/17
+ * Now the Inns are like on official servers [Playtester]
05/15
* Fixed DTS warper, optimized Kafra and changed pay cave and orc village kafra [Evera]
* Fixed Amon Ra's spawning location [Playtester]
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 7ed539ef8..03663f7ff 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -30,25 +30,13 @@
prt_in.gat,244,135,2 script Inn Maid::Sammy 53,{
callfunc "F_InnMaid","[Sammy]","West Inn","prt_in.gat",238,130;
- addtimer 3900, "Sammy::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "prt_in.gat",237,102;
- sc_end SC_BLIND;
- end;
}
// East Side Inn ------------------
prt_in.gat,61,141,2 script Inn Maid::Ahlma 53,{
callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in.gat",64,136;
- addtimer 3900, "Ahlma::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "prt_in.gat",49,173;
- sc_end SC_BLIND;
- end;
}
//======================== Alberta ====================================
@@ -56,51 +44,27 @@ OnTimerWarp:
alberta_in.gat,32,142,5 script Inn Maid::Moira 53,{
callfunc "F_InnMaid","[Moira]","North Inn","alberta_in.gat",26,138;
- addtimer 3900, "Moira::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "alberta_in.gat",18,188;
- sc_end SC_BLIND;
- end;
}
// South -----------------------------
alberta_in.gat,55,142,8 script Inn Maid::Tina 53,{
callfunc "F_InnMaid","[Tina]","South Inn","alberta_in.gat",60,140;
- addtimer 3900, "Tina::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "alberta_in.gat",68,188;
- sc_end SC_BLIND;
- end;
}
//====================== Geffen ======================================
geffen_in.gat,70,64,5 script Inn Maid::Betty 53,{
callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in.gat",74,60;
- addtimer 3900, "Betty::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "geffen_in.gat",106,106;
- sc_end SC_BLIND;
- end;
}
//======================= Payon ======================================
payon_in01.gat,131,62,5 script Inn Maid::SunHee 53,{
callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01.gat",132,56;
- addtimer 3900, "SunHee::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "payon_in01.gat",140,15;
- sc_end SC_BLIND;
- close;
}
//======================== Morocc ====================================
@@ -108,25 +72,13 @@ OnTimerWarp:
morocc_in.gat,147,138,5 script Inn Maid::Suzie 53,{
callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in.gat",142,140;
- addtimer 3900, "Suzie::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "morocc_in.gat",174,144;
- sc_end SC_BLIND;
- end;
}
// South --------------------------------
morocc_in.gat,80,100,5 script Inn Maid::Shala 53,{
callfunc "F_InnMaid","[Shala]","South Inn","morocc_in.gat",78,95;
- addtimer 3900, "Shala::OnTimerWarp";
- close;
-
-OnTimerWarp:
warp "morocc_in.gat",74,128;
- sc_end SC_BLIND;
- end;
}
//======================= Inn Function ==============================
@@ -151,9 +103,9 @@ function script F_InnMaid {
mes "Thank you.";
mes "I hope you";
mes "enjoy your rest~";
-
+ close2;
+
set Zeny,Zeny - 5000;
- sc_start SC_BLIND,500000,1;
percentheal 100,100;
return;