Minor cosmetic changes with walls and floor tiles, re-arranged the stacking order of floor tiles. Other updates are from map editor reformatting.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7036 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-29 05:30:10 +00:00 · 2007-08-29 05:30:10 +00:00 · c1e0617ebd
parent 1170a5cae4
commit c1e0617ebd
13 changed files with 2740 additions and 2729 deletions
--- a/brest/pshops/pshops_main
+++ b/brest/pshops/pshops_main
@ -61,6 +61,14 @@ arch grass
 x 1
 y 1
 end
+arch courthouse
+name Shop Headquarters
+slaying pshopsinc
+hp 15
+sp 10
+x 1
+y 1
+end
 arch grass
 x 1
 y 2
@ -81,6 +89,15 @@ arch grass
 x 1
 y 6
 end
+arch guild
+name Private Shop 14
+slaying pshop14/gfloor
+hp 12
+sp 21
+x 1
+y 6
+move_block 0
+end
 arch grass
 x 1
 y 7
@ -182,6 +199,14 @@ arch grass
 x 4
 y 1
 end
+arch guild
+name Private Shop 1
+slaying pshop1/gfloor
+hp 12
+sp 21
+x 4
+y 1
+end
 arch grass
 x 4
 y 2
@ -207,6 +232,15 @@ arch grass
 x 4
 y 6
 end
+arch guild
+name Private Shop 15
+slaying pshop15/gfloor
+hp 12
+sp 21
+x 4
+y 6
+move_block 0
+end
 arch grass
 x 4
 y 7
@ -300,6 +334,14 @@ arch grass
 x 7
 y 1
 end
+arch guild
+name Private Shop 2
+slaying pshop2/gfloor
+hp 12
+sp 21
+x 7
+y 1
+end
 arch grass
 x 7
 y 2
@ -320,6 +362,15 @@ arch grass
 x 7
 y 6
 end
+arch guild
+name Private Shop 16
+slaying pshop16/gfloor
+hp 12
+sp 21
+x 7
+y 6
+move_block 0
+end
 arch grass
 x 7
 y 7
@ -417,6 +468,14 @@ arch grass
 x 10
 y 1
 end
+arch guild
+name Private Shop 3
+slaying pshop3/gfloor
+hp 12
+sp 21
+x 10
+y 1
+end
 arch grass
 x 10
 y 2
@ -437,6 +496,15 @@ arch grass
 x 10
 y 6
 end
+arch guild
+name Private Shop 17
+slaying pshop17/gfloor
+hp 12
+sp 21
+x 10
+y 6
+move_block 0
+end
 arch grass
 x 10
 y 7
@ -530,6 +598,14 @@ arch grass
 x 13
 y 1
 end
+arch guild
+name Private Shop 4
+slaying pshop4/gfloor
+hp 12
+sp 21
+x 13
+y 1
+end
 arch grass
 x 13
 y 2
@ -550,6 +626,15 @@ arch grass
 x 13
 y 6
 end
+arch guild
+name Private Shop 18
+slaying pshop18/gfloor
+hp 12
+sp 21
+x 13
+y 6
+move_block 0
+end
 arch grass
 x 13
 y 7
@ -648,6 +733,14 @@ arch grass
 x 16
 y 1
 end
+arch guild
+name Private Shop 5
+slaying pshop5/gfloor
+hp 12
+sp 21
+x 16
+y 1
+end
 arch grass
 x 16
 y 2
@ -668,6 +761,15 @@ arch grass
 x 16
 y 6
 end
+arch guild
+name Private Shop 19
+slaying pshop19/gfloor
+hp 12
+sp 21
+x 16
+y 6
+move_block 0
+end
 arch grass
 x 16
 y 7
@ -761,6 +863,14 @@ arch grass
 x 19
 y 1
 end
+arch guild
+name Private Shop 6
+slaying pshop6/gfloor
+hp 12
+sp 21
+x 19
+y 1
+end
 arch grass
 x 19
 y 2
@ -781,6 +891,15 @@ arch grass
 x 19
 y 6
 end
