--- deliantra/maps/navar_city/mlab/tavern.map	2006/02/05 00:01:15	1.1
+++ deliantra/maps/navar_city/mlab/tavern.map	2007/01/03 02:19:52	1.4
@@ -1,7 +1,7 @@
 arch map
-region navar
 reset_timeout 7200
 difficulty 1
+region navar
 width 95
 height 80
 enter_x 1
@@ -1303,7 +1303,7 @@
 arch swall_0
 name barrel
 name_pl barrel
-face barrel.111
+face barrel.x11
 x 2
 y 20
 end
@@ -2404,7 +2404,7 @@
 arch door_1
 x 4
 y 19
-no_pass 0
+move_block 0
 end
 arch flagstone
 x 4
@@ -2421,7 +2421,7 @@
 arch door_1
 x 4
 y 21
-no_pass 0
+move_block 0
 end
 arch stonefloor2
 name stonefloor
@@ -3520,8 +3520,8 @@
 y 49
 value 20000
 weight 9999999
+move_block 0
 no_pick 0
-no_pass 0
 end
 arch marble
 x 6
@@ -4354,7 +4354,7 @@
 they say there is a wizard with...
 something.... passage... clouds....
 *passes out*
-@match hi|hello
+@match hello|hi
 *groan*... uhhhh I still feel ...
 ug... shouldent of went up the tower
 endmsg
@@ -4537,8 +4537,8 @@
 y 47
 value 20000
 weight 9999999
+move_block 0
 no_pick 0
-no_pass 0
 end
 arch marble
 x 8
@@ -4567,8 +4567,8 @@
 y 51
 value 20000
 weight 9999999
+move_block 0
 no_pick 0
-no_pass 0
 end
 arch marble
 x 8
@@ -5712,8 +5712,8 @@
 y 49
 value 20000
 weight 9999999
+move_block 0
 no_pick 0
-no_pass 0
 end
 arch marble
 x 10
@@ -8678,7 +8678,7 @@
 arch bench_1_4
 x 16
 y 9
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -8829,9 +8829,9 @@
 y 27
 end
 arch fireborn
-Str 7
-Con 4
-Cha 4
+str 7
+con 4
+cha 4
 hp 100
 maxhp 100
 x 16
@@ -8910,7 +8910,7 @@
 arch firewall_1
 name wall
 name_pl wall
-face awall_A.111
+face awall_A.x11
 x 16
 y 35
 arch spell_small_fireball
@@ -9251,7 +9251,7 @@
 arch bench_2_2_3
 x 17
 y 9
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9262,7 +9262,7 @@
 arch bench_2_1_1
 x 17
 y 10
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9273,7 +9273,7 @@
 arch bench_2_1_1
 x 17
 y 11
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9284,7 +9284,7 @@
 arch bench_2_1_1
 x 17
 y 12
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9295,7 +9295,7 @@
 arch bench_2_1_1
 x 17
 y 13
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9306,7 +9306,7 @@
 arch bench_2_1_1
 x 17
 y 14
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9317,7 +9317,7 @@
 arch bench_2_1_1
 x 17
 y 15
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9328,7 +9328,7 @@
 arch bench_1_2
 x 17
 y 16
-no_pass 1
+move_block all
 end
 arch afloor_left
 name floor
@@ -9486,7 +9486,7 @@
 arch firewall_1
 name wall
 name_pl wall
-face awall_A.111
+face awall_A.x11
 x 17
 y 35
 arch spell_small_fireball
@@ -10048,9 +10048,9 @@
 y 27
 end
 arch mage
-Str 11
-Con 1
-Cha 2
+str 11
+con 1
+cha 2
 hp 90
 maxhp 90
 x 18
@@ -13656,8 +13656,8 @@
 arch thief
 name murdering thief
 name_pl murdering thief
-Con 2
-Cha 3
+con 2
+cha 3
 hp 150
 maxhp 100
 x 24
@@ -14072,7 +14072,7 @@
 arch door_look_1
 x 25
 y 2
-no_pass 0
+move_block 0
 end
 arch magic_ear
 msg
@@ -14113,7 +14113,7 @@
 arch door_2
 x 25
 y 6
-no_pass 0
+move_block 0
 end
 arch flagstone
 x 25
@@ -15184,7 +15184,7 @@
 arch door_look_1
 x 27
 y 2
-no_pass 0
+move_block 0
 end
 arch woodfloor
 x 27
@@ -15237,7 +15237,7 @@
 arch door_2
 x 27
 y 6
-no_pass 0
+move_block 0
 end
 arch flagstone
 x 27
@@ -17102,7 +17102,7 @@
 arch door_look_1
 x 30
 y 18
-no_pass 0
+move_block 0
 end
 arch afloor_right
 name floor
@@ -17623,7 +17623,7 @@
 arch door_look_1
 x 31
 y 18
-no_pass 0
+move_block 0
 end
 arch afloor_right
 name floor
@@ -19110,8 +19110,8 @@
 y 7
 value 200
 weight 100000
+move_block 0
 no_pick 0
-no_pass 0
 end
 arch blackmarble
 x 34
@@ -20827,7 +20827,7 @@
 arch firewall_1
 name wall
 name_pl wall
-face cwall_A.111
+face cwall_A.x11
 x 37
 y 29
 arch spell_small_fireball
@@ -21338,7 +21338,7 @@
 arch firewall_1
 name wall
 name_pl wall
-face cwall_A.111
+face cwall_A.x11
 x 38
 y 29
 arch spell_small_fireball
@@ -22591,7 +22591,7 @@
 arch door_2
 x 40
 y 66
-no_pass 0
+move_block 0
 end
 arch grassmedium
 x 40
