Add Gumis scripts - delete placeholders. Disable debugs.

4 files changed, 42 insertions, 29 deletions

diff --git a/npc/008-2-8/_import.txt b/npc/008-2-8/_import.txt
index 8b3da720..8bb44bb1 100644
--- a/npc/008-2-8/_import.txt
+++ b/npc/008-2-8/_import.txt
@@ -1,6 +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/apprentice.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/apprentice.txt b/npc/008-2-8/apprentice.txt
deleted file mode 100644
index e15e7db7..00000000
--- a/npc/008-2-8/apprentice.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Evol scripts.
-// Author:
-//    Micksha
-// Description:
-//    The Smith's apprentice.
-// THIS IS A PLACEHOLDER!
-
-008-2-8,38,29,0	script	Apprentice#008-2-8	NPC_YOUNG_MAN_APPRENTICE,{
-    speech
-        l("Hi Sir."),
-        l("If you bring us ores, we will be able to make the finest equipment."),
-        lg("Come back a bit later when you are interested.");
-
-    close;
-
-OnInit:
-    .sex = G_MALE;
-    .distance = 2;
-    end;
-}
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
index 9dab65e8..7b62090d 100644
--- a/npc/008-2-8/nicholas.txt
+++ b/npc/008-2-8/nicholas.txt
@@ -1,19 +1,28 @@
 // Evol scripts.
 // Author:
-//    Micksha
+//    gumi, Micksha
 // Description:
 //    Nicholas the Smith.
-// THIS IS A PLACEHOLDER!
 
-008-2-8,39,27,0	script	Nicholas#008-2-8	NPC_NICHOLAS,{
-    speech
-        l("Hi Sir."),
-        lg("If you need stable metal gear, you are right! But first I must bring the steel atoms in the right order, hold on.");
+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:
-    .sex = G_MALE;
-    .distance = 2;
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
     end;
 }