--- cf.schmorp.de/maps/sisters/shrine1.map	2006/02/05 00:01:03	1.1
+++ cf.schmorp.de/maps/sisters/shrine1.map	2006/09/04 19:34:52	1.3
@@ -1,18 +1,16 @@
 arch map
 name shrine1
+difficulty 15
+darkness 5
+width 32
+height 34
 msg
 Creator: bt
 Email: thomas@nomad.astro.psu.edu
 Date: Mon Dec 19 17:04:41 1994
 endmsg
-width 32
-height 34
-difficulty 15
-darkness 5
 end
 arch blocked
-msg
-endmsg
 y 5
 end
 arch cobblestones2
@@ -136,15 +134,13 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 y 26
 end
 arch firewall_3
 other_arch meteor
 dam 90
-speed -0.050000
 y 27
+speed -0.050000
 end
 arch blocked
 x 1
@@ -166,7 +162,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 1
 y 7
@@ -187,7 +183,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 1
 y 9
@@ -220,7 +216,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 1
 y 14
@@ -294,8 +290,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 1
 y 26
 end
@@ -335,7 +329,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 2
 y 11
@@ -372,7 +366,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 2
 y 17
@@ -405,7 +399,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 2
 y 21
@@ -431,15 +425,13 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 2
 y 26
 end
 arch igate_closed_2
-connected 13
 x 2
 y 27
+connected 13
 end
 arch blocked
 x 3
@@ -461,7 +453,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 3
 y 7
@@ -591,8 +583,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 3
 y 26
 end
@@ -639,7 +629,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 4
 y 8
@@ -660,7 +650,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 4
 y 11
@@ -685,7 +675,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 4
 y 14
@@ -699,26 +689,18 @@
 y 15
 end
 arch blocked
-msg
-endmsg
 x 4
 y 16
 end
 arch blocked
-msg
-endmsg
 x 4
 y 17
 end
 arch blocked
-msg
-endmsg
 x 4
 y 18
 end
 arch blocked
-msg
-endmsg
 x 4
 y 19
 end
@@ -735,9 +717,9 @@
 y 21
 end
 arch button_handle
-connected 13
 x 4
 y 21
+connected 13
 end
 arch dungeon_floor
 x 4
@@ -769,8 +751,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 4
 y 26
 end
@@ -852,7 +832,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 5
 y 11
@@ -954,9 +934,9 @@
 y 24
 end
 arch igate_closed_2
-connected 13
 x 5
 y 24
+connected 13
 end
 arch cobblestones2
 x 5
@@ -967,8 +947,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 5
 y 26
 end
@@ -986,7 +964,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 6
 y 1
@@ -1003,7 +981,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 6
 y 3
@@ -1060,7 +1038,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 6
 y 12
@@ -1097,7 +1075,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 6
 y 18
@@ -1111,20 +1089,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 6
 y 20
 end
 arch blocked
-msg
-endmsg
 x 6
 y 21
 end
 arch blocked
-msg
-endmsg
 x 6
 y 22
 end
@@ -1141,10 +1113,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 6
 y 24
+level 15
 end
 arch cobblestones2
 x 6
@@ -1155,8 +1127,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 6
 y 26
 end
@@ -1192,9 +1162,9 @@
 end
 arch locked_door1
 slaying sdoor3
-blocksview 1
 x 7
 y 6
+blocksview 1
 end
 arch magic_mouth
 msg
@@ -1242,9 +1212,9 @@
 end
 arch locked_door1
 slaying sdoor1
-blocksview 1
 x 7
 y 13
+blocksview 1
 end
 arch flagstone
 x 7
@@ -1275,20 +1245,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 7
 y 20
 end
 arch blocked
-msg
-endmsg
 x 7
 y 21
 end
 arch blocked
-msg
-endmsg
 x 7
 y 22
 end
@@ -1309,10 +1273,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 7
 y 24
+level 15
 end
 arch cobblestones2
 x 7
@@ -1323,8 +1287,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 7
 y 26
 end
@@ -1342,7 +1304,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 8
 y 1
@@ -1357,23 +1319,25 @@
 end
 arch wraith
 name Spirit guardian of Chaos
-Con 20
-Int 5
+con 20
+int 5
 hp 4000
 sp 50
 maxsp 50
 exp 50000
 dam 50
+x 8
+y 3
 speed -0.300000
 level 20
-immune 278657
-protected 2
 attacktype 16
+resist_physical 100
+resist_magic 30
+resist_drain 100
+resist_fear 100
+resist_chaos 100
 see_invisible 1
-can_pass_thru 0
 can_cast_spell 1
-x 8
-y 3
 arch abil_icestorm
 end
 arch abil_fear
@@ -1467,23 +1431,25 @@
 end
 arch wraith
 name Spirit guardian of Chaos
-Con 20
-Int 5
+con 20
+int 5
 hp 4000
 sp 50
 maxsp 50
 exp 50000
 dam 50
+x 8
+y 16
 speed -0.300000
 level 20
-immune 278657
-protected 2
 attacktype 16
+resist_physical 100
+resist_magic 30
+resist_drain 100
+resist_fear 100
+resist_chaos 100
 see_invisible 1
-can_pass_thru 0
 can_cast_spell 1
-x 8
-y 16
 arch abil_icestorm
 end
 arch abil_fear
@@ -1508,20 +1474,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 8
 y 20
 end
 arch blocked
-msg
-endmsg
 x 8
 y 21
 end
 arch blocked
-msg
-endmsg
 x 8
 y 22
 end
@@ -1538,10 +1498,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 8
 y 24
+level 15
 end
 arch cobblestones2
 x 8
@@ -1552,8 +1512,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 8
 y 26
 end
@@ -1592,38 +1550,26 @@
 y 6
 end
 arch blocked
-msg
-endmsg
 x 9
 y 7
 end
 arch blocked
-msg
-endmsg
 x 9
 y 8
 end
 arch blocked
-msg
-endmsg
 x 9
 y 9
 end
 arch blocked
-msg
-endmsg
 x 9
 y 10
 end
 arch blocked
-msg
-endmsg
 x 9
 y 11
 end
 arch blocked
-msg
-endmsg
 x 9
 y 12
 end
@@ -1643,7 +1589,7 @@
 msg
 You are hit by falling rocks!
 endmsg
-Cha 32
+cha 32
 dam 90
 x 9
 y 14
@@ -1673,20 +1619,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 9
 y 20
 end
 arch blocked
-msg
-endmsg
 x 9
 y 21
 end
 arch blocked
-msg
-endmsg
 x 9
 y 22
 end
@@ -1703,10 +1643,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 9
 y 24
+level 15
 end
 arch cobblestones2
 x 9
@@ -1717,17 +1657,15 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 9
 y 26
 end
 arch teleporter
 hp 6
 sp 24
-speed 1.000000
 x 9
 y 27
+speed 1.000000
 end
 arch cobblestones2
 x 10
@@ -1856,20 +1794,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 10
 y 20
 end
 arch blocked
-msg
-endmsg
 x 10
 y 21
 end
 arch blocked
-msg
-endmsg
 x 10
 y 22
 end
@@ -1886,10 +1818,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 10
 y 24
+level 15
 end
 arch cobblestones2
 x 10
@@ -1900,8 +1832,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 10
 y 26
 end
@@ -2040,20 +1970,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 11
 y 20
 end
 arch blocked
-msg
-endmsg
 x 11
 y 21
 end
 arch blocked
-msg
-endmsg
 x 11
 y 22
 end
@@ -2070,10 +1994,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 11
 y 24
+level 15
 end
 arch cobblestones2
 x 11
@@ -2084,20 +2008,14 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 11
 y 26
 end
 arch blocked
-msg
-endmsg
 x 11
 y 27
 end
 arch blocked
-msg
-endmsg
 x 11
 y 28
 end
@@ -2106,14 +2024,10 @@
 y 29
 end
 arch blocked
-msg
-endmsg
 x 11
 y 30
 end
 arch blocked
-msg
-endmsg
 x 11
 y 31
 end
@@ -2132,9 +2046,9 @@
 y 2
 end
 arch button_handle
-connected 30
 x 12
 y 2
+connected 30
 end
 arch sea
 x 12
@@ -2229,9 +2143,9 @@
 y 17
 end
 arch button_handle
-connected 50
 x 12
 y 17
+connected 50
 end
 arch flagstone
 x 12
@@ -2246,20 +2160,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 12
 y 20
 end
 arch blocked
-msg
-endmsg
 x 12
 y 21
 end
 arch blocked
-msg
-endmsg
 x 12
 y 22
 end
@@ -2276,10 +2184,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 12
 y 24
+level 15
 end
 arch cobblestones2
 x 12
@@ -2290,8 +2198,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 12
 y 26
 end
@@ -2328,14 +2234,10 @@
 y 30
 end
 arch blocked
-msg
-endmsg
 x 12
 y 31
 end
 arch blocked
-msg
-endmsg
 x 12
 y 32
 end
@@ -2510,10 +2412,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 13
 y 24
+level 15
 end
 arch cobblestones2
 x 13
@@ -2564,14 +2466,10 @@
 y 31
 end
 arch blocked
-msg
-endmsg
 x 13
 y 32
 end
 arch blocked
-msg
-endmsg
 x 13
 y 33
 end
@@ -2707,9 +2605,9 @@
 y 21
 end
 arch button_handle
-connected 13
 x 14
 y 21
+connected 13
 end
 arch cobblestones2
 x 14
@@ -2732,9 +2630,9 @@
 y 24
 end
 arch igate_closed_2
-connected 13
 x 14
 y 24
+connected 13
 end
 arch cobblestones2
 x 14
@@ -2757,10 +2655,10 @@
 y 27
 end
 arch statue
-can_roll 1
-move_type 1
 x 14
 y 27
+move_type walk
+can_roll 1
 end
 arch dungeon_floor
 x 14
@@ -2775,10 +2673,10 @@
 y 30
 end
 arch statue
-can_roll 1
-move_type 1
 x 14
 y 30
+move_type walk
+can_roll 1
 end
 arch cobblestones2
 x 14
@@ -2822,9 +2720,9 @@
 end
 arch locked_door1
 slaying eye_door
-blocksview 1
 x 15
 y 4
+blocksview 1
 end
 arch flagstone
 x 15
@@ -2846,6 +2744,20 @@
 x 15
 y 9
 end
+arch lamia
+name Tarthia the black lamia
+msg
+@match *
+I'll eat your soul!
+endmsg
+x 15
+y 9
+carrying 100
+arch key2
+name a key
+slaying eye_door
+end
+end
 arch flagstone
 x 15
 y 10
@@ -2871,36 +2783,36 @@
 y 15
 end
 arch igate_closed_1
-connected 40
 x 15
 y 15
+connected 40
 end
 arch flagstone
 x 15
 y 16
 end
 arch igate_closed_1
-connected 60
 x 15
 y 16
+connected 60
 end
 arch flagstone
 x 15
 y 17
 end
 arch igate_closed_1
-connected 30
 x 15
 y 17
+connected 30
 end
 arch flagstone
 x 15
 y 18
 end
 arch igate_closed_1
-connected 50
 x 15
 y 18
+connected 50
 end
 arch dungeon_floor
 x 15
@@ -2968,10 +2880,10 @@
 end
 arch blocked
 name path of night
-no_pass 0
-is_floor 1
 x 15
 y 32
+move_block 0
+is_floor 1
 end
 arch exit
 slaying /sisters/shrine0
@@ -2982,10 +2894,10 @@
 end
 arch blocked
 name path of night
-no_pass 0
-is_floor 1
 x 15
 y 33
+move_block 0
+is_floor 1
 end
 arch blocked
 x 16
@@ -3009,9 +2921,9 @@
 end
 arch locked_door1
 slaying eye_door
-blocksview 1
 x 16
 y 4
+blocksview 1
 end
 arch flagstone
 x 16
@@ -3058,36 +2970,36 @@
 y 15
 end
 arch igate_closed_1
-connected 40
 x 16
 y 15
+connected 40
 end
 arch flagstone
 x 16
 y 16
 end
 arch igate_closed_1
-connected 60
 x 16
 y 16
+connected 60
 end
 arch flagstone
 x 16
 y 17
 end
 arch igate_closed_1
-connected 30
 x 16
 y 17
+connected 30
 end
 arch flagstone
 x 16
 y 18
 end
 arch igate_closed_1
-connected 50
 x 16
 y 18
+connected 50
 end
 arch dungeon_floor
 x 16
@@ -3289,9 +3201,9 @@
 y 21
 end
 arch button_handle
-connected 14
 x 17
 y 21
+connected 14
 end
 arch cobblestones2
 x 17
@@ -3314,9 +3226,9 @@
 y 24
 end
 arch igate_closed_2
-connected 14
 x 17
 y 24
+connected 14
 end
 arch cobblestones2
 x 17
@@ -3339,10 +3251,10 @@
 y 27
 end
 arch statue
-can_roll 1
-move_type 1
 x 17
 y 27
+move_type walk
+can_roll 1
 end
 arch dungeon_floor
 x 17
@@ -3357,10 +3269,10 @@
 y 30
 end
 arch statue
-can_roll 1
-move_type 1
 x 17
 y 30
+move_type walk
+can_roll 1
 end
 arch cobblestones2
 x 17
@@ -3375,8 +3287,6 @@
 y 32
 end
 arch blocked
-msg
-endmsg
 x 17
 y 33
 end
@@ -3551,10 +3461,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 18
 y 24
+level 15
 end
 arch cobblestones2
 x 18
@@ -3605,8 +3515,6 @@
 y 31
 end
 arch blocked
-msg
-endmsg
 x 18
 y 32
 end
@@ -3625,9 +3533,9 @@
 y 2
 end
 arch button_handle
-connected 40
 x 19
 y 2
+connected 40
 end
 arch sea
 x 19
@@ -3722,9 +3630,9 @@
 y 17
 end
 arch button_handle
-connected 60
 x 19
 y 17
+connected 60
 end
 arch flagstone
 x 19
@@ -3739,20 +3647,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 19
 y 20
 end
 arch blocked
-msg
-endmsg
 x 19
 y 21
 end
 arch blocked
-msg
-endmsg
 x 19
 y 22
 end
@@ -3769,10 +3671,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 19
 y 24
+level 15
 end
 arch cobblestones2
 x 19
@@ -3783,8 +3685,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 19
 y 26
 end
@@ -3821,14 +3721,10 @@
 y 30
 end
 arch blocked
-msg
-endmsg
 x 19
 y 31
 end
 arch blocked
-msg
-endmsg
 x 19
 y 32
 end
@@ -3967,20 +3863,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 20
 y 20
 end
 arch blocked
-msg
-endmsg
 x 20
 y 21
 end
 arch blocked
-msg
-endmsg
 x 20
 y 22
 end
@@ -3997,10 +3887,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 20
 y 24
+level 15
 end
 arch cobblestones2
 x 20
@@ -4011,20 +3901,14 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 20
 y 26
 end
 arch blocked
-msg
-endmsg
 x 20
 y 27
 end
 arch blocked
-msg
-endmsg
 x 20
 y 28
 end
@@ -4033,14 +3917,10 @@
 y 29
 end
 arch blocked
-msg
-endmsg
 x 20
 y 30
 end
 arch blocked
-msg
-endmsg
 x 20
 y 31
 end
@@ -4171,20 +4051,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 21
 y 20
 end
 arch blocked
-msg
-endmsg
 x 21
 y 21
 end
 arch blocked
-msg
-endmsg
 x 21
 y 22
 end
@@ -4201,10 +4075,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 21
 y 24
+level 15
 end
 arch cobblestones2
 x 21
@@ -4215,8 +4089,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 21
 y 26
 end
@@ -4236,23 +4108,25 @@
 end
 arch wraith
 name Spirit guardian of Chaos
-Con 20
-Int 5
+con 20
+int 5
 hp 4000
 sp 50
 maxsp 50
 exp 50000
 dam 50
+x 22
+y 2
 speed -0.300000
 level 20
-immune 278657
-protected 2
 attacktype 16
+resist_physical 100
+resist_magic 30
+resist_drain 100
+resist_fear 100
+resist_chaos 100
 see_invisible 1
-can_pass_thru 0
 can_cast_spell 1
-x 22
-y 2
 arch abil_icestorm
 end
 arch abil_fear
