Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 84 insertions, 0 deletions

diff --git a/npc/008-1/dock.txt b/npc/008-1/dock.txt
new file mode 100644
index 00000000..a9f2c94b
--- /dev/null
+++ b/npc/008-1/dock.txt
@@ -0,0 +1,84 @@
+
+008-1,147,64,0	script	Hurnscald North Koga	NPC395,10,3,{
+    @npc_distance = 11;
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+    callfunc "BoardFerry";
+    end;
+
+OnTouch:
+    addtimer get(.warp_delay, "#FerryConfig"), strnpcinfo(0)+"::OnBoard";
+    end;
+
+OnBoard:
+    callfunc "BoardFerry";
+    end;
+}
+
+008-1,139,65,0	script	Hurnscald North Dock	NPC400,2,1,{
+    @npc_distance = 3;
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+    callfunc "BoardFerry";
+    end;
+}
+
+008-1,120,44,0	script	#Hurnscald NorthDock	NPC32767,{
+    end;
+OnCommandArrive:
+    disablenpc "Hurnscald North Dock";
+    enablenpc "Hurnscald North Koga";
+    areatimer 0, "008-1", 137, 64, 141, 65, get(.warp_delay, "#FerryConfig"), strnpcinfo(0)+"::OnAreaWarp"; // warp players on dock
+    end;
+
+OnAreaWarp:
+    callfunc "BoardFerry";
+    end;
+
+OnCommandWarp:
+    disablenpc "Hurnscald North Koga";
+    enablenpc "Hurnscald North Dock";
+    end;
+}
+
+008-1,147,75,0	script	Hurnscald South Koga	NPC395,10,3,{
+    @npc_distance = 10;
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+    callfunc "BoardCandorFerry";
+    end;
+
+OnTouch:
+    addtimer get(.warp_delay, "#FerryConfig"), strnpcinfo(0)+"::OnBoard";
+    end;
+
+OnBoard:
+    callfunc "BoardCandorFerry";
+    end;
+}
+
+008-1,139,76,0	script	Hurnscald South Dock	NPC400,2,1,{
+    @npc_distance = 3;
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+    callfunc "BoardCandorFerry";
+    end;
+}
+
+008-1,65,25,0	script	#Hurnscald SouthDock	NPC32767,{
+    end;
+OnCommandArrive:
+    disablenpc "Hurnscald South Dock";
+    enablenpc "Hurnscald South Koga";
+    areatimer "008-1", 137, 75, 141, 76, get(.warp_delay, "#FerryConfig"), strnpcinfo(0)+"::OnAreaWarp"; // warp players on dock
+    end;
+
+OnAreaWarp:
+    callfunc "BoardCandorFerry";
+    end;
+
+OnCommandWarp:
+    disablenpc "Hurnscald South Koga";
+    enablenpc "Hurnscald South Dock";
+    end;
+}