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

diff --git a/npc/026-2/cerhan.txt b/npc/026-2/cerhan.txt
new file mode 100644
index 00000000..cd2d889f
--- /dev/null
+++ b/npc/026-2/cerhan.txt
@@ -0,0 +1,38 @@
+
+026-2,38,118,0	script	Cerhan	NPC311,{
+    mes "[Cerhan]";
+    mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";
+    next;
+    menu
+        "That's true. What are you doing here?",L_Story,
+        "Yes, this place is really strange. I'm going to have another look around.",L_close;
+
+L_Story:
+    mes "[Cerhan]";
+    mes "\"I came from Thermin, a town in the Kazei area.\"";
+    next;
+    mes "\"I'm an experienced weapon master and I was thinking about establishing a smithy here. I'll need some more equipment, though.\"";
+    next;
+    if (countitem("MylarinDust") > 0)
+        menu
+            "Do you know something about 'Mylarin Dust'?", L_Mylarin,
+            "Good luck with that.",L_GoodLuckWith;
+    goto L_GoodLuckWith;
+
+L_GoodLuckWith:
+    mes "[Cerhan]";
+    mes "\"If you're interested in weapons and armor, you may want to come back later.\"";
+    goto L_close;
+
+L_Mylarin:
+    mes "[Cerhan]";
+    mes "\"Mylarin dust?! Where did you get that? That's amazing!\"";
+    next;
+    mes "\"I can craft you an amazing strong armor with that - uhm, well, first I need to set up my smithy here.\"";
+    next;
+    mes "\"Please come back, when I'm ready for that. Mylarin dust... amazing.\"";
+    goto L_close;
+
+L_close:
+    close;
+}