@@ -4281,38 +4155,26 @@
 y 6
 end
 arch blocked
-msg
-endmsg
 x 22
 y 7
 end
 arch blocked
-msg
-endmsg
 x 22
 y 8
 end
 arch blocked
-msg
-endmsg
 x 22
 y 9
 end
 arch blocked
-msg
-endmsg
 x 22
 y 10
 end
 arch blocked
-msg
-endmsg
 x 22
 y 11
 end
 arch blocked
-msg
-endmsg
 x 22
 y 12
 end
@@ -4342,23 +4204,25 @@
 end
 arch wraith
 name Spirit guardian of Chaos
-Con 20
-Int 5
+con 20
+int 5
 hp 4000
 sp 50
 maxsp 50
 exp 50000
 dam 50
+x 22
+y 17
 speed -0.300000
 level 20
-immune 278657
-protected 2
 attacktype 16
+resist_physical 100
+resist_magic 30
+resist_drain 100
+resist_fear 100
+resist_chaos 100
 see_invisible 1
-can_pass_thru 0
 can_cast_spell 1
-x 22
-y 17
 arch abil_icestorm
 end
 arch abil_fear
@@ -4379,20 +4243,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 22
 y 20
 end
 arch blocked
-msg
-endmsg
 x 22
 y 21
 end
 arch blocked
-msg
-endmsg
 x 22
 y 22
 end
@@ -4409,10 +4267,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 22
 y 24
+level 15
 end
 arch cobblestones2
 x 22
@@ -4423,17 +4281,15 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 22
 y 26
 end
 arch teleporter
 hp 25
 sp 24
-speed 1.000000
 x 22
 y 27
+speed 1.000000
 end
 arch cobblestones2
 x 23
@@ -4486,14 +4342,10 @@
 y 8
 end
 arch blocked
-msg
-endmsg
 x 23
 y 9
 end
 arch blocked
-msg
-endmsg
 x 23
 y 10
 end
@@ -4550,20 +4402,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 23
 y 20
 end
 arch blocked
-msg
-endmsg
 x 23
 y 21
 end
 arch blocked
-msg
-endmsg
 x 23
 y 22
 end
@@ -4580,10 +4426,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 23
 y 24
+level 15
 end
 arch cobblestones2
 x 23
@@ -4594,8 +4440,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 23
 y 26
 end
@@ -4631,9 +4475,9 @@
 end
 arch locked_door1
 slaying sdoor4
-blocksview 1
 x 24
 y 6
+blocksview 1
 end
 arch magic_mouth
 msg
@@ -4656,14 +4500,10 @@
 y 8
 end
 arch blocked
-msg
-endmsg
 x 24
 y 9
 end
 arch blocked
-msg
-endmsg
 x 24
 y 10
 end
@@ -4693,9 +4533,9 @@
 end
 arch locked_door1
 slaying sdoor2
-blocksview 1
 x 24
 y 13
+blocksview 1
 end
 arch flagstone
 x 24
@@ -4726,20 +4566,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 24
 y 20
 end
 arch blocked
-msg
-endmsg
 x 24
 y 21
 end
 arch blocked
-msg
-endmsg
 x 24
 y 22
 end
@@ -4756,10 +4590,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 24
 y 24
+level 15
 end
 arch cobblestones2
 x 24
@@ -4770,8 +4604,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 24
 y 26
 end
@@ -4822,14 +4654,10 @@
 y 8
 end
 arch blocked
-msg
-endmsg
 x 25
 y 9
 end
 arch blocked
-msg
-endmsg
 x 25
 y 10
 end
@@ -4882,20 +4710,14 @@
 y 19
 end
 arch blocked
-msg
-endmsg
 x 25
 y 20
 end
 arch blocked
-msg
-endmsg
 x 25
 y 21
 end
 arch blocked
-msg
-endmsg
 x 25
 y 22
 end
@@ -4912,10 +4734,10 @@
 y 24
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 25
 y 24
+level 15
 end
 arch cobblestones2
 x 25
@@ -4926,8 +4748,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 25
 y 26
 end
@@ -5118,9 +4938,9 @@
 y 24
 end
 arch igate_closed_2
-connected 14
 x 26
 y 24
