--- deliantra/maps/brest/pshops/pshop18/basement.map	2006/02/05 00:02:24	1.1
+++ deliantra/maps/brest/pshops/pshop18/basement.map	2006/05/07 08:53:47	1.2
@@ -1,14 +1,14 @@
 arch map
-region brest
 name Personal Shop Basement
-msg
-Creator: majorwoo josh@woosworld.net
-Date:    10/19/2004
-endmsg
+region brest
 width 22
 height 22
 enter_x 12
 enter_y 7
+msg
+Creator: majorwoo josh@woosworld.net
+Date:    10/19/2004
+endmsg
 end
 arch dirtfloor
 end
@@ -103,64 +103,64 @@
 end
 arch biglake_2_2_3
 name Flooded Basement
-no_pass 0
 y 15
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 16
-speed 0.01
 y 15
+speed 0.01
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 y 16
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 17
-speed 0.02
 y 16
+speed 0.02
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 y 17
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 18
-speed 0.04
 y 17
+speed 0.04
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 y 18
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 20
-speed 0.06
 y 18
+speed 0.06
+invisible 1
 end
 arch blocked
 y 19
 end
 arch blocked
-no_pass 0
 y 20
+move_block 0
 end
 arch invis_exit
+slaying ../ugriver1
 msg
 You are sucked down a whirpool!
 endmsg
-slaying ../ugriver1
 hp 1
 sp 1
 y 20
@@ -172,79 +172,79 @@
 x 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 4
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 1
 y 15
+unique 1
 end
 arch dirtfloor
 x 1
@@ -252,46 +252,46 @@
 end
 arch biglake_2_2_3
 name Flooded Basement
-no_pass 0
 x 1
 y 16
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 hp 1
 sp 17
-speed 0.01
 x 1
 y 16
+speed 0.01
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 x 1
 y 17
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 18
-speed 0.02
 x 1
 y 17
+speed 0.02
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 x 1
 y 18
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 sp 18
-speed 0.04
 x 1
 y 18
+speed 0.04
+invisible 1
 end
 arch blocked
 x 1
@@ -304,84 +304,84 @@
 x 2
 end
 arch dirtfloor
-unique 1
 x 2
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 4
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 2
 y 16
+unique 1
 end
 arch sign
 msg
@@ -398,33 +398,33 @@
 end
 arch biglake_2_2_3
 name Flooded Basement
-no_pass 0
 x 2
 y 17
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 hp 1
 sp 17
-speed 0.01
 x 2
 y 17
+speed 0.01
+invisible 1
 end
 arch biglake_center
 name Flooded Basement
-no_pass 0
 x 2
 y 18
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 hp 1
 sp 18
-speed 0.02
 x 2
 y 18
+speed 0.02
+invisible 1
 end
 arch blocked
 x 2
@@ -437,93 +437,93 @@
 x 3
 end
 arch dirtfloor
-unique 1
 x 3
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 4
+unique 1
 end
 arch bat
 x 3
 y 4
 end
 arch dirtfloor
-unique 1
 x 3
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 3
 y 17
+unique 1
 end
 arch dirtfloor
 x 3
@@ -531,18 +531,18 @@
 end
 arch biglake_2_2_3
 name Flooded Basement
-no_pass 0
 x 3
 y 18
+move_block 0
 end
 arch teleporter
 name Water teleporter
-invisible 1
 hp 2
 sp 18
-speed 0.01
 x 3
 y 18
+speed 0.01
+invisible 1
 end
 arch blocked
 x 3
@@ -552,17 +552,17 @@
 name Main teleporter
 hp 7
 sp 12
-connected 200
-speed 0.0
 x 3
 y 20
+speed 0.0
+connected 200
 end
 arch check_floor
 slaying pshop18
-connected 1
-walk_off 1
 x 3
 y 20
+connected 1
+move_off walk
 end
 arch dirtfloor
 x 4
@@ -571,89 +571,89 @@
 x 4
 end
 arch dirtfloor
-unique 1
 x 4
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 4
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 4
 y 17
+unique 1
 end
 arch dirtfloor
 x 4
@@ -674,24 +674,24 @@
 x 5
 end
 arch dirtfloor