@@ -24571,7 +24571,7 @@
 arch bench_1_4
 x 44
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 44
@@ -25161,7 +25161,7 @@
 arch bench_2_1_2
 x 45
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 45
@@ -25676,7 +25676,7 @@
 end
 arch elf_1
 msg
-@match yes|pupland
+@match pupland|yes
 There is a war going on in pupland.
 Rumors tell that the one who solves
 the mysteries of the lands is rewarded
@@ -25694,10 +25694,10 @@
 @match *
 Have you ever been to pupland?
 endmsg
-face elf.151
+face elf.x51
+is_animated 0
 x 46
 y 32
-is_animated 0
 friendly 1
 unaggressive 0
 end
@@ -25708,7 +25708,7 @@
 arch bench_2_1_2
 x 46
 y 33
-no_pass 1
+move_block all
 end
 arch w_glass
 x 46
@@ -26220,7 +26220,7 @@
 arch bench_2_1_2
 x 47
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 47
@@ -26715,7 +26715,7 @@
 arch bench_2_1_2
 x 48
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 48
@@ -26731,7 +26731,7 @@
 know... of some old man, clamied to
 have magical powers but... I dunno
 hehehe
-@match who|murder|man|old
+@match man|murder|old|who
 Yea someone named sarnatch or
 something
 @match no
@@ -26744,7 +26744,7 @@
 are prone to do that... these grounds
 are said to be
 hhhaaauuunnnttteeddd... !!!
-@match hi|hello
+@match hello|hi
 Want a drink?
 endmsg
 x 48
@@ -27313,7 +27313,7 @@
 arch bench_2_1_2
 x 49
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 49
@@ -27646,11 +27646,11 @@
 y 6
 end
 arch elf_1
-face elf.171
+face elf.x71
+is_animated 0
 hp 230
 x 50
 y 6
-is_animated 0
 friendly 1
 arch random_wealth
 end
@@ -27812,7 +27812,7 @@
 arch bench_2_1_2
 x 50
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 50
@@ -28286,7 +28286,7 @@
 arch bench_2_1_2
 x 51
 y 33
-no_pass 1
+move_block all
 end
 arch water
 x 51
@@ -28895,7 +28895,7 @@
 arch bench_2_1_2
 x 52
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 52
@@ -29351,7 +29351,7 @@
 y 22
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 53
 y 23
 end
@@ -29376,7 +29376,7 @@
 y 24
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 53
 y 24
 end
@@ -29393,7 +29393,7 @@
 y 25
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 53
 y 25
 end
@@ -29410,7 +29410,7 @@
 y 26
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 53
 y 26
 end
@@ -29427,7 +29427,7 @@
 y 27
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 53
 y 27
 end
@@ -29486,7 +29486,7 @@
 arch bench_2_1_2
 x 53
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 53
@@ -29966,7 +29966,7 @@
 y 23
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 54
 y 23
 end
@@ -29975,7 +29975,7 @@
 y 24
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 54
 y 24
 end
@@ -29991,7 +29991,7 @@
 y 25
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 54
 y 25
 end
@@ -30008,7 +30008,7 @@
 y 26
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 54
 y 26
 end
@@ -30025,7 +30025,7 @@
 y 27
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 54
 y 27
 end
@@ -30084,7 +30084,7 @@
 arch bench_2_2_3
 x 54
 y 33
-no_pass 1
+move_block all
 end
 arch dungeon_floor
 x 54
@@ -30093,7 +30093,7 @@
 arch bench_2_1_1
 x 54
 y 34
-no_pass 1
+move_block all
 end
 arch booze
 x 54
@@ -30106,7 +30106,7 @@
 arch bench_1_2
 x 54
 y 35
-no_pass 1
+move_block all
 end
 arch stonefloor2
 name stonefloor
@@ -30591,7 +30591,7 @@
 y 22
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 55
 y 23
 end
@@ -30616,7 +30616,7 @@
 y 24
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 55
 y 24
 end
@@ -30633,7 +30633,7 @@
 y 25
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 55
 y 25
 end
@@ -30654,7 +30654,7 @@
 y 26
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 55
 y 26
 end
@@ -30671,7 +30671,7 @@
 y 27
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 55
 y 27
 end
@@ -30846,7 +30846,7 @@
 arch door_2
 x 55
 y 53
-no_pass 0
+move_block 0
 end
 arch dirtfloor
 x 55
@@ -31173,7 +31173,7 @@
 y 23
 end
 arch shop_floor
-face flagstone.111
+face flagstone.x11
 x 56
 y 24
 end
@@ -31202,7 +31202,7 @@
 y 25
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 56
 y 25
 end
@@ -31219,7 +31219,7 @@
 y 26
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 56
 y 26
 end
@@ -31236,7 +31236,7 @@
 y 27
 end
 arch shop_empty
-face flagstone.111
+face flagstone.x11
 x 56
 y 27
 end
@@ -31751,7 +31751,7 @@
 y 24
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 57
 y 25
 end
@@ -31772,7 +31772,7 @@
 y 25
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 57
 y 26
 end
@@ -31793,7 +31793,7 @@
 y 26
 end
 arch shop_food
-face flagstone.111
+face flagstone.x11
 x 57
 y 27
 end
@@ -39959,7 +39959,7 @@
 arch door_2
 x 74
 y 60
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor
@@ -41177,7 +41177,7 @@
 arch door_1
 x 76
 y 62
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor
@@ -42412,7 +42412,7 @@
 arch door_2
 x 78
 y 59
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor
@@ -43659,7 +43659,7 @@
 arch door_1
 x 80
 y 56
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor
@@ -44336,7 +44336,7 @@
 arch door_2
 x 81
 y 59
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor
@@ -47555,7 +47555,7 @@
 arch door_2
 x 86
 y 62
-no_pass 0
+move_block 0
 end
 arch woodfloor2
 name woodfloor