--- cf.schmorp.de/maps/santo_dominion/tavern.2ndfloor.map	2006/06/11 08:01:01	1.3
+++ cf.schmorp.de/maps/santo_dominion/tavern.2ndfloor.map	2007/04/14 08:40:11	1.8
@@ -1,6 +1,6 @@
 arch map
+file_format_version 1
 name tavern upstairs
-region santodominion
 width 33
 height 31
 msg
@@ -829,7 +829,7 @@
 These are the private rooms of Bonzo
 the Banker. You cannot pass.
 endmsg
-face guard_med.111
+face guard_med.x11
 x 5
 y 12
 end
@@ -850,16 +850,15 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
 x 5
 y 16
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -1041,7 +1040,7 @@
 I'm sure he wouldn't employ guards if
 there wasn't good money in there.
 endmsg
-face thief.171
+face thief.x71
 hp 500
 maxhp 500
 x 6
@@ -1941,16 +1940,15 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
 x 11
 y 16
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -2570,9 +2568,8 @@
 x 14
 y 25
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -3078,9 +3075,8 @@
 x 18
 y 3
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -3207,7 +3203,7 @@
 There's a note on the door:
 I am ill. Please do not disturb.
 endmsg
-face ldoor_white2.111
+face ldoor_white2.x11
 x 18
 y 19
 end
@@ -3262,9 +3258,8 @@
 x 18
 y 25
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -3764,16 +3759,15 @@
 y 12
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
 x 21
 y 12
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -3842,7 +3836,7 @@
 If you do... I would... give you my...
 best plate mail.
 endmsg
-face corpse.111
+face corpse.x11
 hp 500
 maxhp 500
 x 21
@@ -3939,7 +3933,7 @@
 Do you see my friend Gorgon in the other
 room? He got poisoned. We need your help!
 endmsg
-face mage.131
+face mage.x31
 hp 500
 maxhp 500
 x 21
@@ -4066,7 +4060,7 @@
 You look like you are seeking adventures.
 Care to hear a story?
 endmsg
-face sorcerer.151
+face sorcerer.x51
 pow 3
 hp 200
 maxhp 200
@@ -4146,7 +4140,7 @@
 end
 arch residue
 name disease puddle
-face icor.111
+face icor.x11
 x 22
 y 19
 end
@@ -4407,15 +4401,15 @@
 y 25
 type 0
 attacktype 0
-move_on 0
+move_on -all
 lifesave 0
 end
 arch boulder
 name cauldron
-face cauldron_open.111
+face cauldron_open.x11
 x 23
 y 25
-move_block 0
+move_block -all
 can_roll 0
 end
 arch afloor_right
@@ -5076,16 +5070,15 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
 x 27
 y 16
 level 0
-material 0
 randomitems none
-move_block 0
+move_block -all
 alive 0
 end
 arch woodfloor
@@ -5521,7 +5514,7 @@
 x 29
 y 26
 connected 14
-move_on 0
+move_on -all
 end
 arch magic_mouth
 name 13
@@ -5532,7 +5525,7 @@
 x 29
 y 26
 connected 13
-move_on 0
+move_on -all
 end
 arch magic_mouth
 name 12
@@ -5543,7 +5536,7 @@
 x 29
 y 26
 connected 12
-move_on 0
+move_on -all
 end
 arch magic_mouth
 name 11
@@ -5554,7 +5547,7 @@
 x 29
 y 26
 connected 11
-move_on 0
+move_on -all
 end
 arch blocked
 x 29
@@ -5928,7 +5921,7 @@
 x 31
 y 26
 connected 20
-move_on 0
+move_on -all
 end
 arch woodfloor
 x 31