--- deliantra/maps/brest/pshops/pshopsinc2.map	2006/06/11 08:00:16	1.3
+++ deliantra/maps/brest/pshops/pshopsinc2.map	2007/08/25 17:03:51	1.8
@@ -1,6 +1,6 @@
 arch map
+file_format_version 1
 name pshops_buy
-region brest
 width 35
 height 14
 msg
@@ -645,7 +645,7 @@
 x 3
 y 8
 connected 6
-move_on 0
+move_on -all
 end
 arch woodfloor
 x 3
@@ -2419,7 +2419,7 @@
 end
 arch dun0
 name Elite Dragon Guard
-face pl_dragon_bl.151
+face pl_dragon_bl.x51
 x 22
 y 6
 blocksview 0
@@ -2465,7 +2465,7 @@
 end
 arch dun0
 name Elite Dragon Guard
-face pl_dragon_bl.151
+face pl_dragon_bl.x51
 x 22
 y 8
 blocksview 0
@@ -2763,10 +2763,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 25
 y 9
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -2853,10 +2853,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 26
 y 8
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -2935,10 +2935,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 27
 y 7
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -3016,10 +3016,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 28
 y 7
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -3108,10 +3108,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 29
 y 8
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -3192,10 +3192,10 @@
 end
 arch rock
 name carpet
-face hide_white.111
+face hide_white.x11
 x 30
 y 9
-move_block 0
+move_block -all
 can_roll 0
 end
 arch woodfloor
@@ -3270,7 +3270,7 @@
 x 31
 y 4
 connected 101
-move_on 0
+move_on -all
 end
 arch woodfloor
 x 31
@@ -3282,7 +3282,15 @@
 y 4
 no_pick 1
 end
-arch magic_mouth
+arch woodfloor
+x 31
+y 5
+end
+arch chair_2.3
+x 31
+y 5
+end
+arch dun0
 name Mireya
 msg
 @match hello|hi
@@ -3292,32 +3300,13 @@
 @match 7
 Oh that's right, I remember our date is at 7.  Thank you.
 @match pen
+@trigger 100 1
 Here.  My husband left this up here, he will reward you for it.
+[she puts the pen on the floor]
 @match *
 Your beginning to bother me little man.
 endmsg
-x 31
-y 5
-end
-arch magic_ear
-msg
-@match pen
-endmsg
-x 31
-y 5
-connected 100
-end
-arch woodfloor
-x 31
-y 5
-end
-arch chair_2.3
-x 31
-y 5
-end
-arch dun0
-name Mireya
-face pl_dragon_g.151
+face pl_dragon_g.x51
 x 31
 y 5
 blocksview 0