-unique 1
 x 5
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 4
+unique 1
 end
 arch dirtfloor
 x 5
@@ -706,9 +706,9 @@
 y 5
 end
 arch cave21
-blocksview 0
 x 5
 y 5
+blocksview 0
 end
 arch dirtfloor
 x 5
@@ -807,29 +807,29 @@
 y 13
 end
 arch cave21
-blocksview 0
 x 5
 y 13
+blocksview 0
 end
 arch dirtfloor
-unique 1
 x 5
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 5
 y 17
+unique 1
 end
 arch dirtfloor
 x 5
@@ -858,24 +858,24 @@
 x 6
 end
 arch dirtfloor
-unique 1
 x 6
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 6
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 6
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 6
 y 4
+unique 1
 end
 arch dirtfloor
 x 6
@@ -942,9 +942,9 @@
 arch dun0
 name Guard
 face guard_hard.111
-blocksview 0
 x 6
 y 9
+blocksview 0
 end
 arch dungeon_magic
 x 6
@@ -976,10 +976,10 @@
 end
 arch torch_1
 food 0
-no_pick 1
-changing 0
 x 6
 y 12
+no_pick 1
+changing 0
 end
 arch dirtfloor
 x 6
@@ -994,32 +994,32 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 6
 y 14
+unique 1
 end
 arch guard
 x 6
 y 14
 end
 arch dirtfloor
-unique 1
 x 6
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 6
 y 16
+unique 1
 end
 arch bat
 x 6
 y 16
 end
 arch dirtfloor
-unique 1
 x 6
 y 17
+unique 1
 end
 arch dirtfloor
 x 6
@@ -1037,18 +1037,18 @@
 name Main teleporter
 hp 20
 sp 1
-connected 201
-speed 0.0
 x 6
 y 20
+speed 0.0
+connected 201
 end
 arch ape
 name male ape
-unaggressive 1
-friendly 1
-sleep 0
 x 6
 y 20
+friendly 1
+unaggressive 1
+sleep 0
 end
 arch blocked
 x 6
@@ -1061,24 +1061,24 @@
 x 7
 end
 arch dirtfloor
-unique 1
 x 7
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 4
+unique 1
 end
 arch dirtfloor
 x 7
@@ -1145,34 +1145,34 @@
 y 11
 end
 arch dirtfloor
-unique 1
 x 7
 y 12
+unique 1
 end
 arch dungeon_magic
 x 7
 y 12
 end
 arch pedestal
-connected 1
 x 7
 y 13
+connected 1
 end
 arch check_floor
 slaying pshop18
-no_pass 1
-walk_off 1
 x 7
 y 13
+move_block all
+move_off walk
 end
 arch dirtfloor
 x 7
 y 13
 end
 arch ggate_closed
-connected 1
 x 7
 y 13
+connected 1
 end
 arch dungeon_magic
 x 7
@@ -1180,30 +1180,30 @@
 end
 arch check_floor
 slaying pshop18
-connected 1
-walk_off 1
 x 7
 y 14
+connected 1
+move_off walk
 end
 arch dirtfloor
-unique 1
 x 7
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 7
 y 17
+unique 1
 end
 arch dirtfloor
 x 7
@@ -1232,24 +1232,24 @@
 x 8
 end
 arch dirtfloor
-unique 1
 x 8
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 8
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 8
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 8
 y 4
+unique 1
 end
 arch dirtfloor
 x 8
@@ -1329,25 +1329,25 @@
 end
 arch creator
 other_arch dirtfloor
-connected 200
 x 8
 y 12
+connected 200
 end
 arch dirtfloor
-unique 1
 x 8
 y 12
+unique 1
 end
 arch altar
 name Drop 10000 diamonds to use your basement.
+slaying gem
 msg
 Thanks!
 endmsg
-slaying gem
 food 10000
-connected 200
 x 8
 y 12
+connected 200
 end
 arch dirtfloor
 x 8
@@ -1362,28 +1362,28 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 8
 y 14
+unique 1
 end
 arch guard
 x 8
 y 14
 end
 arch dirtfloor
-unique 1
 x 8
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 8
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 8
 y 17
