--- deliantra/maps/brest/pshops/pshopsinc2.map	2006/05/07 08:53:37	1.2
+++ deliantra/maps/brest/pshops/pshopsinc2.map	2008/04/12 15:31:00	1.10
@@ -1,6 +1,6 @@
 arch map
+file_format_version 1
 name pshops_buy
-region brest
 width 35
 height 14
 msg
@@ -384,11 +384,11 @@
 arch guard
 name private guard
 msg
-@match key|Key
+@match key
 Buy your key downstairs.
-@match manager|Manager
+@match manager
 The Manager is downstairs in his office.  Maybe you could ask his wife?
-@match wife|Wife
+@match wife
 The Managers wife is inside, I'm sorry but you can't pass without a key.
 @match *
 Key Holders and their escorted guests only!
@@ -624,7 +624,7 @@
 msg
 If you get caught, I don't know you.
 endmsg
-food 2000
+food 5000
 x 3
 y 8
 connected 2
@@ -645,7 +645,7 @@
 x 3
 y 8
 connected 6
-move_on 0
+move_on -all
 end
 arch woodfloor
 x 3
@@ -671,17 +671,17 @@
 arch thief_1
 name Shady Character
 msg
-@match key|Key
+@match key
 Yes you need a key to get in through that door. Unless...
-@match Unless|unless
+@match unless
 Well I am a bit poor today, and I suppose I could...
 @match could
-Drop 2000 platinum in front of me.
-@match wife|Wife
+Drop 100 platinum in front of me.
+@match wife
 The managers wife is one of the most powerful female dragons you will ever meet.  Do not anger her.
-@match name|Name
+@match name
 So you want to know her name do you?  It's going to cost you..
-@match cost|Cost
+@match cost
 Hey man, nothing in this world is free.  If you want her name drop 1000 rubies in front of me.
 @match *
 Don't waste my time with that.
@@ -1593,7 +1593,7 @@
 arch fatwoman
 name Cook
 msg
-@match wife|Wife
+@match wife
 Dragons can eat all day!
 @match *
 Must... cook... faster...
@@ -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
@@ -2430,7 +2430,7 @@
 end
 arch magic_ear
 msg
-@match Mireya|mireya
+@match mireya
 Click.
 endmsg
 x 22
@@ -2447,7 +2447,7 @@
 arch magic_mouth
 name Elite Dragon Guard
 msg
-@match Mireya|mireya
+@match mireya
 You may pass.
 @match *
 You may not enter.
@@ -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,31 +3282,6 @@
 y 4
 no_pick 1
 end
-arch magic_mouth
-name Mireya
-msg
-@match hi|Hi|Hello|hello
-Oh, hello!  Did my husband send you?
-@match yes|Yes
-Good!  I forgot what time our date is.  Be a dear and go downstairs ask him.
-@match 7
-Oh that's right, I remember our date is at 7.  Thank you.
-@match pen|Pen
-Here.  My husband left this up here, he will reward you for it.
-@match *
-Your beginning to bother me little man.
-endmsg
-x 31
-y 5
-end
-arch magic_ear
-msg
-@match pen|Pen
-endmsg
-x 31
-y 5
-connected 100
-end
 arch woodfloor
 x 31
 y 5
@@ -3317,7 +3292,21 @@
 end
 arch dun0
 name Mireya
-face pl_dragon_g.151
+msg
+@match hello|hi
+Oh, hello!  Did my husband send you?
+@match yes
+Good!  I forgot what time our date is.  Be a dear and go downstairs ask him.
+@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
+face pl_dragon_g.x51
 x 31
 y 5
 blocksview 0