--- deliantra/maps/brest/zorn/castle.basement0.map	2006/02/05 00:02:13	1.1.1.1
+++ deliantra/maps/brest/zorn/castle.basement0.map	2009/11/03 19:26:19	1.10
@@ -1,15 +1,15 @@
 arch map
-name castle.basement0
-region brest
-msg
-Creator: Gene Alexander
-Date:   10/04/2005
-endmsg
+file_format_version 1
+name Zorn Castle Basement
+darkness 5
 width 59
 height 59
 enter_x 30
 enter_y 5
-darkness 5
+msg
+Creator: Gene Alexander
+Date:   10/04/2005
+endmsg
 end
 arch blocked
 end
@@ -1906,9 +1906,9 @@
 y 7
 end
 arch torch_unlit
-nrof 5
 x 6
 y 7
+nrof 5
 end
 arch earth
 name dirt floor
@@ -3246,10 +3246,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 9
+level 25
 end
 arch flagstone
 x 9
@@ -3320,30 +3320,30 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 21
+level 25
 end
 arch flagstone
 x 9
 y 22
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 22
+level 25
 end
 arch flagstone
 x 9
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 23
+level 25
 end
 arch flagstone
 x 9
@@ -3358,30 +3358,30 @@
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 25
+level 25
 end
 arch flagstone
 x 9
 y 26
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 26
+level 25
 end
 arch flagstone
 x 9
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 9
 y 27
+level 25
 end
 arch flagstone
 x 9
@@ -3686,10 +3686,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 10
 y 23
+level 25
 end
 arch flagstone
 x 10
@@ -3704,10 +3704,10 @@
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 10
 y 25
+level 25
 end
 arch flagstone
 x 10
@@ -3722,10 +3722,10 @@
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 10
 y 27
+level 25
 end
 arch flagstone
 x 10
@@ -4084,10 +4084,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 23
+level 25
 end
 arch flagstone
 x 11
@@ -4102,10 +4102,10 @@
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 25
+level 25
 end
 arch flagstone
 x 11
@@ -4120,10 +4120,10 @@
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 27
+level 25
 end
 arch flagstone
 x 11
@@ -4174,10 +4174,10 @@
 y 36
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 36
+level 25
 end
 arch flagstone
 x 11
@@ -4212,40 +4212,40 @@
 y 42
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 42
+level 25
 end
 arch flagstone
 x 11
 y 43
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 43
+level 25
 end
 arch flagstone
 x 11
 y 44
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 44
+level 25
 end
 arch flagstone
 x 11
 y 45
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 11
 y 45
+level 25
 end
 arch flagstone
 x 11
@@ -4444,10 +4444,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 12
 y 23
+level 25
 end
 arch flagstone
 x 12
@@ -4462,10 +4462,10 @@
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 12
 y 25
+level 25
 end
 arch flagstone
 x 12
@@ -4480,10 +4480,10 @@
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 12
 y 27
+level 25
 end
 arch flagstone
 x 12
@@ -4746,10 +4746,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 13
 y 9
+level 25
 end
 arch flagstone
 x 13
@@ -4832,30 +4832,30 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 13
 y 23
+level 25
 end
 arch flagstone
 x 13
 y 24
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 13
 y 24
+level 25
 end
 arch flagstone
 x 13
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 13
 y 25
+level 25
 end
 arch flagstone
 x 13
@@ -4870,10 +4870,10 @@
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 13
 y 27
+level 25
 end
 arch flagstone
 x 13
@@ -5548,10 +5548,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 15
 y 21
+level 25
 end
 arch flagstone
 x 15
@@ -5642,20 +5642,20 @@
 y 40
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 15
 y 40
+level 25
 end
 arch flagstone
 x 15
 y 41
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 15
 y 41
+level 25
 end
 arch flagstone
 x 15
@@ -5921,7 +5921,7 @@
 x 16
 y 26
 end
-arch dun_2_2_1
+arch dun4
 x 16
 y 26
 end
@@ -6033,7 +6033,7 @@
 x 16
 y 42
 end
-arch dun_2_2_1
+arch dun4
 x 16
 y 42
 end
@@ -6202,10 +6202,10 @@
 y 11
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 17
 y 11
+level 25
 end
 arch flagstone
 x 17
@@ -6248,10 +6248,10 @@
 y 19
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 17
 y 19
+level 25
 end
 arch flagstone
 x 17
@@ -6266,10 +6266,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 17
 y 21
+level 25
 end
 arch flagstone
 x 17
@@ -6555,7 +6555,7 @@
 x 18
 y 16
 end
-arch dun_2_2_1
+arch dun4
 x 18
 y 16
 end
@@ -6576,10 +6576,10 @@
 y 19
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 18
 y 19
+level 25
 end
 arch flagstone
 x 18
@@ -6621,7 +6621,7 @@
 x 18
 y 24
 end
-arch dun_2_2_1
+arch dun4
 x 18
 y 24
 end
@@ -6681,7 +6681,7 @@
 x 18
 y 32
 end
-arch dun_2_2_1
+arch dun4
 x 18
 y 32
 end
@@ -6741,7 +6741,7 @@
 x 18
 y 40
 end
-arch dun_2_2_1
+arch dun4
 x 18
 y 40
 end
@@ -6801,7 +6801,7 @@
 x 18
 y 48
 end
-arch dun_2_2_1
+arch dun4
 x 18
 y 48
 end
@@ -6926,10 +6926,10 @@
 y 11
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 11
+level 25
 end
 arch flagstone
 x 19
@@ -6944,30 +6944,30 @@
 y 13
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 13
+level 25
 end
 arch flagstone
 x 19
 y 14
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 14
+level 25
 end
 arch flagstone
 x 19
 y 15
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 15
+level 25
 end
 arch flagstone
 x 19
@@ -6994,10 +6994,10 @@
 y 19
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 19
+level 25
 end
 arch flagstone
 x 19
@@ -7020,10 +7020,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 23
+level 25
 end
 arch flagstone
 x 19
@@ -7070,10 +7070,10 @@
 y 31
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 31
+level 25
 end
 arch flagstone
 x 19
@@ -7112,10 +7112,10 @@
 y 37
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 37
+level 25
 end
 arch flagstone
 x 19
@@ -7126,10 +7126,10 @@
 y 39
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 39
+level 25
 end
 arch flagstone
 x 19
@@ -7176,10 +7176,10 @@
 y 47
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 19
 y 47
+level 25
 end
 arch flagstone
 x 19
@@ -8709,7 +8709,7 @@
 x 24
 y 18
 end
-arch dun_2_2_1
+arch dun4
 x 24
 y 18
 end
@@ -8765,7 +8765,7 @@
 x 24
 y 26
 end
-arch dun_2_2_1
+arch dun4
 x 24
 y 26
 end
@@ -8821,7 +8821,7 @@
 x 24
 y 34
 end
-arch dun_2_2_1
+arch dun4
 x 24
 y 34
 end
@@ -8877,7 +8877,7 @@
 x 24
 y 42
 end
-arch dun_2_2_1
+arch dun4
 x 24
 y 42
 end
@@ -8886,10 +8886,10 @@
 y 43
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 24
 y 43
+level 25
 end
 arch flagstone
 x 24
@@ -9040,10 +9040,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 25
 y 9
+level 25
 end
 arch flagstone
 x 25
@@ -9162,10 +9162,10 @@
 y 33
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 25
 y 33
+level 25
 end
 arch flagstone
 x 25
@@ -9192,10 +9192,10 @@
 y 37
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 25
 y 37
+level 25
 end
 arch flagstone
 x 25
@@ -9242,10 +9242,10 @@
 y 45
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 25
 y 45
+level 25
 end
 arch flagstone
 x 25
@@ -9419,7 +9419,7 @@
 x 26
 y 16
 end
-arch dun_2_2_1
+arch dun4
 x 26
 y 16
 end
@@ -9479,7 +9479,7 @@
 x 26
 y 24
 end
-arch dun_2_2_1
+arch dun4
 x 26
 y 24
 end
@@ -9543,7 +9543,7 @@
 x 26
 y 32
 end
-arch dun_2_2_1
+arch dun4
 x 26
 y 32
 end
@@ -9552,10 +9552,10 @@
 y 33
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 26
 y 33
+level 25
 end
 arch flagstone
 x 26
@@ -9609,7 +9609,7 @@
 x 26
 y 40
 end
-arch dun_2_2_1
+arch dun4
 x 26
 y 40
 end
@@ -9669,7 +9669,7 @@
 x 26
 y 48
 end
-arch dun_2_2_1
+arch dun4
 x 26
 y 48
 end
@@ -9782,10 +9782,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 9
+level 25
 end
 arch flagstone
 x 27
@@ -9820,10 +9820,10 @@
 y 15
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 15
+level 25
 end
 arch flagstone
 x 27
