Merge branch 'master' into legacy

Override all files with 'master' version.

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

6 files changed, 107 insertions, 0 deletions

diff --git a/npc/027-5/_import.txt b/npc/027-5/_import.txt
new file mode 100644
index 00000000..1947550a
--- /dev/null
+++ b/npc/027-5/_import.txt
@@ -0,0 +1,7 @@
+// Map 027-5: Crypt Sub-Basement Two
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-5/_mobs.txt",
+"npc/027-5/_warps.txt",
+"npc/027-5/casket_traps.txt",
+"npc/027-5/general_terogan_door.txt",
+"npc/027-5/mapflags.txt",
diff --git a/npc/027-5/_mobs.txt b/npc/027-5/_mobs.txt
new file mode 100644
index 00000000..27674997
--- /dev/null
+++ b/npc/027-5/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-5: Crypt Sub-Basement Two mobs
+027-5,69,42,48,20	monster	Wight	1124,6,60000,8000
+027-5,69,56,48,34	monster	Vampire Bat	1066,30,100000,30000
+027-5,69,42,49,20	monster	Skeleton	1043,8,60000,8000
+027-5,69,41,49,19	monster	Lady Skeleton	1044,8,60000,8000
+027-5,68,42,48,20	monster	Red Bone	1074,6,60000,8000
+027-5,70,80,49,17	monster	Skeleton	1043,8,60000,8000
+027-5,69,80,49,18	monster	Lady Skeleton	1044,8,60000,8000
diff --git a/npc/027-5/_warps.txt b/npc/027-5/_warps.txt
new file mode 100644
index 00000000..c10c0a34
--- /dev/null
+++ b/npc/027-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-5: Crypt Sub-Basement Two warps
+027-5,125,17,0	warp	#027-5_125_17	4,0,027-4,21,97
diff --git a/npc/027-5/casket_traps.txt b/npc/027-5/casket_traps.txt
new file mode 100644
index 00000000..d13de553
--- /dev/null
+++ b/npc/027-5/casket_traps.txt
@@ -0,0 +1,72 @@
+027-5,60,34,0	script	#casket17	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,34,50,0	script	#casket18	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,49,76,0	script	#casket19	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,60,89,0	script	#casket20	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,90,90,0	script	#casket21	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,92,76,0	script	#casket22	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,117,61,0	script	#casket23	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
+027-5,94,48,0	script	#casket24	NPC127,1,1,{
+    end;
+
+OnTouch:
+    heal ((MaxHp/100) * -10), 0;
+    specialeffect 301;
+    specialeffect 302;
+    end;
+}
diff --git a/npc/027-5/general_terogan_door.txt b/npc/027-5/general_terogan_door.txt
new file mode 100644
index 00000000..19a564b5
--- /dev/null
+++ b/npc/027-5/general_terogan_door.txt
@@ -0,0 +1,15 @@
+
+027-5,70,25,0	script	#GeneralDoor3	NPC45,1,0,{
+    if ( $@CRYPT_FIGHT3 != 0 )
+        goto L_NoKeys;
+
+    warp "027-8",39,60;
+    goto L_close;
+
+L_NoKeys:
+    message strcharinfo(0), "This door is locked.";
+    end;
+
+L_close:
+    close;
+}
diff --git a/npc/027-5/mapflags.txt b/npc/027-5/mapflags.txt
new file mode 100644
index 00000000..d502e210
--- /dev/null
+++ b/npc/027-5/mapflags.txt
@@ -0,0 +1 @@
+//027-5	mapflag	resave	027-2,105,94