server side changes to the snow docks addition and related fixes

6 files changed, 10 insertions, 24 deletions

diff --git a/client-data b/client-data
-Subproject b38135de7aeb202331fbe9e398b169fab338f58
+Subproject dbcdffa7c9ba81c193cc1c9f501355afd99187c
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index 8b5b0d7f..9b33c24d 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index c8de7af8..7a1fc1cb 100644
--- a/world/map/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
@@ -4,5 +4,6 @@ map: 031-1.gat
 npc: npc/031-1/_mobs.txt
 npc: npc/031-1/_warps.txt
 npc: npc/031-1/angelaOutside.txt
+npc: npc/031-1/dock.txt
 npc: npc/031-1/frozenbeard.txt
 npc: npc/031-1/house.txt
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
new file mode 100644
index 00000000..c6a380d8
--- /dev/null
+++ b/world/map/npc/031-1/dock.txt
@@ -0,0 +1,6 @@
+// The ferry dock
+
+031-1.gat,105,109,0|script|#nivalisdock|45,6,1,{
+    set @loc, DOCK_nivalis;
+    callfunc "Ferry";
+}
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index a846c719..2f1adaae 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -1,6 +1,6 @@
 //
 
-031-1.gat,97,115,0|script|Frozenbeard|138,{
+031-1.gat,96,113,0|script|Frozenbeard|138,{
 //    if (QUEST_Easter12 == 2 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day)))
 //        menu
 //            "I need to find a way to go back home, can you help me?", L_Frozenbeard_Default,
@@ -8,28 +8,7 @@
 
 L_Frozenbeard_Default:
     mes "[Frozenbeard]";
-    mes "\"Arrr mate! There is no dock here, so I had to row boat from my ship!  I am pioneering and mapping the trade route between Nivalis and the rest of the World.  I'll hail my shipmates to send a boat and we'll sail anywhere you want to go, we will be there in no time, but it will cost you a fee.";
-    set @loc, DOCK_nivalis;
-    callfunc "Ferry";
-    close;
-
-L_Frozenbeard_Argaes:
-    if (Zeny < 500)
-        goto L_NoMoney;
-    mes "[Frozenbeard]";
-    mes "\"Pleasant Journeys!\"";
-    set Zeny, Zeny-500;
-    warp "008-1.gat",137,64;
-    close;
-
-L_Frozenbeard_Stay:
-    mes "[Frozenbeard]";
-    mes "\"Suit yourself.  Feel free to come out here anytime, I am really busy making sure these routes are accurate.\"";
-    close;
-
-L_NoMoney:
-    mes "[Frozenbeard]";
-    mes "\"You need more money.  I'll wait here while you get some.\"";
+    mes "\"Arrr mate! I'm glad there's a dock here, so I don't have to row boat from my ship anymore!  I pioneered the trade routes between Nivalis and the rest of the World, so now merchants and adventurers can travel to and fro without any hassle other than the harsh weather up here, yarr.\"";
     close;
 
 // lines below here belong to Easter 2012
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 1b03011a..43412026 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -60,7 +60,7 @@ L_Nivalis:
         goto L_NotEnoughGP;
 
     set Zeny, Zeny - @cost_nivalis;
-    warp "031-1.gat", 95, 118;
+    warp "031-1.gat", 95, 109;
     goto L_Close;
 
 L_Candor: