--- deliantra/maps/brest/pshops/pshopsinc2.map	2006/02/05 00:02:17	1.1
+++ deliantra/maps/brest/pshops/pshopsinc2.map	2007/03/05 12:32:27	1.6
@@ -1,12 +1,13 @@
 arch map
-region brest
+file_format_version 1
 name pshops_buy
+region brest
+width 35
+height 14
 msg
 Creator: majorwoo josh@woosworld.net
 Date:    10/17/2004
 endmsg
-width 35
-height 14
 end
 arch woodfloor
 end
@@ -384,11 +385,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!
@@ -402,192 +403,192 @@
 end
 arch check_floor
 slaying pshop1
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop2
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop3
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop4
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop5
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop6
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop7
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop8
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop9
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop10
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop11
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop12
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop13
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop14
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop15
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop16
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop17
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop18
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop19
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop20
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop21
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop22
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop23
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop24
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop25
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop26
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch check_floor
 slaying pshop27
-connected 1
-walk_off 1
 x 3
 y 5
+connected 1
+move_off walk
 end
 arch woodfloor
 x 3
@@ -620,33 +621,32 @@
 end
 arch altar_trigger
 name entrance_altar
+slaying money
 msg
 If you get caught, I don't know you.
 endmsg
-slaying money
 food 2000
-connected 2
 x 3
 y 8
+connected 2
 end
 arch altar
 name name_altar
 slaying ruby
 food 1000
-connected 6
 x 3
 y 8
+connected 6
 end
 arch magic_mouth
 msg
 Shhh....
 Her name is Mireya.
 endmsg
-connected 6
-walk_on 0
-fly_on 0
 x 3
 y 8
+connected 6
+move_on -all
 end
 arch woodfloor
 x 3
@@ -657,13 +657,13 @@
 y 8
 end
 arch teleporter
-invisible 1
 hp 5
 sp 6
-connected 2
-speed 0.0
 x 3
 y 8
+speed 0.0
+invisible 1
+connected 2
 end
 arch woodfloor
 x 3
@@ -672,26 +672,26 @@
 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
+@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.
 endmsg
+x 3
+y 9
 no_pick 1
 unaggressive 1
 stand_still 1
-x 3
-y 9
 end
 arch dungeon_magic
 x 3
@@ -779,18 +779,18 @@
 y 4
 end
 arch pedestal
-connected 1
 x 4
 y 5
+connected 1
 end
 arch woodfloor
 x 4
 y 5
 end
 arch grate_closed_2
-connected 1
 x 4
 y 5
+connected 1
 end
 arch dungeon_magic
 x 4
@@ -899,9 +899,9 @@
 y 4
 end
 arch pedestal
-connected 1
 x 5
 y 5
+connected 1
 end
 arch woodfloor
 x 5
@@ -1097,9 +1097,9 @@
 end
 arch fatman
 name Bartender
-stand_still 1
 x 7
 y 9
+stand_still 1
 end
 arch woodfloor
 x 7
@@ -1398,18 +1398,18 @@
 y 3
 end
 arch table_4
-no_pick 1
 x 11
 y 3
+no_pick 1
 end
 arch woodfloor
 x 11
 y 4
 end
 arch table_4
-no_pick 1
 x 11
 y 4
+no_pick 1
 end
 arch woodfloor
 x 11
@@ -1502,18 +1502,18 @@
 y 5
 end
 arch pedestal
-connected 4
 x 12
 y 6
+connected 4
 end
 arch woodfloor
 x 12
 y 6
 end
 arch pedestal
-connected 4
 x 12
 y 7
+connected 4
 end
 arch woodfloor
 x 12
@@ -1527,15 +1527,15 @@
 y 7
 end
 arch mdoor_closed_2
-connected 4
 wc 7
 x 12
 y 7
+connected 4
 end
 arch pedestal
-connected 4
 x 12
 y 8
+connected 4
 end
 arch woodfloor
 x 12
@@ -1594,7 +1594,7 @@
 arch fatwoman
 name Cook
 msg
-@match wife|Wife
+@match wife
 Dragons can eat all day!
 @match *
 Must... cook... faster...
@@ -1603,18 +1603,18 @@
 y 3
 end
 arch pedestal
-connected 3
 x 13
 y 4
+connected 3
 end
 arch woodfloor
 x 13
 y 4
 end
 arch pedestal
-connected 3
 x 13
 y 5
+connected 3
 end
 arch woodfloor
 x 13
@@ -1628,15 +1628,15 @@
 y 5
 end
 arch mdoor_closed_2
-connected 3
 wc 7
 x 13
 y 5
+connected 3
 end
 arch pedestal
-connected 3
 x 13
 y 6
+connected 3
 end
 arch woodfloor
 x 13
@@ -1783,18 +1783,18 @@
 y 3
 end
 arch table_4
-no_pick 1
 x 15
 y 3
+no_pick 1
 end
 arch woodfloor
 x 15
 y 4
 end
 arch table_4
-no_pick 1
 x 15
 y 4
+no_pick 1
 end
 arch woodfloor
 x 15
@@ -2035,45 +2035,45 @@
 y 3
 end
 arch chair_2.4
-no_pick 1
 x 18
 y 3
+no_pick 1
 end
 arch woodfloor
 x 18
 y 4
 end
 arch chair_2.4
-no_pick 1
 x 18
 y 4
+no_pick 1
 end
 arch woodfloor
 x 18
 y 5
 end
 arch chair_2.4
-no_pick 1
 x 18
 y 5
+no_pick 1
 end
 arch woodfloor
 x 18
 y 6
 end
 arch chair_2.4
-no_pick 1
 x 18
 y 6
+no_pick 1
 end
 arch woodfloor
 x 18
 y 7
 end
 arch chair_2.4
-no_pick 1
 x 18
 y 7
+no_pick 1
 end
 arch woodfloor
 x 18
@@ -2127,54 +2127,54 @@
 y 3
 end
 arch table_3
-no_pick 1
 x 19
 y 3
+no_pick 1
 end
 arch woodfloor
 x 19
 y 4
 end
 arch table_3
-no_pick 1
 x 19
 y 4
+no_pick 1
 end
 arch woodfloor
 x 19
 y 5
 end
 arch table_3
-no_pick 1
 x 19
 y 5
+no_pick 1
 end
 arch woodfloor
 x 19
 y 6
 end
 arch table_3
-no_pick 1
 x 19
 y 6
+no_pick 1
 end
 arch woodfloor
 x 19
 y 7
 end
 arch table_3
-no_pick 1
 x 19
 y 7
+no_pick 1
 end
 arch woodfloor
 x 19
 y 8
 end
 arch chair_2.3
-no_pick 1
 x 19
 y 8
+no_pick 1
 end
 arch woodfloor
 x 19
@@ -2224,54 +2224,54 @@
 y 3
 end
 arch table_3
-no_pick 1
 x 20
 y 3
+no_pick 1
 end
 arch woodfloor
 x 20
 y 4
 end
 arch table_3
-no_pick 1
 x 20
 y 4
+no_pick 1
 end
 arch woodfloor
 x 20
 y 5
 end
 arch table_3
-no_pick 1
 x 20
 y 5
+no_pick 1
 end
 arch woodfloor
 x 20
 y 6
 end
 arch table_3
-no_pick 1
 x 20
 y 6
+no_pick 1
 end
 arch woodfloor
 x 20
 y 7
 end
 arch table_3
-no_pick 1
 x 20
 y 7
+no_pick 1
 end
 arch woodfloor
 x 20
 y 8
 end
 arch chair_2.3
-no_pick 1
 x 20
 y 8
+no_pick 1
 end
 arch woodfloor
 x 20
@@ -2316,45 +2316,45 @@
 y 3
 end
 arch chair_2.2
-no_pick 1
 x 21
 y 3
+no_pick 1
 end
 arch woodfloor
 x 21
 y 4
 end
 arch chair_2.2
-no_pick 1
 x 21
 y 4
+no_pick 1
 end
 arch woodfloor
 x 21
 y 5
 end
 arch chair_2.2
-no_pick 1
 x 21
 y 5
+no_pick 1
 end
 arch woodfloor
 x 21
 y 6
 end
 arch chair_2.2
-no_pick 1
 x 21
 y 6
+no_pick 1
 end
 arch woodfloor
 x 21
 y 7
 end
 arch chair_2.2
-no_pick 1
 x 21
 y 7
+no_pick 1
 end
 arch woodfloor
 x 21
@@ -2420,10 +2420,10 @@
 end
 arch dun0
 name Elite Dragon Guard
-face pl_dragon_bl.151
-blocksview 0
+face pl_dragon_bl.x51
 x 22
 y 6
+blocksview 0
 end
 arch woodfloor
 x 22
@@ -2431,12 +2431,12 @@
 end
 arch magic_ear
 msg
-@match Mireya|mireya
+@match mireya
 Click.
 endmsg
-connected 5
 x 22
 y 7
+connected 5
 end
 arch magic_mouth
 msg
@@ -2448,7 +2448,7 @@
 arch magic_mouth
 name Elite Dragon Guard
 msg
-@match Mireya|mireya
+@match mireya
 You may pass.
 @match *
 You may not enter.
@@ -2466,10 +2466,10 @@
 end
 arch dun0
 name Elite Dragon Guard
-face pl_dragon_bl.151
-blocksview 0
+face pl_dragon_bl.x51
 x 22
 y 8
+blocksview 0
 end
 arch woodfloor
 x 22
@@ -2510,65 +2510,65 @@
 y 1
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 1
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 2
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 2
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 3
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 3
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 4
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 4
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 5
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 5
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 6
 end
 arch flagstone_1_2
-no_magic 1
-damned 1
 x 23
 y 6
+no_magic 1
+damned 1
 end
 arch pedestal
-connected 5
 x 23
 y 7
+connected 5
 end
 arch woodfloor
 x 23
@@ -2576,31 +2576,31 @@
 end
 arch gate_closed_2
 name Private
+x 23
+y 7
 connected 5
 no_magic 1
 damned 1