+arch guild
+name Private Shop 20
+slaying pshop20/gfloor
+hp 12
+sp 21
+x 19
+y 6
+move_block 0
+end
 arch grass
 x 19
 y 7
@ -878,6 +997,14 @@ arch grass
 x 22
 y 1
 end
+arch guild
+name Private Shop 7
+slaying pshop7/gfloor
+hp 12
+sp 21
+x 22
+y 1
+end
 arch grass
 x 22
 y 2
@ -898,6 +1025,15 @@ arch grass
 x 22
 y 6
 end
+arch guild
+name Private Shop 21
+slaying pshop21/gfloor
+hp 12
+sp 21
+x 22
+y 6
+move_block 0
+end
 arch grass
 x 22
 y 7
@ -991,6 +1127,14 @@ arch grass
 x 25
 y 1
 end
+arch guild
+name Private Shop 8
+slaying pshop8/gfloor
+hp 12
+sp 21
+x 25
+y 1
+end
 arch grass
 x 25
 y 2
@ -1011,6 +1155,15 @@ arch grass
 x 25
 y 6
 end
+arch guild
+name Private Shop 22
+slaying pshop22/gfloor
+hp 12
+sp 21
+x 25
+y 6
+move_block 0
+end
 arch grass
 x 25
 y 7
@ -1109,6 +1262,14 @@ arch grass
 x 28
 y 1
 end
+arch guild
+name Private Shop 9
+slaying pshop9/gfloor
+hp 12
+sp 21
+x 28
+y 1
+end
 arch grass
 x 28
 y 2
@ -1129,6 +1290,15 @@ arch grass
 x 28
 y 6
 end
+arch guild
+name Private Shop 23
+slaying pshop23/gfloor
+hp 12
+sp 21
+x 28
+y 6
+move_block 0
+end
 arch grass
 x 28
 y 7
@ -1222,6 +1392,14 @@ arch grass
 x 31
 y 1
 end
+arch guild
+name Private Shop 10
+slaying pshop10/gfloor
+hp 12
+sp 21
+x 31
+y 1
+end
 arch grass
 x 31
 y 2
@ -1242,6 +1420,15 @@ arch grass
 x 31
 y 6
 end
+arch guild
+name Private Shop 24
+slaying pshop24/gfloor
+hp 12
+sp 21
+x 31
+y 6
+move_block 0
+end
 arch grass
 x 31
 y 7
@ -1339,6 +1526,14 @@ arch grass
 x 34
 y 1
 end
+arch guild
+name Private Shop 11
+slaying pshop11/gfloor
+hp 12
+sp 21
+x 34
+y 1
+end
 arch grass
 x 34
 y 2
@ -1359,6 +1554,15 @@ arch grass
 x 34
 y 6
 end
+arch guild
+name Private Shop 25
+slaying pshop25/gfloor
+hp 12
+sp 21
+x 34
+y 6
+move_block 0
+end
 arch grass
 x 34
 y 7
@ -1452,6 +1656,14 @@ arch grass
 x 37
 y 1
 end
+arch guild
+name Private Shop 12
+slaying pshop12/gfloor
+hp 12
+sp 21
+x 37
+y 1
+end
 arch grass
 x 37
 y 2
@ -1477,6 +1689,15 @@ arch grass
 x 37
 y 6
 end
+arch guild
+name Private Shop 26
+slaying pshop26/gfloor
+hp 12
+sp 21
+x 37
+y 6
+move_block 0
+end
 arch grass
 x 37
 y 7
@ -1570,6 +1791,14 @@ arch grass
 x 40
 y 1
 end
+arch guild
+name Private Shop 13
+slaying pshop13/gfloor
+hp 12
+sp 21
+x 40
+y 1
+end
 arch grass
 x 40
 y 2
@ -1598,334 +1827,6 @@ arch grass
 x 40
 y 6
 end
-arch grass
-x 40
-y 7
-end
-arch evergreens
-x 40
-y 8
-end
-arch evergreens
-x 41
-end
-arch grass
-x 41
-y 1
-end
-arch grass
-x 41
-y 2
-end
-arch marble
-x 41
-y 3
-end
-arch marble
-x 41
-y 4
-end
-arch marble
-x 41
-y 5
-end
-arch grass
-x 41
-y 6
-end
-arch grass
-x 41
-y 7
-end
-arch evergreens
-x 41
-y 8
-end
-arch evergreens
-x 42
-end
-arch evergreens
-x 42
-y 1
-end
-arch evergreens
-x 42
-y 2
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 3
-end
-arch marble
-x 42
-y 3
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 4
-end
-arch marble
-x 42
-y 4
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 5
-end
-arch marble
-x 42
-y 5
-end
-arch evergreens
-x 42
-y 6
-end
-arch evergreens
-x 42
-y 7
-end
-arch evergreens
-x 42
-y 8
-end
-arch courthouse
-name Shop Headquarters
-slaying pshopsinc
-hp 15
-sp 10
-x 1
-y 1
-end
-arch guild
-name Private Shop 14
-slaying pshop14/gfloor
-hp 12
-sp 21
-x 1
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 1
-slaying pshop1/gfloor
-hp 12
-sp 21
-x 4
-y 1
-end
-arch guild
-name Private Shop 15
-slaying pshop15/gfloor
-hp 12
-sp 21
-x 4
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 2
-slaying pshop2/gfloor
-hp 12
-sp 21
-x 7
-y 1
-end
-arch guild
-name Private Shop 16
-slaying pshop16/gfloor
-hp 12
-sp 21
-x 7
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 3
-slaying pshop3/gfloor
-hp 12
-sp 21
-x 10
-y 1
-end
-arch guild
-name Private Shop 17
-slaying pshop17/gfloor
-hp 12
-sp 21
-x 10
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 4
-slaying pshop4/gfloor
-hp 12
-sp 21
-x 13
-y 1
-end
-arch guild
-name Private Shop 18
-slaying pshop18/gfloor
-hp 12
-sp 21
-x 13
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 5
-slaying pshop5/gfloor
-hp 12
-sp 21
-x 16
-y 1
-end
-arch guild
-name Private Shop 19
-slaying pshop19/gfloor
-hp 12
-sp 21
-x 16
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 6
-slaying pshop6/gfloor
-hp 12
-sp 21
-x 19
-y 1
-end
-arch guild
-name Private Shop 20
-slaying pshop20/gfloor
-hp 12
-sp 21
-x 19
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 7
-slaying pshop7/gfloor
-hp 12
-sp 21
-x 22
-y 1
-end
-arch guild
-name Private Shop 21
-slaying pshop21/gfloor
-hp 12
-sp 21
-x 22
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 8
-slaying pshop8/gfloor
-hp 12
-sp 21
-x 25
-y 1
-end
-arch guild
-name Private Shop 22
-slaying pshop22/gfloor
-hp 12
-sp 21
-x 25
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 9
-slaying pshop9/gfloor
-hp 12
-sp 21
-x 28
-y 1
-end
-arch guild
-name Private Shop 23
-slaying pshop23/gfloor
-hp 12
-sp 21
-x 28
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 10
-slaying pshop10/gfloor
-hp 12
-sp 21
-x 31
-y 1
-end
-arch guild
-name Private Shop 24
-slaying pshop24/gfloor
-hp 12
-sp 21
-x 31
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 11
-slaying pshop11/gfloor
-hp 12
-sp 21
-x 34
-y 1
-end
-arch guild
-name Private Shop 25
-slaying pshop25/gfloor
-hp 12
-sp 21
-x 34
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 12
-slaying pshop12/gfloor
-hp 12
-sp 21
-x 37
-y 1
-end
-arch guild
-name Private Shop 26
-slaying pshop26/gfloor
-hp 12
-sp 21
-x 37
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 13
-slaying pshop13/gfloor
-hp 12
-sp 21
-x 40
-y 1
-end
 arch guild
 name Private Shop 27
 slaying pshop27/gfloor
@ -1935,3 +1836,102 @@ x 40
 y 6
 move_block 0
 end
