--- deliantra/maps/elmex/heaven_quest_entrance.map	2006/04/03 21:19:06	1.2
+++ deliantra/maps/elmex/heaven_quest_entrance.map	2006/08/15 04:05:14	1.8
@@ -474,6 +474,10 @@
 x 2
 y 7
 end
+arch dungeon_magic
+x 2
+y 7
+end
 arch marble
 x 2
 y 8
@@ -689,6 +693,10 @@
 x 3
 y 7
 end
+arch dungeon_magic
+x 3
+y 7
+end
 arch marble
 x 3
 y 8
@@ -895,6 +903,10 @@
 x 4
 y 7
 end
+arch dungeon_magic
+x 4
+y 7
+end
 arch marble
 x 4
 y 8
@@ -1010,13 +1022,13 @@
 arch conjurer
 name priest of Valriel
 msg
-@match chalice|Chalice
+@match chalice
 The <Chalice of first stage to heaven> is a silver chalice
 that has been kept by the nuns in the school for a long time
 now. Now that monsters occupied the school, we are afraid it
 will be stolen. Bring it here and drop it on the Altar to get 
 the entrance card to the next stage of the Quest of Heaven.
-@match School|school
+@match school
 You will find the <Scorn School> in the south east of Scorn,
 it has been run over by monsters.
 @match *
@@ -1132,6 +1144,10 @@
 x 5
 y 7
 end
+arch dungeon_magic
+x 5
+y 7
+end
 arch marble
 x 5
 y 8
@@ -1650,6 +1666,10 @@
 y 27
 connected 1
 end
+arch dungeon_magic
+x 7
+y 27
+end
 arch marble
 x 7
 y 28
@@ -1794,7 +1814,7 @@
 x 8
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 8
 end
@@ -1802,7 +1822,7 @@
 x 8
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 9
 end
@@ -1810,9 +1830,10 @@
 x 8
 y 10
 end
-arch swall_1_2
+arch cwall_1_2
 x 8
 y 10
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 8
@@ -2182,7 +2203,8 @@
 symmetry 4
 orientation 2
 dungeon_level 10
-dungeon_depth 110
+dungeon_depth 60
+final_map /elmex/heaven_quest_final
 endmsg
 hp 0
 sp 0
@@ -2634,7 +2656,7 @@
 x 12
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 8
 end
@@ -2642,7 +2664,7 @@
 x 12
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 9
 end
@@ -2650,9 +2672,10 @@
 x 12
 y 10
 end
-arch swall_1_2
+arch cwall_1_2
 x 12
 y 10
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 12
@@ -2937,6 +2960,10 @@
 y 27
 connected 2
 end
+arch dungeon_magic
+x 13
+y 27
+end
 arch marble
 x 13
 y 28
@@ -3306,6 +3333,10 @@
 x 15
 y 7
 end
+arch dungeon_magic
+x 15
+y 7
+end
 arch marble
 x 15
 y 8
@@ -3522,6 +3553,10 @@
 x 16
 y 7
 end
+arch dungeon_magic
+x 16
+y 7
+end
 arch marble
 x 16
 y 8
@@ -3748,6 +3783,10 @@
 x 17
 y 7
 end
+arch dungeon_magic
+x 17
+y 7
+end
 arch marble
 x 17
 y 8
@@ -3964,6 +4003,10 @@
 x 18
 y 7
 end
+arch dungeon_magic
+x 18
+y 7
+end
 arch marble
 x 18
 y 8