4 files changed, 35 insertions, 3 deletions
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index d424f357..80303795 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -5,3 +5,5 @@ npc: npc/029-1/_mobs.txt
 npc: npc/029-1/_warps.txt
 npc: npc/029-1/barrier.txt
 npc: npc/029-1/dock.txt
+npc: npc/029-1/mapflags.txt
+npc: npc/029-1/traveler.txt
diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index a049d68e..8df50b9d 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -1,8 +1,26 @@
 // The ferry dock
 
-029-1.gat,22,37,0|script|#candordock|45,2,1,
+// Ferry Sign
+029-1.gat,27,36,0|script|Ferry Schedule#8|397,
 {
-    set @loc, DOCK_candor;
-    callfunc "Ferry";
+    callfunc "FerryManifest";
+    end;
+}
+
+029-1.gat,16,36,0|script|Candor Koga|395,6,2,
+{
+    callfunc "BoardCandorFerry";
+    close;
+}
+
+029-1.gat,22,37,0|script|#CandorDock|45,
+{
+    end;
+OnCommandArrive:
+    enablenpc "Candor Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Candor Koga";
     end;
 }
diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt
new file mode 100644
index 00000000..03b117f8
--- /dev/null
+++ b/world/map/npc/029-1/mapflags.txt
@@ -0,0 +1 @@
+029-1.gat|mapflag|resave|029-1,69,69
diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt
new file mode 100644
index 00000000..789a375a
--- /dev/null
+++ b/world/map/npc/029-1/traveler.txt
@@ -0,0 +1,11 @@
+// This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+// Author: Wombat, wushin
+// cost depending on level and adapted to new scripting guidelines: Jenalya
+
+029-1.gat,69,67,0|script|Knitra the Traveler|103,
+{
+    set @NpcName$, "Knitra";
+    set @NpcTravelBit, $@candor_bit;
+    callfunc "Traveler";
+    end;
+}