+connected 14
 end
 arch cobblestones2
 x 26
@@ -5131,43 +4951,29 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 26
 y 26
 end
 arch blocked
-msg
-endmsg
 x 27
 end
 arch blocked
-msg
-endmsg
 x 27
 y 1
 end
 arch blocked
-msg
-endmsg
 x 27
 y 2
 end
 arch blocked
-msg
-endmsg
 x 27
 y 3
 end
 arch blocked
-msg
-endmsg
 x 27
 y 4
 end
 arch blocked
-msg
-endmsg
 x 27
 y 5
 end
@@ -5212,38 +5018,26 @@
 y 13
 end
 arch blocked
-msg
-endmsg
 x 27
 y 14
 end
 arch blocked
-msg
-endmsg
 x 27
 y 15
 end
 arch blocked
-msg
-endmsg
 x 27
 y 16
 end
 arch blocked
-msg
-endmsg
 x 27
 y 17
 end
 arch blocked
-msg
-endmsg
 x 27
 y 18
 end
 arch blocked
-msg
-endmsg
 x 27
 y 19
 end
@@ -5260,9 +5054,9 @@
 y 21
 end
 arch button_handle
-connected 14
 x 27
 y 21
+connected 14
 end
 arch dungeon_floor
 x 27
@@ -5289,15 +5083,13 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 27
 y 26
 end
 arch igate_closed_2
-connected 14
 x 27
 y 27
+connected 14
 end
 arch blocked
 x 28
@@ -5319,6 +5111,26 @@
 x 28
 y 8
 end
+arch cobra
+name giant pit viper
+hp 3000
+exp 5000
+ac -5
+x 28
+y 8
+speed -0.300000
+level 15
+can_use_bow 1
+can_use_weapon 1
+has_ready_bow 1
+can_see_in_dark 1
+arch ability_spit_acid
+applied 1
+end
+arch acid_spit
+nrof 100
+end
+end
 arch dungeon_floor
 x 28
 y 9
@@ -5344,38 +5156,26 @@
 y 13
 end
 arch blocked
-msg
-endmsg
 x 28
 y 14
 end
 arch blocked
-msg
-endmsg
 x 28
 y 15
 end
 arch blocked
-msg
-endmsg
 x 28
 y 16
 end
 arch blocked
-msg
-endmsg
 x 28
 y 17
 end
 arch blocked
-msg
-endmsg
 x 28
 y 18
 end
 arch blocked
-msg
-endmsg
 x 28
 y 19
 end
@@ -5412,8 +5212,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 28
 y 26
 end
@@ -5542,8 +5340,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 29
 y 26
 end
@@ -5600,30 +5396,30 @@
 y 14
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 30
 y 14
+level 15
 end
 arch dungeon_floor
 x 30
 y 15
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 30
 y 15
+level 15
 end
 arch dungeon_floor
 x 30
 y 16
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 30
 y 16
+level 15
 end
 arch dungeon_floor
 x 30
@@ -5638,20 +5434,20 @@
 y 18
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 30
 y 18
+level 15
 end
 arch dungeon_floor
 x 30
 y 19
 end
 arch trap_blades
-Cha 64
-level 15
+cha 64
 x 30
 y 19
+level 15
 end
 arch dungeon_floor
 x 30
@@ -5686,8 +5482,6 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 30
 y 26
 end
@@ -5856,48 +5650,12 @@
 y 25
 end
 arch blocked
-msg
-endmsg
 x 31
 y 26
 end
 arch firewall_7
 dam 90
-speed -0.050000
 x 31
 y 27
-end
-arch lamia
-name Tarthia the black lamia
-msg
-@match *
-I'll eat your soul!
-endmsg
-carrying 100
-x 15
-y 9
-arch key2
-name a key
-slaying eye_door
-end
-end
-arch cobra
-name giant pit viper
-hp 3000
-exp 5000
-ac -5
-speed -0.300000
-level 15
-can_use_bow 1
-can_use_weapon 1
-can_see_in_dark 1
-has_ready_bow 1
-x 28
-y 8
-arch ability_spit_acid
-applied 1
-end
-arch acid_spit
-nrof 100
-end
+speed -0.050000
 end