+arch grass
+x 40
+y 7
+end
+arch evergreens
+x 40
+y 8
+end
+arch evergreens
+x 41
+end
+arch grass
+x 41
+y 1
+end
+arch grass
+x 41
+y 2
+end
+arch marble
+x 41
+y 3
+end
+arch marble
+x 41
+y 4
+end
+arch marble
+x 41
+y 5
+end
+arch grass
+x 41
+y 6
+end
+arch grass
+x 41
+y 7
+end
+arch evergreens
+x 41
+y 8
+end
+arch evergreens
+x 42
+end
+arch evergreens
+x 42
+y 1
+end
+arch evergreens
+x 42
+y 2
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 3
+end
+arch marble
+x 42
+y 3
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 4
+end
+arch marble
+x 42
+y 4
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 5
+end
+arch marble
+x 42
+y 5
+end
+arch evergreens
+x 42
+y 6
+end
+arch evergreens
+x 42
+y 7
+end
+arch evergreens
+x 42
+y 8
+end
--- a/brest/pshops/pshopsinc
+++ b/brest/pshops/pshopsinc
--- a/brest/pshops/pshopsinc2
+++ b/brest/pshops/pshopsinc2
@ -9,11 +9,14 @@ Creator: majorwoo josh@woosworld.net
 Date:    10/17/2004
 endmsg
 end
+arch dungeon_magic
+end
 arch woodfloor
 end
 arch flagstone_2_2_2
 end
 arch dungeon_magic
+y 1
 end
 arch woodfloor
 y 1
@ -22,7 +25,7 @@ arch flagstone_2_1_1
 y 1
 end
 arch dungeon_magic
-y 1
+y 2
 end
 arch woodfloor
 y 2
@ -31,7 +34,7 @@ arch flagstone_2_1_1
 y 2
 end
 arch dungeon_magic
-y 2
+y 3
 end
 arch woodfloor
 y 3
@ -40,7 +43,7 @@ arch flagstone_2_1_1
 y 3
 end
 arch dungeon_magic
-y 3
+y 4
 end
 arch woodfloor
 y 4
@ -49,7 +52,7 @@ arch flagstone_2_1_1
 y 4
 end
 arch dungeon_magic
-y 4
+y 5
 end
 arch woodfloor
 y 5
@ -58,7 +61,7 @@ arch flagstone_2_1_1
 y 5
 end
 arch dungeon_magic
-y 5
+y 6
 end
 arch woodfloor
 y 6
@ -67,7 +70,7 @@ arch flagstone_2_1_1
 y 6
 end
 arch dungeon_magic
-y 6
+y 7
 end
 arch woodfloor
 y 7
@ -76,7 +79,7 @@ arch flagstone_2_1_1
 y 7
 end
 arch dungeon_magic
-y 7
+y 8
 end
 arch woodfloor
 y 8
@ -85,7 +88,7 @@ arch flagstone_2_1_1
 y 8
 end
 arch dungeon_magic
-y 8
+y 9
 end
 arch woodfloor
 y 9
@ -94,7 +97,7 @@ arch flagstone_2_1_1
 y 9
 end
 arch dungeon_magic
-y 9
+y 10
 end
 arch woodfloor
 y 10
@ -102,9 +105,6 @@ end
 arch flagstone_2_2_1
 y 10
 end
-arch dungeon_magic
-y 10
-end
 arch blocked
 y 11
 end
@ -114,6 +114,9 @@ end
 arch blocked
 y 13
 end
+arch dungeon_magic
+x 1
+end
 arch woodfloor
 x 1
 end
@ -122,6 +125,7 @@ x 1
 end
 arch dungeon_magic
 x 1
+y 1
 end
 arch woodfloor
 x 1
@ -133,7 +137,7 @@ y 1
 end
 arch dungeon_magic
 x 1
-y 1
+y 2
 end
 arch woodfloor
 x 1
@ -141,7 +145,7 @@ y 2
 end
 arch dungeon_magic
 x 1
-y 2
+y 3
 end
 arch woodfloor
 x 1
@ -149,7 +153,7 @@ y 3
 end
 arch dungeon_magic
 x 1
