Merge branch 'master' into jesusalva/innsjesusalva/inns

4 files changed, 44 insertions, 0 deletions

diff --git a/npc/012-2-3/_import.txt b/npc/012-2-3/_import.txt
new file mode 100644
index 00000000..e04ba715
--- /dev/null
+++ b/npc/012-2-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 012-2-3: Candor Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-2-3/_warps.txt",
+"npc/012-2-3/cynric.txt",
+"npc/012-2-3/nyle.txt",
diff --git a/npc/012-2-3/_warps.txt b/npc/012-2-3/_warps.txt
new file mode 100644
index 00000000..a64e4ecb
--- /dev/null
+++ b/npc/012-2-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-2-3: Candor Shop warps
+012-2-3,33,37,0	warp	#012-2-3_33_37	0,0,012-1,64,96
diff --git a/npc/012-2-3/cynric.txt b/npc/012-2-3/cynric.txt
new file mode 100644
index 00000000..83e2c00b
--- /dev/null
+++ b/npc/012-2-3/cynric.txt
@@ -0,0 +1,18 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Cynric, Candor's banker.
+// THIS IS A PLACEHOLDER!
+
+012-2-3,27,28,0	script	Cynric	NPC_CYNRIC,{
+    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-3/nyle.txt b/npc/012-2-3/nyle.txt
new file mode 100644
index 00000000..0c81127a
--- /dev/null
+++ b/npc/012-2-3/nyle.txt
@@ -0,0 +1,18 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Nyle, Candor's shopkeeper.
+// THIS IS A PLACEHOLDER!
+
+012-2-3,42,30,0	script	Nyle	NPC_NYLE,{
+    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;
+}