--- cf.schmorp.de/maps/santo_dominion/tavern.2ndfloor.map	2006/05/07 08:55:38	1.2
+++ cf.schmorp.de/maps/santo_dominion/tavern.2ndfloor.map	2007/01/19 16:34:11	1.5
@@ -1,4 +1,5 @@
 arch map
+file_format_version 1
 name tavern upstairs
 region santodominion
 width 33
@@ -829,7 +830,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,7 +851,7 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
@@ -1031,7 +1032,7 @@
 arch sage
 name Thief
 msg
-@match money|bonzo|bank|guard
+@match bank|bonzo|guard|money
 I'd like to sneak in there and steal
 Bonzo's money. But the guard never
 moves out. Damn it.
@@ -1041,7 +1042,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,7 +1942,7 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
@@ -3207,7 +3208,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
@@ -3764,7 +3765,7 @@
 y 12
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0
@@ -3829,7 +3830,7 @@
 arch sage
 name Gorgon the Warrior
 msg
-@match plate|mail
+@match mail|plate
 You greedy... rascal... get me the cure
 first. *cough, cough*
 @match viper
@@ -3842,7 +3843,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
@@ -3917,7 +3918,7 @@
 It is said that in very dark nights, when no moon
 is shining, he leaves the swamp to sneak around
 our houses.
-@match yes|cure|okay
+@match cure|okay|yes
 I'm still lacking three essential ingredients
 to mix a cure for my friend:
 - a beholder's tongue
@@ -3927,7 +3928,7 @@
 into the cauldron here. As a reminder you
 can take the list of ingredients from the
 bookshelve with you.
-@match help|gorgon|poison
+@match gorgon|help|poison
 Gorgon is a mighty warrior. A week ago
 he went into the marshes looking for the
 mudman who dwells there.
@@ -3939,7 +3940,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
@@ -4055,7 +4056,7 @@
 arch c_man
 name Sorcerer
 msg
-@match yes|story
+@match story|yes
 North of St. Dominion there is a huge
 tower, called the "Tower of Demonology".
 It has been a school for summoning wizards
@@ -4066,7 +4067,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 +4147,7 @@
 end
 arch residue
 name disease puddle
-face icor.111
+face icor.x11
 x 22
 y 19
 end
@@ -4412,7 +4413,7 @@
 end
 arch boulder
 name cauldron
-face cauldron_open.111
+face cauldron_open.x11
 x 23
 y 25
 move_block 0
@@ -5076,7 +5077,7 @@
 y 16
 end
 arch door_look_2
-face wooddoor_1.111
+face wooddoor_1.x11
 hp 0
 exp 0
 ac 0