-x 23
-y 7
 end
 arch woodfloor
 x 23
 y 8
 end
 arch flagstone_1_1
-no_magic 1
-damned 1
 x 23
 y 8
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
 y 9
 end
 arch flagstone_2_1_1
-no_magic 1
-damned 1
 x 23
 y 9
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 23
@@ -2655,10 +2655,10 @@
 y 4
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 24
 y 4
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 24
@@ -2669,9 +2669,9 @@
 y 6
 end
 arch pedestal
-connected 5
 x 24
 y 7
+connected 5
 end
 arch woodfloor
 x 24
@@ -2737,10 +2737,10 @@
 y 4
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 25
 y 4
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 25
@@ -2764,11 +2764,11 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 25
 y 9
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 25
@@ -2801,40 +2801,40 @@
 y 1
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 26
 y 1
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 26
 y 2
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 26
 y 2
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 26
 y 3
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 26
 y 3
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 26
 y 4
 end
 arch swall_2_2_4
-no_magic 1
-damned 1
 x 26
 y 4
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 26
@@ -2854,25 +2854,25 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 26
 y 8
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 26
 y 9
 end
 arch dresser
-no_pick 1
 x 26
 y 9
+no_pick 1
 end
 arch crown
-no_pick 1
 x 26
 y 9
+no_pick 1
 end
 arch woodfloor
 x 26
@@ -2906,9 +2906,9 @@
 end
 arch luggage
 name Dog Food
-no_pick 1
 x 27
 y 1
+no_pick 1
 end
 arch woodfloor
 x 27
@@ -2936,20 +2936,20 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 27
 y 7
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 27
 y 8
 end
 arch bed_1
-no_pick 1
 x 27
 y 8
+no_pick 1
 end
 arch woodfloor
 x 27
@@ -2957,9 +2957,9 @@
 end
 arch luggage
 name Managers Storage
-no_pick 1
 x 27
 y 9
+no_pick 1
 end
 arch woodfloor
 x 27
@@ -3017,20 +3017,20 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 28
 y 7
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 28
 y 8
 end
 arch bed_1
-no_pick 1
 x 28
 y 8
+no_pick 1
 end
 arch woodfloor
 x 28
@@ -3038,9 +3038,9 @@
 end
 arch luggage
 name Managers Wifes Storage
-no_pick 1
 x 28
 y 9
+no_pick 1
 end
 arch woodfloor
 x 28
@@ -3109,25 +3109,25 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 29
 y 8
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 29
 y 9
 end
 arch dresser
-no_pick 1
 x 29
 y 9
+no_pick 1
 end
 arch crown
-no_pick 1
 x 29
 y 9
+no_pick 1
 end
 arch woodfloor
 x 29
@@ -3193,11 +3193,11 @@
 end
 arch rock
 name carpet
-face hide_white.111
-no_pass 0
-can_roll 0
+face hide_white.x11
 x 30
 y 9
+move_block -all
+can_roll 0
 end
 arch woodfloor
 x 30
@@ -3222,15 +3222,15 @@
 arch teleporter
 hp 30
 sp 5
-connected 101
-speed 0.0
 x 30
 y 13
+speed 0.0
+connected 101
 end
 arch gem
-nrof 100
 x 30
 y 13
+nrof 100
 end
 arch woodfloor
 x 31
@@ -3257,9 +3257,9 @@
 arch altar_trigger
 slaying dozen red roses
 food 1
-connected 101
 x 31
 y 4
+connected 101
 end
 arch magic_mouth
 name Mireya
@@ -3268,11 +3268,10 @@
 Ahh, how sweet! Thank you!
 Here, I have so many of these lying around, you take some.
 endmsg
-connected 101
-walk_on 0
-fly_on 0
 x 31
 y 4
+connected 101
+move_on -all
 end
 arch woodfloor
 x 31
@@ -3280,20 +3279,20 @@
 end
 arch desk
 name Vanity
-no_pick 1
 x 31
 y 4
+no_pick 1
 end
 arch magic_mouth
 name Mireya
 msg
-@match hi|Hi|Hello|hello
+@match hello|hi
 Oh, hello!  Did my husband send you?
-@match yes|Yes
+@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|Pen
+@match pen
 Here.  My husband left this up here, he will reward you for it.
 @match *
 Your beginning to bother me little man.
@@ -3303,11 +3302,11 @@
 end
 arch magic_ear
 msg
-@match pen|Pen
+@match pen
 endmsg
-connected 100
 x 31
 y 5
+connected 100
 end
 arch woodfloor
 x 31
@@ -3319,10 +3318,10 @@
 end
 arch dun0
 name Mireya
-face pl_dragon_g.151
-blocksview 0
+face pl_dragon_g.x51
 x 31
 y 5
+blocksview 0
 end
 arch woodfloor
 x 31
@@ -3367,10 +3366,10 @@
 arch teleporter
 hp 30
 sp 5
-connected 100
-speed 0.0
 x 31
 y 13
+speed 0.0
+connected 100
 end
 arch stylus
 name Contract Pen