@@ -9866,10 +9866,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 23
+level 25
 end
 arch flagstone
 x 27
@@ -9916,10 +9916,10 @@
 y 31
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 31
+level 25
 end
 arch flagstone
 x 27
@@ -9966,10 +9966,10 @@
 y 39
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 39
+level 25
 end
 arch flagstone
 x 27
@@ -10016,10 +10016,10 @@
 y 47
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 27
 y 47
+level 25
 end
 arch flagstone
 x 27
@@ -10760,17 +10760,17 @@
 end
 arch card
 name DM card
+name_pl DM cards
 msg
 This is the DM entry spot when using 'goto to get
 to the map. The majority of the map is below this
 point. An exit ladder is through the cave wall to
 the left.
 endmsg
-name_pl DM cards
-no_pick 1
-identified 1
 x 30
 y 5
+no_pick 1
+identified 1
 end
 arch earth
 name dirt floor
@@ -11268,10 +11268,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 31
 y 21
+level 25
 end
 arch flagstone
 x 31
@@ -11534,10 +11534,10 @@
 y 14
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 32
 y 14
+level 25
 end
 arch flagstone
 x 32
@@ -11567,7 +11567,7 @@
 x 32
 y 18
 end
-arch dun_2_2_1
+arch dun4
 x 32
 y 18
 end
@@ -11623,7 +11623,7 @@
 x 32
 y 26
 end
-arch dun_2_2_1
+arch dun4
 x 32
 y 26
 end
@@ -11679,7 +11679,7 @@
 x 32
 y 34
 end
-arch dun_2_2_1
+arch dun4
 x 32
 y 34
 end
@@ -11896,10 +11896,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 33
 y 9
+level 25
 end
 arch flagstone
 x 33
@@ -11966,10 +11966,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 33
 y 21
+level 25
 end
 arch flagstone
 x 33
@@ -12259,7 +12259,7 @@
 x 34
 y 16
 end
-arch dun_2_2_1
+arch dun4
 x 34
 y 16
 end
@@ -12319,7 +12319,7 @@
 x 34
 y 24
 end
-arch dun_2_2_1
+arch dun4
 x 34
 y 24
 end
@@ -12379,7 +12379,7 @@
 x 34
 y 32
 end
-arch dun_2_2_1
+arch dun4
 x 34
 y 32
 end
@@ -12439,7 +12439,7 @@
 x 34
 y 40
 end
-arch dun_2_2_1
+arch dun4
 x 34
 y 40
 end
@@ -12499,7 +12499,7 @@
 x 34
 y 48
 end
-arch dun_2_2_1
+arch dun4
 x 34
 y 48
 end
@@ -12612,10 +12612,10 @@
 y 9
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 9
+level 25
 end
 arch flagstone
 x 35
@@ -12650,10 +12650,10 @@
 y 15
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 15
+level 25
 end
 arch flagstone
 x 35
@@ -12696,20 +12696,20 @@
 y 22
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 22
+level 25
 end
 arch flagstone
 x 35
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 23
+level 25
 end
 arch flagstone
 x 35
@@ -12756,10 +12756,10 @@
 y 31
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 31
+level 25
 end
 arch flagstone
 x 35
@@ -12806,10 +12806,10 @@
 y 39
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 39
+level 25
 end
 arch flagstone
 x 35
@@ -12848,10 +12848,10 @@
 y 45
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 45
+level 25
 end
 arch flagstone
 x 35
@@ -12862,10 +12862,10 @@
 y 47
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 35
 y 47
+level 25
 end
 arch flagstone
 x 35
@@ -13040,10 +13040,10 @@
 y 18
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 36
 y 18
+level 25
 end
 arch flagstone
 x 36
@@ -13402,20 +13402,20 @@
 y 22
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 37
 y 22
+level 25
 end
 arch flagstone
 x 37
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 37
 y 23
+level 25
 end
 arch flagstone
 x 37
@@ -13438,10 +13438,10 @@
 y 27
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 37
 y 27
+level 25
 end
 arch flagstone
 x 37
@@ -13532,10 +13532,10 @@
 y 45
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 37
 y 45
+level 25
 end
 arch flagstone
 x 37
@@ -13554,10 +13554,10 @@
 y 49
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 37
 y 49
+level 25
 end
 arch earth
 name dirt floor
@@ -13672,11 +13672,11 @@
 y 10
 end
 arch locked_door2
-face ldoor_brown2.111
+slaying zorn_pet_pelt
 msg
 You need Zorn's pet pelt to open this door.
 endmsg
-slaying zorn_pet_pelt
+face ldoor_brown2.x11
 x 38
 y 10
 end
@@ -13717,10 +13717,10 @@
 y 15
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 38
 y 15
+level 25
 end
 arch flagstone
 x 38
@@ -14179,10 +14179,10 @@
 y 19
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 19
+level 25
 end
 arch flagstone
 x 39
@@ -14209,20 +14209,20 @@
 y 24
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 24
+level 25
 end
 arch flagstone
 x 39
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 25
+level 25
 end
 arch flagstone
 x 39
@@ -14253,10 +14253,10 @@
 y 31
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 31
+level 25
 end
 arch flagstone
 x 39
@@ -14271,10 +14271,10 @@
 y 33
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 33
+level 25
 end
 arch flagstone
 x 39
@@ -14341,30 +14341,30 @@
 y 47
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 47
+level 25
 end
 arch flagstone
 x 39
 y 48
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 48
+level 25
 end
 arch flagstone
 x 39
 y 49
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 39
 y 49
+level 25
 end
 arch earth
 name dirt floor
@@ -14507,10 +14507,10 @@
 y 14
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 40
 y 14
+level 25
 end
 arch flagstone
 x 40
@@ -14540,7 +14540,7 @@
 x 40
 y 18
 end
-arch dun_2_2_1
+arch dun4
 x 40
 y 18
 end
@@ -14652,7 +14652,7 @@
 x 40
 y 34
 end
-arch dun_2_2_1
+arch dun4
 x 40
 y 34
 end
@@ -15171,9 +15171,9 @@
 slaying castle.mainfloor
 hp 29
 sp 51
-speed 0.0
 x 42
 y 8
+speed 0.0
 end
 arch flagstone
 x 42
@@ -15243,7 +15243,7 @@
 x 42
 y 16
 end
-arch dun_2_2_1
+arch dun4
 x 42
 y 16
 end
@@ -15303,7 +15303,7 @@
 x 42
 y 24
 end
-arch dun_2_2_1
+arch dun4
 x 42
 y 24
 end
@@ -15363,7 +15363,7 @@
 x 42
 y 32
 end
-arch dun_2_2_1
+arch dun4
 x 42
 y 32
 end
@@ -15419,7 +15419,7 @@
 x 42
 y 40
 end
-arch dun_2_2_1
+arch dun4
 x 42
 y 40
 end
@@ -15619,10 +15619,10 @@
 y 13
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 13
+level 25
 end
 arch flagstone
 x 43
@@ -15633,10 +15633,10 @@
 y 15
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 15
+level 25
 end
 arch flagstone
 x 43
@@ -15675,10 +15675,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 21
+level 25
 end
 arch flagstone
 x 43
@@ -15689,10 +15689,10 @@
 y 23
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 23
+level 25
 end
 arch flagstone
 x 43
@@ -15739,10 +15739,10 @@
 y 31
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 31
+level 25
 end
 arch flagstone
 x 43
@@ -15789,10 +15789,10 @@
 y 39
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 43
 y 39
+level 25
 end
 arch flagstone
 x 43
@@ -15962,6 +15962,10 @@
 x 44
 y 10
 end
+arch giantrat
+x 44
+y 10
+end
 arch flagstone
 x 44
 y 11
@@ -16011,10 +16015,10 @@
 y 18
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 44
 y 18
+level 25
 end
 arch flagstone
 x 44
@@ -16337,10 +16341,10 @@
 y 13
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 13
+level 25
 end
 arch flagstone
 x 45
@@ -16359,10 +16363,10 @@
 y 17
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 17
+level 25
 end
 arch flagstone
 x 45
@@ -16389,10 +16393,10 @@
 y 21
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 21
+level 25
 end
 arch flagstone
 x 45
@@ -16411,10 +16415,10 @@
 y 25
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 25
+level 25
 end
 arch flagstone
 x 45
@@ -16529,10 +16533,10 @@
 y 47
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 47
+level 25
 end
 arch flagstone
 x 45
@@ -16547,10 +16551,10 @@
 y 49
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 45
 y 49
+level 25
 end
 arch earth
 name dirt floor
@@ -17038,16 +17042,15 @@
 arch teleporter
 hp 47
 sp 7
-connected 1002
-speed 0.0
 x 47
 y 1
+speed 0.0
+connected 1002
 end
 arch rubble
-material 0
-no_pass 1
 x 47
 y 1
+move_block all
 end
 arch blocked
 x 47