-y 3
+y 4
 end
 arch woodfloor
 x 1
@ -157,7 +161,7 @@ y 4
 end
 arch dungeon_magic
 x 1
-y 4
+y 5
 end
 arch woodfloor
 x 1
@ -173,7 +177,7 @@ y 5
 end
 arch dungeon_magic
 x 1
-y 5
+y 6
 end
 arch woodfloor
 x 1
@ -181,7 +185,7 @@ y 6
 end
 arch dungeon_magic
 x 1
-y 6
+y 7
 end
 arch woodfloor
 x 1
@ -189,7 +193,7 @@ y 7
 end
 arch dungeon_magic
 x 1
-y 7
+y 8
 end
 arch woodfloor
 x 1
@ -197,7 +201,7 @@ y 8
 end
 arch dungeon_magic
 x 1
-y 8
+y 9
 end
 arch woodfloor
 x 1
@ -209,7 +213,7 @@ y 9
 end
 arch dungeon_magic
 x 1
-y 9
+y 10
 end
 arch woodfloor
 x 1
@ -219,10 +223,6 @@ arch flagstone_2_1_2
 x 1
 y 10
 end
-arch dungeon_magic
-x 1
-y 10
-end
 arch blocked
 x 1
 y 11
@ -235,6 +235,9 @@ arch blocked
 x 1
 y 13
 end
+arch dungeon_magic
+x 2
+end
 arch woodfloor
 x 2
 end
@ -243,6 +246,7 @@ x 2
 end
 arch dungeon_magic
 x 2
+y 1
 end
 arch woodfloor
 x 2
@ -250,7 +254,7 @@ y 1
 end
 arch dungeon_magic
 x 2
-y 1
+y 2
 end
 arch woodfloor
 x 2
@ -258,7 +262,7 @@ y 2
 end
 arch dungeon_magic
 x 2
-y 2
+y 3
 end
 arch woodfloor
 x 2
@ -266,7 +270,7 @@ y 3
 end
 arch dungeon_magic
 x 2
-y 3
+y 4
 end
 arch woodfloor
 x 2
@ -274,7 +278,7 @@ y 4
 end
 arch dungeon_magic
 x 2
-y 4
+y 5
 end
 arch woodfloor
 x 2
@ -282,7 +286,7 @@ y 5
 end
 arch dungeon_magic
 x 2
-y 5
+y 6
 end
 arch woodfloor
 x 2
@ -290,7 +294,7 @@ y 6
 end
 arch dungeon_magic
 x 2
-y 6
+y 7
 end
 arch woodfloor
 x 2
@ -298,7 +302,7 @@ y 7
 end
 arch dungeon_magic
 x 2
-y 7
+y 8
 end
 arch woodfloor
 x 2
@ -306,7 +310,7 @@ y 8
 end
 arch dungeon_magic
 x 2
-y 8
+y 9
 end
 arch woodfloor
 x 2
@ -314,7 +318,7 @@ y 9
 end
 arch dungeon_magic
 x 2
-y 9
+y 10
 end
 arch woodfloor
 x 2
@ -324,10 +328,6 @@ arch flagstone_2_1_2
 x 2
 y 10
 end
-arch dungeon_magic
-x 2
-y 10
-end
 arch blocked
 x 2
 y 11
@ -340,6 +340,9 @@ arch blocked
 x 2
 y 13
 end
+arch dungeon_magic
+x 3
+end
 arch woodfloor
 x 3
 end
@ -348,6 +351,7 @@ x 3
 end
 arch dungeon_magic
 x 3
+y 1
 end
 arch woodfloor
 x 3
@ -360,7 +364,7 @@ y 1
 end
 arch dungeon_magic
 x 3
-y 1
+y 2
 end
 arch woodfloor
 x 3
@ -368,7 +372,7 @@ y 2
 end
 arch dungeon_magic
 x 3
-y 2
+y 3
 end
 arch woodfloor
 x 3
@ -376,7 +380,7 @@ y 3
 end
 arch dungeon_magic
 x 3
