5 files changed, 50 insertions, 1 deletions
diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt
index 0aacdcdb..0e9fb55b 100644
--- a/world/map/npc/001-1/dock.txt
+++ b/world/map/npc/001-1/dock.txt
@@ -14,14 +14,23 @@
     close;
 }
 
+001-1,68,72,0|script|Tulimshar Dock|400,3,3
+{
+    set @DockNumber, 2;
+    callfunc "FerryManifest";
+    close;
+}
+
 001-1,70,70,0|script|#TulimsharDock|32767
 {
     end;
 OnCommandArrive:
+    disablenpc "Tulimshar Dock";
     enablenpc "Tulimshar Koga";
     end;
 
 OnCommandWarp:
     disablenpc "Tulimshar Koga";
+    enablenpc "Tulimshar Dock";
     end;
 }
diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index 42763609..1ce308e6 100644
--- a/world/map/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
@@ -12,15 +12,24 @@
     close;
 }
 
+008-1,139,65,0|script|Hurnscald North Dock|400,3,3
+{
+    set @DockNumber, 2;
+    callfunc "FerryManifest";
+    close;
+}
+
 008-1,120,44,0|script|#Hurnscald NorthDock|32767
 {
     end;
 OnCommandArrive:
+    disablenpc "Hurnscald North Dock";
     enablenpc "Hurnscald North Koga";
     end;
 
 OnCommandWarp:
     disablenpc "Hurnscald North Koga";
+    enablenpc "Hurnscald North Dock";
     end;
 }
 
@@ -30,14 +39,23 @@ OnCommandWarp:
     close;
 }
 
+008-1,139,76,0|script|Hurnscald South Dock|400,3,3
+{
+    set @DockNumber, 1;
+    callfunc "FerryManifest";
+    close;
+}
+
 008-1,65,25,0|script|#Hurnscald SouthDock|32767
 {
     end;
 OnCommandArrive:
+    disablenpc "Hurnscald South Dock";
     enablenpc "Hurnscald South Koga";
     end;
 
 OnCommandWarp:
     disablenpc "Hurnscald South Koga";
+    enablenpc "Hurnscald South Dock";
     end;
 }
diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index f0628440..0252368b 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -7,6 +7,13 @@
     end;
 }
 
+029-1,46,110,0|script|Candor Dock|400,3,3
+{
+    set @DockNumber, 1;
+    callfunc "FerryManifest";
+    close;
+}
+
 029-1,51,118,0|script|Candor Koga|395,8,8
 {
     callfunc "BoardCandorFerry";
@@ -17,10 +24,12 @@
 {
     end;
 OnCommandArrive:
+    disablenpc "Candor Dock";
     enablenpc "Candor Koga";
     end;
 
 OnCommandWarp:
     disablenpc "Candor Koga";
+    enablenpc "Candor Dock";
     end;
 }
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
index b19cf271..a2f19941 100644
--- a/world/map/npc/031-1/dock.txt
+++ b/world/map/npc/031-1/dock.txt
@@ -13,15 +13,24 @@
     close;
 }
 
+031-1,99,109,0|script|Nivalis Dock|400,3,3
+{
+    set @DockNumber, 2;
+    callfunc "FerryManifest";
+    close;
+}
+
 031-1,100,100,0|script|#NivalisDock|32767
 {
     end;
 
 OnCommandArrive:
+    disablenpc "Nivalis Dock";
     enablenpc "Nivalis Koga";
     end;
 
 OnCommandWarp:
     disablenpc "Nivalis Koga";
+    enablenpc "Nivalis Dock";
     end;
 }
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index eb7196d1..6cda12a7 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -47,7 +47,7 @@ L_NextDock:
     if($@MainCurrentDock == 1) goto L_k1city3;
     end;
 
-OnTimer8000:
+OnTimer5000:
     if ($@DockTickCount > $@DockLeaveCount)
         goto L_NextDock;
     set $@DockTickCount, $@DockTickCount + 1;
@@ -101,6 +101,8 @@ function|script|FerryHelp
 }
 function|script|FerryManifest
 {
+    if (@DockNumber == 1) goto L_CandorFerry;
+    if (@DockNumber == 2) goto L_WorldFerry;
     mes "Which Ferry do you want to check the schedule for?";
     menu
         "World Ferry.", L_WorldFerry,
@@ -112,6 +114,7 @@ L_CandorFerry:
     if(@NextDock == getarraysize($@CandorDocks$))
         set @NextDock, 0;
     mes "The ferry will be arriving at "+$@CandorDocks$[@NextDock]+" next";
+    next;
     goto L_Close;
 
 L_WorldFerry:
@@ -120,6 +123,7 @@ L_WorldFerry:
     if(@NextDock == getarraysize($@MainDocks$))
         set @NextDock, 0;
     mes "The ferry will be arriving at "+$@MainDocks$[@NextDock]+" next";
+    next;
     goto L_Close;
 
 L_Close: