--- deliantra/maps/elmex/heaven_quest_entrance.map	2006/04/03 21:19:06	1.2
+++ deliantra/maps/elmex/heaven_quest_entrance.map	2008/05/10 22:00:19	1.15
@@ -1,4 +1,6 @@
 arch map
+file_format_version 1
+region scorn
 width 20
 height 40
 end
@@ -263,7 +265,7 @@
 arch cwall_3_2
 x 1
 y 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 1
@@ -328,7 +330,7 @@
 arch cwall_3_2
 x 1
 y 26
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 1
@@ -474,6 +476,10 @@
 x 2
 y 7
 end
+arch dungeon_magic
+x 2
+y 7
+end
 arch marble
 x 2
 y 8
@@ -598,7 +604,7 @@
 arch brazier
 x 2
 y 31
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch pinkmarble
 x 2
@@ -631,7 +637,7 @@
 arch brazier
 x 2
 y 38
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 2
@@ -689,6 +695,10 @@
 x 3
 y 7
 end
+arch dungeon_magic
+x 3
+y 7
+end
 arch marble
 x 3
 y 8
@@ -804,7 +814,7 @@
 arch statue
 x 3
 y 31
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch pink-beige-c-marble_111
 x 3
@@ -837,7 +847,7 @@
 arch statue2
 x 3
 y 38
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 3
@@ -895,6 +905,10 @@
 x 4
 y 7
 end
+arch dungeon_magic
+x 4
+y 7
+end
 arch marble
 x 4
 y 8
@@ -1010,14 +1024,14 @@
 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
-You will find the <Scorn School> in the south east of Scorn,
+@match school
+You will find the <Scorn School> in the north east of Scorn at the port,
 it has been run over by monsters.
 @match *
 Hello! Welcome to the first stage of the Quest of Heaven!
@@ -1132,6 +1146,10 @@
 x 5
 y 7
 end
+arch dungeon_magic
+x 5
+y 7
+end
 arch marble
 x 5
 y 8
@@ -1247,7 +1265,7 @@
 arch statue
 x 5
 y 31
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 move_on walk
 end
 arch pink-beige-c-marble_114
@@ -1281,7 +1299,7 @@
 arch statue2
 x 5
 y 38
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 5
@@ -1468,7 +1486,7 @@
 arch brazier
 x 6
 y 31
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch pinkmarble
 x 6
@@ -1501,7 +1519,7 @@
 arch brazier
 x 6
 y 38
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 6
@@ -1650,6 +1668,10 @@
 y 27
 connected 1
 end
+arch dungeon_magic
+x 7
+y 27
+end
 arch marble
 x 7
 y 28
@@ -1673,7 +1695,7 @@
 arch cwall_3_4
 x 7
 y 30
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 7
@@ -1698,7 +1720,7 @@
 arch cwall_1_2
 x 7
 y 33
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 7
@@ -1794,7 +1816,7 @@
 x 8
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 8
 end
@@ -1802,7 +1824,7 @@
 x 8
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 9
 end
@@ -1810,9 +1832,10 @@
 x 8
 y 10
 end
-arch swall_1_2
+arch cwall_1_2
 x 8
 y 10
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 8
@@ -2182,7 +2205,8 @@
 symmetry 4
 orientation 2
 dungeon_level 10
-dungeon_depth 110
+dungeon_depth 99
+final_map /elmex/heaven_quest_final
 endmsg
 hp 0
 sp 0
@@ -2359,7 +2383,7 @@
 endmsg
 x 10
 y 36
-move_on walk fly_low
+move_on fly_low walk
 end
 arch woodfloor
 x 10
@@ -2634,7 +2658,7 @@
 x 12
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 8
 end
@@ -2642,7 +2666,7 @@
 x 12
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 9
 end
@@ -2650,9 +2674,10 @@
 x 12
 y 10
 end
-arch swall_1_2
+arch cwall_1_2
 x 12
 y 10
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 12
@@ -2937,6 +2962,10 @@
 y 27
 connected 2
 end
+arch dungeon_magic
+x 13
+y 27
+end
 arch marble
 x 13
 y 28
@@ -2960,7 +2989,7 @@
 arch cwall_3_2
 x 13
 y 30
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 13
@@ -2997,7 +3026,7 @@
 arch cwall_3_4
 x 13
 y 35
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 13
@@ -3306,6 +3335,10 @@
 x 15
 y 7
 end
+arch dungeon_magic
+x 15
+y 7
+end
 arch marble
 x 15
 y 8
@@ -3522,6 +3555,10 @@
 x 16
 y 7
 end
+arch dungeon_magic
+x 16
+y 7
+end
 arch marble
 x 16
 y 8
@@ -3748,6 +3785,10 @@
 x 17
 y 7
 end
+arch dungeon_magic
+x 17
+y 7
+end
 arch marble
 x 17
 y 8
@@ -3964,6 +4005,10 @@
 x 18
 y 7
 end
+arch dungeon_magic
+x 18
+y 7
+end
 arch marble
 x 18
 y 8
@@ -4277,7 +4322,7 @@
 arch cwall_3_4
 x 19
 y 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 19
@@ -4342,7 +4387,7 @@
 arch cwall_3_4
 x 19
 y 26
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 19
@@ -4375,7 +4420,7 @@
 arch cwall_3_4
 x 19
 y 30
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch marble
 x 19