--- deliantra/maps/elmex/heaven_quest_entrance.map	2006/03/24 07:23:01	1.1
+++ deliantra/maps/elmex/heaven_quest_entrance.map	2006/08/09 10:59:06	1.6
@@ -263,7 +263,7 @@
 arch cwall_3_2
 x 1
 y 18
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 1
@@ -328,7 +328,7 @@
 arch cwall_3_2
 x 1
 y 26
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 1
@@ -474,6 +474,10 @@
 x 2
 y 7
 end
+arch dungeon_magic
+x 2
+y 7
+end
 arch marble
 x 2
 y 8
@@ -565,6 +569,7 @@
 arch table_burl_3
 x 2
 y 27
+no_pick 1
 end
 arch potion_empty
 name empty bottle of heavens hit
@@ -597,7 +602,7 @@
 arch brazier
 x 2
 y 31
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch pinkmarble
 x 2
@@ -630,7 +635,7 @@
 arch brazier
 x 2
 y 38
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 2
@@ -688,6 +693,10 @@
 x 3
 y 7
 end
+arch dungeon_magic
+x 3
+y 7
+end
 arch marble
 x 3
 y 8
@@ -803,7 +812,7 @@
 arch statue
 x 3
 y 31
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch pink-beige-c-marble_111
 x 3
@@ -836,7 +845,7 @@
 arch statue2
 x 3
 y 38
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 3
@@ -894,6 +903,10 @@
 x 4
 y 7
 end
+arch dungeon_magic
+x 4
+y 7
+end
 arch marble
 x 4
 y 8
@@ -1009,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 *
@@ -1072,6 +1085,7 @@
 arch platter1_sil
 x 4
 y 38
+no_pick 1
 end
 arch marble
 x 4
@@ -1130,6 +1144,10 @@
 x 5
 y 7
 end
+arch dungeon_magic
+x 5
+y 7
+end
 arch marble
 x 5
 y 8
@@ -1245,8 +1263,8 @@
 arch statue
 x 5
 y 31
-move_block 15
-move_on 1
+move_block walk fly_low fly_high swim
+move_on walk
 end
 arch pink-beige-c-marble_114
 x 5
@@ -1279,7 +1297,7 @@
 arch statue2
 x 5
 y 38
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 5
@@ -1466,7 +1484,7 @@
 arch brazier
 x 6
 y 31
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch pinkmarble
 x 6
@@ -1499,7 +1517,7 @@
 arch brazier
 x 6
 y 38
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 6
@@ -1648,6 +1666,10 @@
 y 27
 connected 1
 end
+arch dungeon_magic
+x 7
+y 27
+end
 arch marble
 x 7
 y 28
@@ -1671,7 +1693,7 @@
 arch cwall_3_4
 x 7
 y 30
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 7
@@ -1696,7 +1718,7 @@
 arch cwall_1_2
 x 7
 y 33
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 7
@@ -1792,7 +1814,7 @@
 x 8
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 8
 end
@@ -1800,7 +1822,7 @@
 x 8
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 8
 y 9
 end
@@ -1808,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
@@ -2357,7 +2380,7 @@
 endmsg
 x 10
 y 36
-move_on 3
+move_on walk fly_low
 end
 arch woodfloor
 x 10
@@ -2632,7 +2655,7 @@
 x 12
 y 8
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 8
 end
@@ -2640,7 +2663,7 @@
 x 12
 y 9
 end
-arch swall_2_1_1
+arch cwall_2_1_1
 x 12
 y 9
 end
@@ -2648,9 +2671,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
@@ -2935,6 +2959,10 @@
 y 27
 connected 2
 end
+arch dungeon_magic
+x 13
+y 27
+end
 arch marble
 x 13
 y 28
@@ -2958,7 +2986,7 @@
 arch cwall_3_2
 x 13
 y 30
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 13
@@ -2995,7 +3023,7 @@
 arch cwall_3_4
 x 13
 y 35
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 13
@@ -3304,6 +3332,10 @@
 x 15
 y 7
 end
+arch dungeon_magic
+x 15
+y 7
+end
 arch marble
 x 15
 y 8
@@ -3520,6 +3552,10 @@
 x 16
 y 7
 end
+arch dungeon_magic
+x 16
+y 7
+end
 arch marble
 x 16
 y 8
@@ -3746,6 +3782,10 @@
 x 17
 y 7
 end
+arch dungeon_magic
+x 17
+y 7
+end
 arch marble
 x 17
 y 8
@@ -3962,6 +4002,10 @@
 x 18
 y 7
 end
+arch dungeon_magic
+x 18
+y 7
+end
 arch marble
 x 18
 y 8
@@ -4275,7 +4319,7 @@
 arch cwall_3_4
 x 19
 y 18
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 19
@@ -4340,7 +4384,7 @@
 arch cwall_3_4
 x 19
 y 26
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 19
@@ -4373,7 +4417,7 @@
 arch cwall_3_4
 x 19
 y 30
-move_block 15
+move_block walk fly_low fly_high swim
 end
 arch marble
 x 19