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, 53 insertions, 0 deletions

diff --git a/npc/011-4/_import.txt b/npc/011-4/_import.txt
new file mode 100644
index 00000000..fbb867b2
--- /dev/null
+++ b/npc/011-4/_import.txt
@@ -0,0 +1,6 @@
+// Map 011-4: Lake Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/011-4/_mobs.txt",
+"npc/011-4/_warps.txt",
+"npc/011-4/bl_barrier.txt",
+"npc/011-4/mapflags.txt",
diff --git a/npc/011-4/_mobs.txt b/npc/011-4/_mobs.txt
new file mode 100644
index 00000000..0d63b610
--- /dev/null
+++ b/npc/011-4/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-4: Lake Cave mobs
+011-4,77,50,19,19	monster	Spiky Mushroom	1019,1,100000,30000
+011-4,118,134,19,19	monster	Cave Snake	1021,1,100000,30000
+011-4,0,0,0,0	monster	Cave Snake	1021,40,0,0
+011-4,0,0,0,0	monster	Spiky Mushroom	1019,15,0,0
+011-4,85,98,28,37	monster	Cave Maggot	1056,10,100000,30000
+011-4,88,41,55,17	monster	Cave Maggot	1056,10,100000,30000
+011-4,0,0,0,0	monster	Bat	1017,20,180000,40000
diff --git a/npc/011-4/_warps.txt b/npc/011-4/_warps.txt
new file mode 100644
index 00000000..0aa49d72
--- /dev/null
+++ b/npc/011-4/_warps.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-4: Lake Cave warps
+011-4,98,28,0	warp	#011-4_98_28	0,0,011-3,46,25
+011-4,154,106,0	warp	#011-4_154_106	0,0,009-3,20,56
+011-4,64,55,0	warp	#011-4_64_55	0,0,011-6,47,184
+011-4,41,77,0	warp	#011-4_41_77	0,0,011-6,24,205
+011-4,114,40,0	warp	#011-4_114_40	0,0,011-6,97,168
+011-4,130,52,0	warp	#011-4_130_52	0,0,011-6,114,183
+011-4,139,81,0	warp	#011-4_139_81	0,0,011-6,123,212
+011-4,111,95,0	warp	#011-4_111_95	0,0,011-6,95,226
+011-4,87,106,0	warp	#011-4_87_106	0,0,011-6,68,234
+011-4,57,25,0	warp	#011-4_57_25	1,0,011-6,186,181
+011-4,70,138,0	warp	#011-4_70_138	0,0,011-6,266,181
diff --git a/npc/011-4/bl_barrier.txt b/npc/011-4/bl_barrier.txt
new file mode 100644
index 00000000..6c76151f
--- /dev/null
+++ b/npc/011-4/bl_barrier.txt
@@ -0,0 +1,24 @@
+
+011-4,136,141,0	script	#BL_Barrier	NPC45,0,0,{
+    @state = ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
+
+    if (@state >= 6) goto L_Cave_Abandoned;
+    if (@state >= 4) goto L_Lord_Barrier_Open;
+
+    message strcharinfo(0), "This entrance appears to be locked.";
+    goto L_End;
+
+L_Cave_Abandoned:
+    message strcharinfo(0), "This place looks like it was abandoned.";
+    warp "011-6",251,275;
+    goto L_End;
+
+L_Lord_Barrier_Open:
+    message strcharinfo(0), "You insert the silver arrow key and unlock the entrance.";
+    warp "011-6",251,275;
+    goto L_End;
+
+L_End:
+    @state = 0;
+    end;
+}
diff --git a/npc/011-4/mapflags.txt b/npc/011-4/mapflags.txt
new file mode 100644
index 00000000..b9eb6c70
--- /dev/null
+++ b/npc/011-4/mapflags.txt
@@ -0,0 +1 @@
+//011-4	mapflag	resave	011-1,103,34