+unique 1
 end
 arch dirtfloor
 x 8
@@ -1401,18 +1401,18 @@
 name Main teleporter
 hp 20
 sp 1
-connected 202
-speed 0.0
 x 8
 y 20
+speed 0.0
+connected 202
 end
 arch ape
 name female ape
-unaggressive 1
-friendly 1
-sleep 0
 x 8
 y 20
+friendly 1
+unaggressive 1
+sleep 0
 end
 arch blocked
 x 8
@@ -1425,24 +1425,24 @@
 x 9
 end
 arch dirtfloor
-unique 1
 x 9
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 4
+unique 1
 end
 arch dirtfloor
 x 9
@@ -1533,24 +1533,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 9
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 9
 y 17
+unique 1
 end
 arch dirtfloor
 x 9
@@ -1579,24 +1579,24 @@
 x 10
 end
 arch dirtfloor
-unique 1
 x 10
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 4
+unique 1
 end
 arch dirtfloor
 x 10
@@ -1679,24 +1679,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 10
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 10
 y 17
+unique 1
 end
 arch dirtfloor
 x 10
@@ -1717,24 +1717,24 @@
 x 11
 end
 arch dirtfloor
-unique 1
 x 11
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 4
+unique 1
 end
 arch dirtfloor
 x 11
@@ -1817,24 +1817,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 11
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 11
 y 17
+unique 1
 end
 arch dirtfloor
 x 11
@@ -1855,24 +1855,24 @@
 x 12
 end
 arch dirtfloor
-unique 1
 x 12
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 4
+unique 1
 end
 arch dirtfloor
 x 12
@@ -1899,10 +1899,10 @@
 y 7
 end
 arch stair_3_up
+slaying gfloor
 msg
 It's much warmer up here.
 endmsg
-slaying gfloor
 hp 12
 sp 7
 x 12
@@ -1965,24 +1965,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 12
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 12
 y 17
+unique 1
 end
 arch dirtfloor
 x 12
@@ -2003,28 +2003,28 @@
 x 13
 end
 arch dirtfloor
-unique 1
 x 13
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 13
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 13
 y 3
+unique 1
 end
 arch bat
 x 13
 y 3
 end
 arch dirtfloor
-unique 1
 x 13
 y 4
+unique 1
 end
 arch dirtfloor
 x 13
@@ -2107,24 +2107,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 13
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 13
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 13
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 13
 y 17
+unique 1
 end
 arch dirtfloor
 x 13
@@ -2145,24 +2145,24 @@
 x 14
 end
 arch dirtfloor
-unique 1
 x 14
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 4
+unique 1
 end
 arch dirtfloor
 x 14
@@ -2245,24 +2245,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 14
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 14
 y 17
+unique 1
 end
 arch dirtfloor
 x 14
@@ -2283,24 +2283,24 @@
 x 15
 end
 arch dirtfloor
-unique 1
 x 15
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 4
+unique 1
 end
 arch dirtfloor
 x 15
@@ -2324,10 +2324,10 @@
 end
 arch torch_1
 food 0
-no_pick 1
-changing 0
 x 15
 y 6
+no_pick 1
+changing 0
 end
 arch dirtfloor
 x 15
@@ -2379,10 +2379,10 @@
 end
 arch torch_1
 food 0
-no_pick 1
-changing 0
 x 15
 y 12
+no_pick 1
+changing 0
 end
 arch dirtfloor
 x 15
@@ -2397,24 +2397,24 @@
 y 13
 end
 arch dirtfloor
-unique 1
 x 15
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 15
 y 17
+unique 1
 end
 arch dirtfloor
 x 15
@@ -2435,9 +2435,9 @@
 x 16
 end
 arch dirtfloor
-unique 1
 x 16
 y 1
+unique 1
 end
 arch sign
 name Monkey Notice
@@ -2449,19 +2449,19 @@
 y 1
 end
 arch dirtfloor
-unique 1
 x 16
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 16
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 16
 y 4
+unique 1
 end
 arch dirtfloor
 x 16
@@ -2476,9 +2476,9 @@
 y 5
 end
 arch cave21
-blocksview 0
 x 16
 y 5
