Merge branch 'master' into jesusalva/innsjesusalva/inns

3 files changed, 27 insertions, 0 deletions

diff --git a/npc/008-2-32/_import.txt b/npc/008-2-32/_import.txt
new file mode 100644
index 00000000..ba8aa591
--- /dev/null
+++ b/npc/008-2-32/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-32: Merchant House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-32/_warps.txt",
+"npc/008-2-32/thamas.txt",
diff --git a/npc/008-2-32/_warps.txt b/npc/008-2-32/_warps.txt
new file mode 100644
index 00000000..99f22bd8
--- /dev/null
+++ b/npc/008-2-32/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-32: Merchant House warps
+008-2-32,40,38,0	warp	#008-2-32_40_38	0,0,008-1-1,51,58
diff --git a/npc/008-2-32/thamas.txt b/npc/008-2-32/thamas.txt
new file mode 100644
index 00000000..f824493f
--- /dev/null
+++ b/npc/008-2-32/thamas.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Thamas the soldier.
+// THIS IS A PLACEHOLDER!
+
+008-2-32,36,31,0	script	Thamas	NPC_THAMAS,{
+    speech
+        l("Hi there."),
+        l("I am a legion soldier who never talks much, until Jesusalva or WildX puts words in my mouth."),
+        l("Until then, let me be quiet. Talk to you later.");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}