Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

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;
 }