+blocksview 0
 end
 arch dirtfloor
 x 16
@@ -2577,33 +2577,33 @@
 y 13
 end
 arch cave21
-blocksview 0
 x 16
 y 13
+blocksview 0
 end
 arch dirtfloor
-unique 1
 x 16
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 16
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 16
 y 16
+unique 1
 end
 arch bat
 x 16
 y 16
 end
 arch dirtfloor
-unique 1
 x 16
 y 17
+unique 1
 end
 arch dirtfloor
 x 16
@@ -2624,105 +2624,105 @@
 x 17
 end
 arch dirtfloor
-unique 1
 x 17
 y 1
+unique 1
 end
 arch swall_2_1_1
 x 17
 y 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 2
+unique 1
 end
 arch swall_2_1_1
 x 17
 y 2
 end
 arch dirtfloor
-unique 1
 x 17
 y 3
+unique 1
 end
 arch swall_2_1_1
 x 17
 y 3
 end
 arch dirtfloor
-unique 1
 x 17
 y 4
+unique 1
 end
 arch swall_2_2_1
 x 17
 y 4
 end
 arch dirtfloor
-unique 1
 x 17
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 17
 y 17
+unique 1
 end
 arch cave15
 x 17
@@ -2747,47 +2747,47 @@
 x 18
 end
 arch dirtfloor
-unique 1
 x 18
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 2
+unique 1
 end
 arch check_floor
 slaying pshop18
-connected 1
-walk_off 1
 x 18
 y 3
+connected 1
+move_off walk
 end
 arch dirtfloor
-unique 1
 x 18
 y 3
+unique 1
 end
 arch pedestal
-connected 1
 x 18
 y 4
+connected 1
 end
 arch check_floor
 slaying pshop18
-no_pass 1
-walk_off 1
 x 18
 y 4
+move_block all
+move_off walk
 end
 arch dirtfloor
 x 18
 y 4
 end
 arch ggate_closed
-connected 1
 x 18
 y 4
+connected 1
 end
 arch dungeon_magic
 x 18
@@ -2795,75 +2795,75 @@
 end
 arch check_floor
 slaying pshop18
-connected 1
-walk_off 1
 x 18
 y 5
+connected 1
+move_off walk
 end
 arch dirtfloor
-unique 1
 x 18
 y 5
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 18
 y 17
+unique 1
 end
 arch cave16
 x 18
@@ -2888,24 +2888,24 @@
 x 19
 end
 arch dirtfloor
-unique 1
 x 19
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 4
+unique 1
 end
 arch swall_2_1_2
 x 19
@@ -2913,85 +2913,85 @@
 end
 arch creator
 other_arch dirtfloor
-connected 201
 x 19
 y 5
+connected 201
 end
 arch dirtfloor
-unique 1
 x 19
 y 5
+unique 1
 end
 arch altar
 name Male monkey! Only 10000 diamonds
+slaying gem
 msg
 Thanks!
 endmsg
-slaying gem
 food 10000
-connected 201
 x 19
 y 5
+connected 201
 end
 arch dirtfloor
-unique 1
 x 19
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 19
 y 17
+unique 1
 end
 arch dirtfloor
 x 19
@@ -3012,24 +3012,24 @@
 x 20
 end
 arch dirtfloor
-unique 1
 x 20
 y 1
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 2
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 3
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 4
+unique 1
 end
 arch swall_2_1_2
 x 20
@@ -3037,85 +3037,85 @@
 end
 arch creator
 other_arch dirtfloor
-connected 202
 x 20
 y 5
+connected 202
 end
 arch dirtfloor
-unique 1
 x 20
 y 5
+unique 1
 end
 arch altar
 name Female monkey! Only 10000 diamonds
+slaying gem
 msg
 Thanks!
 endmsg
-slaying gem
 food 10000
-connected 202
 x 20
 y 5
+connected 202
 end
 arch dirtfloor
-unique 1
 x 20
 y 6
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 7
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 8
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 9
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 10
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 11
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 12
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 13
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 14
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 15
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 16
+unique 1
 end
 arch dirtfloor
-unique 1
 x 20
 y 17
+unique 1
 end
 arch cave15
 x 20