--- cf.schmorp.de/maps/santo_dominion/tavern.map	2006/02/05 00:00:46	1.1
+++ cf.schmorp.de/maps/santo_dominion/tavern.map	2007/01/19 16:34:11	1.6
@@ -1,15 +1,16 @@
 arch map
+file_format_version 1
 name tavern
 region santodominion
+width 27
+height 23
+enter_x 14
+enter_y 18
 msg
 Creator: Andreas Vogl
 Email: red.blaze@gmx.net
 Date: Tue Apr  5 17:23:51 1994
 endmsg
-width 27
-height 23
-enter_x 14
-enter_y 18
 end
 arch grass
 end
@@ -413,10 +414,10 @@
 @match *
 Do you know Stig?
 endmsg
-friendly 1
-unaggressive 0
 x 3
 y 8
+friendly 1
+unaggressive 0
 end
 arch woodfloor
 x 3
@@ -773,24 +774,23 @@
 arch fighter
 name TCI Representative
 msg
-@match TCI|tci
+@match tci
 Training Centers Incorporated is the best dang training
 you'll ever get. We have locations all over the world in
 exotic settings. Come fight with us! (heh, they tell us we
 have to say all that)
-@match Location|location
+@match location
 Well, I don't know about all of them. But our local TCI
 is off the road south of here. Just look for one of our
 signs!
-@match Hello|hello|Hi|hi
+@match hello|hi
 Well, hello there! Sit down and chat with me a bit. I am
 always looking for new people to tell about TCI.
 @match *
 Hi there young'un. Wanna join TCI?
 endmsg
-reflect_missile 1
-reflect_spell 1
-friendly 1
+x 5
+y 17
 resist_physical 100
 resist_magic 100
 resist_fire 100
@@ -804,16 +804,17 @@
 resist_poison 100
 resist_slow 100
 resist_paralyze 100
+resist_turn_undead 100
 resist_fear 100
 resist_deplete 100
-resist_turn_undead 100
 resist_death 100
 resist_chaos 100
-resist_blind 100
-resist_holyword 100
 resist_godpower 100
-x 5
-y 17
+resist_holyword 100
+resist_blind 100
+friendly 1
+reflect_missile 1
+reflect_spell 1
 end
 arch woodfloor
 x 5
@@ -1144,12 +1145,12 @@
 y 2
 end
 arch cauldron
+x 8
+y 2
 material 0
+move_block all
 no_pick 1
-no_pass 1
 is_cauldron 0
-x 8
-y 2
 end
 arch woodfloor
 x 8
@@ -1163,10 +1164,10 @@
 endmsg
 hp 80
 maxhp 80
-friendly 1
-unaggressive 0
 x 8
 y 3
+friendly 1
+unaggressive 0
 end
 arch woodfloor
 x 8
@@ -1188,14 +1189,13 @@
 hp 0
 exp 0
 ac 0
+x 8
+y 7
 level 0
 material 0
 randomitems none
+move_block 0
 alive 0
-no_pass 0
-pass_thru 0
-x 8
-y 7
 end
 arch woodfloor
 x 8
@@ -1240,11 +1240,11 @@
 endmsg
 hp 100
 maxhp 100
+x 8
+y 13
 friendly 1
 unaggressive 0
 random_movement 0
-x 8
-y 13
 end
 arch woodfloor
 x 8
@@ -1748,14 +1748,13 @@
 hp 0
 exp 0
 ac 0
+x 12
+y 4
 level 0
 material 0
 randomitems none
+move_block 0
 alive 0
-no_pass 0
-pass_thru 0
-x 12
-y 4
 end
 arch woodfloor
 x 12
@@ -1834,9 +1833,9 @@
 y 18
 end
 arch flowers_permanent
-no_pick 1
 x 12
 y 18
+no_pick 1
 end
 arch woodfloor
 x 12
@@ -2051,17 +2050,17 @@
 @match mudman
 Shhh! You must not speak HIS name!
 It's not healthy to be that curious.
-@match warrior|wound|upstairs
+@match upstairs|warrior|wound
 Maybe you should look after him?
 @match *
 There's a wounded warrior in one of the
 rooms upstairs. That guy is in real bad
 shape. I wonder what happened to him?
 endmsg
-unaggressive 0
-friendly 1
 x 14
 y 8
+friendly 1
+unaggressive 0
 end
 arch woodfloor
 x 14
@@ -2122,14 +2121,13 @@
 hp 0
 exp 0
 ac 0
+x 14
+y 19
 level 0
 material 0
 randomitems none
+move_block 0
 alive 0
-no_pass 0
-pass_thru 0
-x 14
-y 19
 end
 arch dungeon_magic
 x 14
@@ -2202,9 +2200,9 @@
 y 7
 end
 arch mover_7
-attacktype 1
 x 15
 y 8
+attacktype 1
 end
 arch woodfloor
 x 15
@@ -2246,14 +2244,13 @@
 hp 0
 exp 0
 ac 0
+x 15
+y 14
 level 0
 material 0
 randomitems none
+move_block 0
 alive 0
-no_pass 0
-pass_thru 0
-x 15
-y 14
 end
 arch woodfloor
 x 15
@@ -2373,9 +2370,9 @@
 y 7
 end
 arch mover_7
-attacktype 1
 x 16
 y 8
+attacktype 1
 end
 arch woodfloor
 x 16
@@ -2437,9 +2434,9 @@
 y 18
 end
 arch flowers_permanent
-no_pick 1
 x 16
 y 18
+no_pick 1
 end
 arch woodfloor
 x 16
@@ -2842,9 +2839,8 @@
 end
 arch wizard
 name blue wizard
-face wizard_blue.151
 msg
-@match mudman|hero|yes|gate
+@match gate|hero|mudman|yes
 The inhabitants of St. Dominion are
 scared of the Mudman. Kill him and
 put his residue on my table. Then I
@@ -2855,25 +2851,26 @@
 you prove yourself worthy by killing
 the Mudman.
 endmsg
-type 0
-Str 10
-Con 20
+face wizard_blue.x51
+str 10
+con 20
 hp 300
 maxhp 300
+x 19
+y 8
 level 15
+type 0
 monster 1
 friendly 1
-x 19
-y 8
 end
 arch altar
 name 1
 slaying Mudman's residue
 food 1
-protected 1
-connected 1
 x 19
 y 9
+resist_physical 30
+connected 1
 end
 arch magic_mouth
 name 1
@@ -2882,22 +2879,21 @@
 You defeated the Mudman, you are
 truely a hero! Take your reward.
 endmsg
-protected 1
-connected 1
-walk_on 0
-fly_on 0
 x 19
 y 9
+resist_physical 30
+connected 1
+move_on 0
 end
 arch woodfloor
 x 19
 y 9
 end
 arch table_3
-material 0
-no_pick 1
 x 19
 y 9
+material 0
+no_pick 1
 end
 arch woodfloor
 x 19
@@ -3055,11 +3051,11 @@
 y 7
 end
 arch grate_closed_1
-speed 0.500000
-protected 1
-connected 1
 x 20
 y 7
+speed 0.500000
+resist_physical 30
+connected 1
 end
 arch woodfloor
 x 20
@@ -3205,11 +3201,11 @@
 y 7
 end
 arch grate_closed_1
-speed 0.500000
-protected 1
-connected 1
 x 21
 y 7
+speed 0.500000
+resist_physical 30
+connected 1
 end
 arch woodfloor
 x 21
@@ -3262,9 +3258,9 @@
 Damn! Those chairs are too high for
 me. I hate this world...
 endmsg
-friendly 1
 x 21
 y 16
+friendly 1
 end
 arch woodfloor
 x 21