-y 3
+y 4
 end
 arch woodfloor
 x 3
@ -399,7 +403,7 @@ y 4
 end
 arch dungeon_magic
 x 3
-y 4
+y 5
 end
 arch check_floor
 slaying pshop1
@ -596,7 +600,7 @@ y 5
 end
 arch dungeon_magic
 x 3
-y 5
+y 6
 end
 arch woodfloor
 x 3
@ -609,7 +613,7 @@ y 6
 end
 arch dungeon_magic
 x 3
-y 6
+y 7
 end
 arch woodfloor
 x 3
@ -617,7 +621,7 @@ y 7
 end
 arch dungeon_magic
 x 3
-y 7
+y 8
 end
 arch altar_trigger
 name entrance_altar
@ -652,10 +656,6 @@ arch woodfloor
 x 3
 y 8
 end
-arch dungeon_magic
-x 3
-y 8
-end
 arch teleporter
 hp 5
 sp 6
@ -665,6 +665,10 @@ speed 0.0
 invisible 1
 connected 2
 end
+arch dungeon_magic
+x 3
+y 9
+end
 arch woodfloor
 x 3
 y 9
@ -695,7 +699,7 @@ stand_still 1
 end
 arch dungeon_magic
 x 3
-y 9
+y 10
 end
 arch woodfloor
 x 3
@ -705,10 +709,6 @@ arch flagstone_2_1_2
 x 3
 y 10
 end
-arch dungeon_magic
-x 3
-y 10
-end
 arch blocked
 x 3
 y 11
@ -721,6 +721,9 @@ arch blocked
 x 3
 y 13
 end
+arch dungeon_magic
+x 4
+end
 arch woodfloor
 x 4
 end
@ -729,6 +732,7 @@ x 4
 end
 arch dungeon_magic
 x 4
+y 1
 end
 arch woodfloor
 x 4
@ -740,7 +744,7 @@ y 1
 end
 arch dungeon_magic
 x 4
-y 1
+y 2
 end
 arch woodfloor
 x 4
@ -752,7 +756,7 @@ y 2
 end
 arch dungeon_magic
 x 4
-y 2
+y 3
 end
 arch woodfloor
 x 4
@ -764,7 +768,7 @@ y 3
 end
 arch dungeon_magic
 x 4
-y 3
+y 4
 end
 arch woodfloor
 x 4
@ -776,7 +780,7 @@ y 4
 end
 arch dungeon_magic
 x 4
-y 4
+y 5
 end
 arch pedestal
 x 4
@ -794,7 +798,7 @@ connected 1
 end
 arch dungeon_magic
 x 4
-y 5
+y 6
 end
 arch woodfloor
 x 4
@ -806,7 +810,7 @@ y 6
 end
 arch dungeon_magic
 x 4
-y 6
+y 7
 end
 arch woodfloor
 x 4
@ -818,7 +822,7 @@ y 7
 end
 arch dungeon_magic
 x 4
-y 7
+y 8
 end
 arch woodfloor
 x 4
@ -830,7 +834,7 @@ y 8
 end
 arch dungeon_magic
 x 4
-y 8
+y 9
 end
 arch woodfloor
 x 4
@ -842,7 +846,7 @@ y 9
 end
 arch dungeon_magic
 x 4
-y 9
+y 10
 end
 arch woodfloor
 x 4
@ -852,10 +856,6 @@ arch flagstone_3_1
 x 4
 y 10
 end
-arch dungeon_magic
-x 4
-y 10
-end
 arch blocked
 x 4
 y 11
@ -2445,6 +2445,10 @@ arch woodfloor
 x 22
 y 7
 end
+arch dungeon_magic
+x 22
+y 8
+end
 arch magic_mouth
 name Elite Dragon Guard
 msg
@ -2460,10 +2464,6 @@ arch woodfloor
 x 22
 y 8
 end
-arch dungeon_magic
-x 22
-y 8
-end
 arch dun0
 name Elite Dragon Guard
 face pl_dragon_bl.151
@ -3390,6 +3390,9 @@ end
 arch flagstone_2_1_2
 x 32
 end
