6 files changed, 17 insertions, 28 deletions
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/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 690b0456..829254ec 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -7,7 +7,8 @@
 031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob031-1::On1095
 
 
-031-1.gat,0,0,0|script|Mob031-1|-1,{
+031-1.gat,0,0,0|script|Mob031-1|-1,
+{
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 5e7017a8..c7384dae 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -4,8 +4,8 @@
 // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
 // state greater than 3: Angela invites and asks you to bring present boxes
 
-031-1.gat,79,24,0|script|Angela|195,{
-
+031-1.gat,79,24,0|script|Angela|195,
+{
     set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
     set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
 
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
new file mode 100644
index 00000000..d566c600
--- /dev/null
+++ b/world/map/npc/031-1/dock.txt
@@ -0,0 +1,7 @@
+// 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 c75d6f16..19ad560d 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -1,6 +1,7 @@
 //
 
-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,29 +9,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 here and Argaes, around the Hurnscald area.  I'll hail my shipmates to send a boat and we'll sail out to Argaes, be there in no time, but it will cost you a fee.  500 gold pieces.  What do you say?";
-    menu
-        "Sure.  (500 GP)", L_Frozenbeard_Argaes,
-        "Not right now.", L_Frozenbeard_Stay;
-    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/031-1/house.txt b/world/map/npc/031-1/house.txt
index b35d816f..3d250e4e 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -2,7 +2,8 @@
 // player can enter, if Cindy is already saved and the player has been invited, quest status > 2
 // author: Jenalya
 
-031-1.gat,95,80,0|script|#Door|45,0,0,{
+031-1.gat,95,80,0|script|#Door|45,0,0,
+{
     set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
     set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;