summaryrefslogtreecommitdiff
path: root/world/map/npc/functions/ferry.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/functions/ferry.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/functions/ferry.txt')
-rw-r--r--world/map/npc/functions/ferry.txt18
1 files changed, 17 insertions, 1 deletions
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index dd3e83d8..0b66f68e 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -1,10 +1,12 @@
// The ferry system
-function|script|Ferry|{
+function|script|Ferry|,
+{
if (BaseLevel < 20)
goto L_LowerCost;
set @cost_tulimshar, 500;
set @cost_hurnscald, 500;
+ set @cost_nivalis, 500;
L_Start:
set @cost_candor, 1500;
@@ -19,6 +21,7 @@ L_PlainMenu:
menu
"Tulimshar (" + @cost_tulimshar + "GP)", L_Tulimshar,
"Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
+ "Nivalis (" + @cost_nivalis + "GP)", L_Nivalis,
"Nevermind", -;
goto L_Close;
@@ -26,6 +29,7 @@ L_MenuWithCandor:
menu
"Tulimshar (" + @cost_tulimshar + "GP)", L_Tulimshar,
"Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
+ "Nivalis (" + @cost_nivalis + "GP)", L_Nivalis,
"Candor (" + @cost_candor + "GP)", L_Candor,
"Nevermind", -;
goto L_Close;
@@ -50,6 +54,16 @@ L_Hurnscald:
warp "008-1.gat", 137, 64;
goto L_Close;
+L_Nivalis:
+ if (@loc == DOCK_nivalis)
+ goto L_AlreadyThere;
+ if (Zeny < @cost_nivalis)
+ goto L_NotEnoughGP;
+
+ set Zeny, Zeny - @cost_nivalis;
+ warp "031-1.gat", 95, 109;
+ goto L_Close;
+
L_Candor:
if (@loc == DOCK_candor)
goto L_AlreadyThere;
@@ -71,12 +85,14 @@ L_NotEnoughGP:
L_LowerCost:
set @cost_tulimshar, 250;
set @cost_hurnscald, 250;
+ set @cost_nivalis, 250;
goto L_Start;
L_Close:
set @cost_tulimshar, 0;
set @cost_hurnscald, 0;
set @cost_candor, 0;
+ set @cost_nivalis, 0;
set @loc, 0;
close;
}