Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour

3 files changed, 54 insertions, 0 deletions

diff --git a/npc/008-2-8/_import.txt b/npc/008-2-8/_import.txt
index d3346591..8bb44bb1 100644
--- a/npc/008-2-8/_import.txt
+++ b/npc/008-2-8/_import.txt
@@ -1,4 +1,6 @@
 // Map 008-2-8: Hurnscald Forge
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-2-8/_warps.txt",
+"npc/008-2-8/macgowan.txt",
 "npc/008-2-8/mapflags.txt",
+"npc/008-2-8/nicholas.txt",
diff --git a/npc/008-2-8/macgowan.txt b/npc/008-2-8/macgowan.txt
new file mode 100644
index 00000000..efeee33e
--- /dev/null
+++ b/npc/008-2-8/macgowan.txt
@@ -0,0 +1,24 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    The Smith's apprentice.
+// THIS IS A PLACEHOLDER!
+
+008-2-8,38,29,0	script	Macgowan	NPC_YOUNG_MAN_APPRENTICE,{
+    npctalk3(l("Hello, I am Macgowan, apprentice to Nicholas."));
+    end;
+
+OnInit:
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
+    end;
+}
diff --git a/npc/008-2-8/nicholas.txt b/npc/008-2-8/nicholas.txt
new file mode 100644
index 00000000..7b62090d
--- /dev/null
+++ b/npc/008-2-8/nicholas.txt
@@ -0,0 +1,28 @@
+// Evol scripts.
+// Author:
+//    gumi, Micksha
+// Description:
+//    Nicholas the Smith.
+
+008-2-8,40,27,0	script	Nicholas	NPC_NICHOLAS,{
+    speech(
+        l("Hello, there!"),
+        l("I'm an expert blacksmith."),
+        l("If you get me some Coal and Iron Ingots, I could make you a very valuable shield or helmet."));
+
+    // TODO: setzer quest
+    close;
+
+OnInit:
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
+    end;
+}