+arch swall_1_1_half
+x 32
+end
 arch woodfloor
 x 32
 y 1
@ -3466,6 +3469,10 @@ arch woodfloor
 x 32
 y 10
 end
+arch swall_1_2_half
+x 32
+y 10
+end
 arch flagstone_2_1_2
 x 32
 y 10
--- a/brest/shops/a_small_shop
+++ b/brest/shops/a_small_shop
@ -614,8 +614,8 @@ arch barrel
 x 4
 y 6
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 4
@ -916,8 +916,8 @@ arch barrel
 x 6
 y 8
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 6
@ -1456,8 +1456,8 @@ arch barrel
 x 10
 y 6
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 10
--- a/brest/shops/buildshop
+++ b/brest/shops/buildshop
@ -2,7 +2,7 @@ arch map
 name Acme Inc.
 region brest
 shopitems building material:95;item builder:95;*:-100
-shopgreed 1.0
+shopgreed 1.00000
 shopmin 500
 shopmax 20000
 shoprace human
--- a/brest/shops/buildshop2
+++ b/brest/shops/buildshop2
@ -2,7 +2,7 @@ arch map
 name Acme Inc.
 region brest
 shopitems building material:95;item builder:95;*:-100
-shopgreed 1.0
+shopgreed 1.00000
 shopmin 500
 shopmax 20000
 shoprace human
--- a/brest/sow/sow
+++ b/brest/sow/sow
@ -2656,10 +2656,10 @@ maxhp 100
 x 12
 y 11
 randomitems standard
+pick_up 0
 no_pick 1
 monster 0
 friendly 0
-pick_up 0
 stand_still 1
 end
 arch sleep_floor
--- a/brest/sow/sow.1
+++ b/brest/sow/sow.1
@ -6108,11 +6108,11 @@ resist_slow 50
 resist_paralyze 100
 resist_deplete 100
 resist_death 50
+pick_up 0
 will_apply 0
 generator 0
 undead 0
 run_away 30
-pick_up 0
 can_use_skill 1
 use_content_on_gen 0
 con 1
--- a/brest/zorn/castle.basement0
+++ b/brest/zorn/castle.basement0
@ -1925,6 +1925,10 @@ name dirt floor
 x 6
 y 10
 end
+arch dungeon_magic
+x 6
+y 11
+end
 arch earth
 name dirt floor
 x 6
@ -1950,10 +1954,6 @@ arch trap_rocks
 x 6
 y 11
 end
-arch dungeon_magic
-x 6
-y 11
-end
 arch earth
 name dirt floor
 x 6
@ -15976,6 +15976,10 @@ arch flagstone
 x 44
 y 10
 end
+arch giantrat
+x 44
+y 10
+end
 arch flagstone
 x 44
 y 11
@ -21403,7 +21407,3 @@ arch blocked
 x 58
 y 58
 end
-arch giantrat
-x 44
-y 10
-end
--- a/brest/zorn/castle.mainfloor
+++ b/brest/zorn/castle.mainfloor
--- a/brest/zorn/castle.upper.floor.one
+++ b/brest/zorn/castle.upper.floor.one
--- a/brest/zorn/castle.upper.floor.three
+++ b/brest/zorn/castle.upper.floor.three
--- a/brest/zorn/castle.upper.floor.two
+++ b/brest/zorn/castle.upper.floor.two
@ -698,11 +698,11 @@ arch brush
 x 3
 y 2
 end
-arch brush
+arch dungeon_magic
 x 3
 y 3
 end
-arch dungeon_magic
+arch brush
 x 3
 y 3
 end
@ -1162,11 +1162,11 @@ arch brush
 x 4
 y 2
 end
-arch brush
+arch dungeon_magic
 x 4
 y 3
 end
-arch dungeon_magic
+arch brush
 x 4
 y 3
 end
@ -22958,11 +22958,11 @@ arch brush
 x 55
 y 2
 end
-arch brush
+arch dungeon_magic
 x 55
 y 3
 end
-arch dungeon_magic
+arch brush
 x 55
 y 3
 end