Merge branch 'master' into jesusalva/innsjesusalva/inns

4 files changed, 106 insertions, 0 deletions

diff --git a/npc/012-2-4/_import.txt b/npc/012-2-4/_import.txt
new file mode 100644
index 00000000..659fdc67
--- /dev/null
+++ b/npc/012-2-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 012-2-4: Alchemy Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-2-4/_warps.txt",
+"npc/012-2-4/morgan.txt",
+"npc/012-2-4/zitoni.txt",
diff --git a/npc/012-2-4/_warps.txt b/npc/012-2-4/_warps.txt
new file mode 100644
index 00000000..156a6e54
--- /dev/null
+++ b/npc/012-2-4/_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-4: Alchemy Hut warps
+012-2-4,31,44,0	warp	#012-2-4_31_44	0,0,012-1,57,102
diff --git a/npc/012-2-4/morgan.txt b/npc/012-2-4/morgan.txt
new file mode 100644
index 00000000..23e97aaf
--- /dev/null
+++ b/npc/012-2-4/morgan.txt
@@ -0,0 +1,21 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Rosen, the salesman in Candor smith.
+// THIS IS A PLACEHOLDER!
+
+012-2-4,26,37,0	script	Morgan	NPC_MORGAN,{
+    speech
+        l("Hello Wanderer."),
+        l("I am Morgan, the alchimist."),
+        l("(People do not like to hear the word 'witch' so much, as we live close to Hurnscald)."),
+        l("Unfortunately my apprentice Zitoni does not bring fresh potions, so if you need something you should come back later.");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt
new file mode 100644
index 00000000..7b94cba3
--- /dev/null
+++ b/npc/012-2-4/zitoni.txt
@@ -0,0 +1,77 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Zitoni, Morgan's apprentice.
+// THIS IS A PLACEHOLDER!
+
+012-2-4,40,37,0	script	Zitoni	NPC_ZITONI,{
+
+OnTalk:
+    mesn "The man shivers";
+    mesq l("The world is so cruel! Oh, cruel world!");
+    next;
+
+    menu
+        lg("I do not like whiners."), -,
+        lg("What is your problem?"), L_toams;
+
+    close;
+
+L_toams:
+    mesn "He looks at you.";
+    mesq l("I would so much like to brew potions, but...");
+    next;
+    mesq l("I CANNOT WALK!");
+    next;
+    mesq l("Please, please try to find a guy named toams - he is capable to make me walk again! Please!");
+    next;
+
+    menu
+        lg("Ok, I can try."), -,
+        lg("Ok, but do you have something else?"), L_jez;
+
+    close;
+
+L_jez:
+    mesq l("Oh, yes! So kind that you ask");
+    next;
+    mesq l("I forgot my tasks to do!");
+    next;
+    mesq l("If only I remembered what I was supposed to do!");
+    next;
+    mesq l("Please, can you look for a guy named Jesusalva? I am very sure he remembers what kind of quest I was going to accomplish.");
+    next;
+
+    menu
+        lg("Ok, I will do that, but now I must leave."), -,
+        lg("Is that all, or do you have more problems?"), L_wildx;
+    close;
+
+L_wildx:
+    mesq l("Unfortunately yes.");
+    next;
+    mesq l("I totally forgot why I am here, and what I am doing here!");
+    next;
+    mesq l("Please, please find WildX. He will explain to me what my role in this world has been.");
+
+    menu
+        lg("Ok, but all that will keep me busy for a while. So, goodbye."), -,
+        lg("You do not have more problems, do you?"), L_mick;
+    close;
+
+L_mick:
+    mesq l("Sure I have one more problem.");
+    next;
+    mesq l("Did you ever look at me?!? That ugly robe, that weird whatever I hold in my hand, my strange face and all that!");
+    next;
+    mesq l("Can you do a last task for me and try to find Micksha? He sure can help me to look a bit less ugly.");
+    next;
+   mesq("That would be so helpful! Please return soon to tell me about your progress.");
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}