@@ -17087,10 +17090,10 @@
 end
 arch phole_2
 name hole in the ground
+slaying castle.basement0
 msg
 You enter a forgotten storage room.
 endmsg
-slaying castle.basement0
 hp 48
 sp 9
 x 47
@@ -17142,9 +17145,9 @@
 y 12
 end
 arch igate_closed_1
-connected 1001
 x 47
 y 12
+connected 1001
 end
 arch flagstone
 x 47
@@ -17343,20 +17346,20 @@
 y 48
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 47
 y 48
+level 25
 end
 arch flagstone
 x 47
 y 49
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 47
 y 49
+level 25
 end
 arch earth
 name dirt floor
@@ -17462,11 +17465,11 @@
 You set off a falling rocks trap that causes rubble to
 block the hole you see ahead.
 endmsg
-level 25
-Cha 100
-connected 1002
+cha 100
 x 48
 y 7
+level 25
+connected 1002
 end
 arch earth
 name dirt floor
@@ -17484,30 +17487,27 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 48
 y 9
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 48
 y 9
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 48
 y 9
+no_pick 1
 arch rubble
 end
 end
@@ -17524,9 +17524,9 @@
 y 11
 end
 arch button_lever
-connected 1001
 x 48
 y 11
+connected 1001
 end
 arch barrel
 x 48
@@ -17536,7 +17536,7 @@
 x 48
 y 12
 end
-arch dun_1_4
+arch dun6
 x 48
 y 12
 end
@@ -17545,9 +17545,9 @@
 y 13
 end
 arch button_lever
-connected 1001
 x 48
 y 13
+connected 1001
 end
 arch barrel
 x 48
@@ -17750,10 +17750,10 @@
 y 48
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 48
 y 48
+level 25
 end
 arch flagstone
 x 48
@@ -17867,11 +17867,11 @@
 You set off a falling rocks trap that causes rubble to
 block the hole you see ahead.
 endmsg
-level 25
-Cha 100
-connected 1002
+cha 100
 x 49
 y 7
+level 25
+connected 1002
 end
 arch earth
 name dirt floor
@@ -17889,20 +17889,18 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 9
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 9
+no_pick 1
 arch lantern_unlit
 name ancient lantern
 name_pl ancient lanterns
@@ -17911,20 +17909,18 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 9
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 9
+no_pick 1
 arch rubble
 end
 end
@@ -17939,30 +17935,27 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 10
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 10
+no_pick 1
 arch rubble
 end
 end
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 10
+no_pick 1
 arch rubble
 end
 end
@@ -18005,10 +17998,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 15
+no_pick 1
 arch rubble
 end
 end
@@ -18019,10 +18011,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 16
+no_pick 1
 arch rubble
 end
 end
@@ -18033,10 +18024,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 17
+no_pick 1
 arch rubble
 end
 end
@@ -18047,10 +18037,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 18
+no_pick 1
 arch rubble
 end
 end
@@ -18073,10 +18062,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 22
+no_pick 1
 arch rubble
 end
 end
@@ -18087,10 +18075,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 23
+no_pick 1
 arch rubble
 end
 end
@@ -18101,10 +18088,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 24
+no_pick 1
 arch rubble
 end
 end
@@ -18115,10 +18101,9 @@
 arch chest_2
 name old dusty chest
 name_pl old dusty chests
-material 0
-no_pick 1
 x 49
 y 25
+no_pick 1
 arch rubble
 end
 end
@@ -18245,20 +18230,20 @@
 y 48
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 49
 y 48
+level 25
 end
 arch flagstone
 x 49
 y 49
 end
 arch trap_spike_pit
-level 25
-Cha 100
+cha 100
 x 49
 y 49
+level 25
 end
 arch earth
 name dirt floor
@@ -18364,11 +18349,11 @@
 You set off a falling rocks trap that causes rubble to
 block the hole you see ahead.
 endmsg
-level 25
-Cha 100
-connected 1002
+cha 100
 x 50
 y 7
+level 25
+connected 1002
 end
 arch earth
 name dirt floor
@@ -18872,11 +18857,11 @@
 You set off a falling rocks trap that causes rubble to
 block the hole you see ahead.
 endmsg
-level 25
-Cha 100
-connected 1002
+cha 100
 x 51
 y 7
+level 25
+connected 1002
 end
 arch earth
 name dirt floor
@@ -21389,7 +21374,3 @@
 x 58
 y 58
 end
-arch giantrat
-x 44
-y 10
-end