Merge branch 'master' into jesusalva/innsjesusalva/inns

4 files changed, 45 insertions, 0 deletions

diff --git a/npc/012-2-1/_import.txt b/npc/012-2-1/_import.txt
new file mode 100644
index 00000000..13ff23d2
--- /dev/null
+++ b/npc/012-2-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 012-2-1: Sorfina's Home
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-2-1/_warps.txt",
+"npc/012-2-1/jessie.txt",
+"npc/012-2-1/tanisha.txt",
diff --git a/npc/012-2-1/_warps.txt b/npc/012-2-1/_warps.txt
new file mode 100644
index 00000000..4ccc3898
--- /dev/null
+++ b/npc/012-2-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-2-1: Sorfina's Home warps
+012-2-1,52,39,0	warp	#012-2-1_52_39	0,0,012-1,38,116
+012-2-1,53,30,0	warp	#012-2-1_53_30	0,0,012-2-2,30,34
diff --git a/npc/012-2-1/jessie.txt b/npc/012-2-1/jessie.txt
new file mode 100644
index 00000000..c00e868d
--- /dev/null
+++ b/npc/012-2-1/jessie.txt
@@ -0,0 +1,18 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Jessie, Sorfina's old husband.
+// THIS IS A PLACEHOLDER!
+
+012-2-1,38,30,0	script	Jessie	NPC_JESSIE,{
+    speech
+        l("Welcome."),
+        l("Someone was too lazy to even write a placeholder text, so please come back later");
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/012-2-1/tanisha.txt b/npc/012-2-1/tanisha.txt
new file mode 100644
index 00000000..94848971
--- /dev/null
+++ b/npc/012-2-1/tanisha.txt
@@ -0,0 +1,18 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Tanisha, the little girl in Sorfina's house.
+// THIS IS A PLACEHOLDER!
+
+012-2-1,48,34,0	script	Tanisha	NPC_TANISHA,{
+    speech
+        l("Welcome."),
+        l("Someone was too lazy to even write a placeholder text, so please come back later");
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}