2 files changed, 48 insertions, 4 deletions
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
index 304d2068..ff7fa85a 100644
--- a/world/map/npc/031-1/dock.txt
+++ b/world/map/npc/031-1/dock.txt
@@ -1,8 +1,27 @@
 // The ferry dock
 
-031-1.gat,105,109,0|script|#nivalisdock|45,6,1,
+// Ferry Sign
+031-1.gat,95,107,0|script|Ferry Schedule#6|398,
 {
-    set @loc, DOCK_nivalis;
-    callfunc "Ferry";
+    callfunc "FerryManifest";
+    end;
+}
+
+031-1.gat,110,108,0|script|Nivalis Koga|395,6,2,
+{
+    callfunc "BoardFerry";
+    close;
+}
+
+031-1.gat,100,100,0|script|#NivalisDock|45,
+{
+    end;
+
+OnCommandArrive:
+    enablenpc "Nivalis Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Nivalis Koga";
     end;
 }
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index ce97650c..6a62a104 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -2,7 +2,32 @@
 
 031-1.gat,96,113,0|script|Frozenbeard|138,
 {
+
     mes "[Frozenbeard]";
-    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.\"";
+    mes "\"Yar! Do you need something, matey?\"";
+    goto L_Main;
+
+L_Main:
+    menu
+        "Can you explain the Ferry?", L_Explain,
+        "Nothing I guess", L_Close;
+
+L_Explain:
+    mes "[Frozenbeard]";
+    mes "\"Arrr mate! 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.\"";
+    next;
+    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
+    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
+    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
+    next;
+    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
+    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald, Nivalis and the Tulimshar South Dock.\"";
+    mes "\"The Candor Ferry only travels betwen Candor and the Tulimshar North Dock.\"";
+    next;
+    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
+    mes "\"We also have some slot machines in case you get bored.\"";
+    goto L_Main;
+
+L_Close:
     close;
 }