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, 19 insertions, 0 deletions

diff --git a/npc/001-1/ferry_master.txt b/npc/001-1/ferry_master.txt
new file mode 100644
index 00000000..db5c6ec8
--- /dev/null
+++ b/npc/001-1/ferry_master.txt
@@ -0,0 +1,19 @@
+
+001-1,64,75,0	script	Ferry Master#tulimshar	NPC138,{
+    mes "[Ferry Master]";
+    mes "\"Hello! Do you need something?\"";
+    goto L_Main;
+
+L_Main:
+    menu
+        "How do I use the ferry?", L_Explain,
+        "Nothing, I guess.", L_close;
+
+L_Explain:
+    mes "[Ferry Master]";
+    callfunc "FerryHelp";
+    goto L_Main;
+
+L_close:
+    close;
+}