Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

5 files changed, 56 insertions, 0 deletions

diff --git a/npc/014-1/_import.txt b/npc/014-1/_import.txt
new file mode 100644
index 00000000..56b06b49
--- /dev/null
+++ b/npc/014-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 014-1: Woodland
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/014-1/_mobs.txt",
+"npc/014-1/_warps.txt",
+"npc/014-1/mapflags.txt",
+"npc/014-1/wedding-officiator.txt",
diff --git a/npc/014-1/_mobs.txt b/npc/014-1/_mobs.txt
new file mode 100644
index 00000000..cd4bc0b0
--- /dev/null
+++ b/npc/014-1/_mobs.txt
@@ -0,0 +1,18 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-1: Woodland mobs
+014-1,0,0,0,0	monster	Evil Mushroom	1013,20,0,0
+014-1,0,0,0,0	monster	Pink Flower	1014,25,0,0
+014-1,0,0,0,0	monster	Spiky Mushroom	1019,15,0,0
+014-1,0,0,0,0	monster	Mouboo	1028,5,0,10
+014-1,0,0,0,0	monster	Mauve Plant	1029,1,270,180
+014-1,0,0,0,0	monster	Mauve Plant	1029,5,2700000,1800000
+014-1,0,0,0,0	monster	Cobalt Plant	1030,1,270,180
+014-1,0,0,0,0	monster	Cobalt Plant	1030,2,2700000,1800000
+014-1,0,0,0,0	monster	Gamboge Plant	1031,1,270,180
+014-1,0,0,0,0	monster	Gamboge Plant	1031,2,2700000,1800000
+014-1,0,0,0,0	monster	Alizarin Plant	1032,1,270,180
+014-1,0,0,0,0	monster	Alizarin Plant	1032,2,2700000,1800000
+014-1,0,0,0,0	monster	Silkworm	1035,4,6000,3000
+014-1,0,0,0,0	monster	Clover Patch	1037,2,0,1000
+014-1,0,0,0,0	monster	Squirrel	1038,25,30,20
+014-1,0,0,0,0	monster	Butterfly	1055,10,30,20
diff --git a/npc/014-1/_warps.txt b/npc/014-1/_warps.txt
new file mode 100644
index 00000000..1c740ae8
--- /dev/null
+++ b/npc/014-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-1: Woodland warps
+014-1,109,91,0	warp	#014-1_109_91	0,2,011-1,31,61
+014-1,93,58,0	warp	#014-1_93_58	0,0,014-3,57,172
+014-1,76,38,0	warp	#014-1_76_38	0,0,014-3,35,33
diff --git a/npc/014-1/mapflags.txt b/npc/014-1/mapflags.txt
new file mode 100644
index 00000000..78fa67f9
--- /dev/null
+++ b/npc/014-1/mapflags.txt
@@ -0,0 +1 @@
+//014-1	mapflag	resave	014-1,89,102
diff --git a/npc/014-1/wedding-officiator.txt b/npc/014-1/wedding-officiator.txt
new file mode 100644
index 00000000..2c0ac5e2
--- /dev/null
+++ b/npc/014-1/wedding-officiator.txt
@@ -0,0 +1,26 @@
+
+014-1,31,31,0	script	Wedding Officiator	NPC164,{
+    mes "[Wedding Officiator]";
+    mes "A young lady in a long, green dress is overseeing the park. As she notices you looking at her, she gives you a broad and happy smile.";
+    mes "\"Hi there!  I'm Wendy, here for all your marriage needs!\"";
+    next;
+    goto L_Main;
+
+L_Main:
+    menu
+        "What exactly do you do?", L_explain_self,
+        "Goodbye.", L_End;
+
+L_explain_self:
+    mes "[Wedding Officiator]";
+    mes "\"I'm responsible for marriage and divorce proceedings. Every married couple must be registered, so I keep a looong list of couples and send that to the magistrates every now and then.\"";
+    next;
+    mes "[Wedding Officiator]";
+    mes "\"So if you have a sweetheart and the two of you are getting along particularly well, and you think that you are ready to make that big final step – well, then come here and talk to me!\"";
+    next;
+    goto L_Main;
+
+L_End:
+    close;
+
+}