diff --git a/navar_city/misc/buildshop b/navar_city/misc/buildshop
index e4db95092..45049f359 100644
--- a/navar_city/misc/buildshop
+++ b/navar_city/misc/buildshop
@@ -7,226 +7,320 @@ shopgreed 1.00000
 shopmin 500
 shopmax 20000
 shoprace human
-width 23
-height 13
+width 27
+height 20
 enter_x 6
 enter_y 11
 msg
 Created:  2004-01-25 Ryo Saeba
-Modified: 2009-02-10 Rick Tanner
+Modified: 2011-05-03 Rick Tanner
 endmsg
+outdoor 1
 end
-arch tile_white_floor
+arch grass_only
+end
+arch grass_only
+y 1
+end
+arch grass_only
+y 2
+end
+arch grass_only
+y 3
+end
+arch grass_only
+y 4
+end
+arch grass_only
+y 5
+end
+arch grass_only
+y 6
+end
+arch grass_only
+y 7
+end
+arch grass_only
+y 8
+end
+arch grass_only
+y 9
+end
+arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch grass_only
+y 12
+end
+arch grass_only
+y 13
+end
+arch grass_only
+y 14
+end
+arch grass_only
+y 15
+end
+arch grass_only
+y 16
+end
+arch grass_only
+y 17
+end
+arch grass_only
+y 18
+end
+arch grass_only
+y 19
+end
+arch river_w-e
+y 19
+end
+arch grass_only
+x 1
+end
+arch grass_only
+x 1
+y 1
+end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
+x 1
+y 19
+end
+arch river_w-e
+x 1
+y 19
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch stonefloor2
+x 2
+y 2
 end
 arch westcwall_2_2_2
-end
-arch tile_white_floor
-y 1
-end
-arch westcwall_2_1_1
-y 1
-end
-arch tile_white_floor
+x 2
 y 2
 end
-arch westcwall_2_1_1
-y 2
-end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 3
 end
 arch westcwall_2_1_1
+x 2
 y 3
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 4
 end
 arch westcwall_2_1_1
+x 2
 y 4
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 5
 end
 arch westcwall_2_1_1
+x 2
 y 5
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 6
 end
 arch westcwall_2_1_1
+x 2
 y 6
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 7
 end
 arch westcwall_2_1_1
+x 2
 y 7
 end
-arch tile_white_floor
+arch light2
+x 2
 y 8
 end
-arch westcwall_2_1_1
+arch stonefloor2
+x 2
 y 8
 end
-arch tile_white_floor
+arch westcwall_win1
+x 2
+y 8
+end
+arch stonefloor2
+x 2
 y 9
 end
 arch westcwall_2_1_1
+x 2
 y 9
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 10
 end
 arch westcwall_2_1_1
+x 2
 y 10
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 11
 end
 arch westcwall_2_1_1
+x 2
 y 11
 end
-arch tile_white_floor
+arch stonefloor2
+x 2
 y 12
 end
+arch westcwall_2_1_1
+x 2
+y 12
+end
+arch stonefloor2
+x 2
+y 13
+end
+arch westcwall_2_1_1
+x 2
+y 13
+end
+arch stonefloor2
+x 2
+y 14
+end
 arch westcwall_2_2_1
-y 12
-end
-arch tile_white_floor
-x 1
-end
-arch westcwall_2_1_2
-x 1
-end
-arch shop_building_west
-x 1
-y 1
-end
-arch shop_building_west
-x 1
-y 2
-end
-arch shop_building_west
-x 1
-y 3
-end
-arch shop_building_west
-x 1
-y 4
-end
-arch shop_building_west
-x 1
-y 5
-end
-arch shop_building_west
-x 1
-y 6
-end
-arch shop_building_west
-x 1
-y 7
-end
-arch shop_building_west
-x 1
-y 8
-end
-arch shop_building_west
-x 1
-y 9
-end
-arch shop_building_west
-x 1
-y 10
-end
-arch shop_building_west
-x 1
-y 11
-end
-arch tile_white_floor
-x 1
-y 12
-end
-arch westcwall_2_1_2
-x 1
-y 12
-end
-arch tile_white_floor
 x 2
+y 14
 end
-arch westcwall_2_1_2
+arch grass_only
 x 2
+y 15
 end
-arch shop_building_west
+arch grass_only
 x 2
-y 1
+y 16
 end
-arch shop_empty
+arch grass_only
 x 2
-y 2
+y 17
 end
-arch shop_empty
+arch grass_only
 x 2
-y 3
+y 18
 end
-arch shop_empty
+arch grass_only
 x 2
-y 4
+y 19
 end
-arch shop_empty
+arch river_w-e
 x 2
-y 5
+y 19
 end
-arch shop_empty
-x 2
-y 6
-end
-arch shop_empty
-x 2
-y 7
-end
-arch shop_empty
-x 2
-y 8
-end
-arch shop_empty
-x 2
-y 9
-end
-arch shop_empty
-x 2
-y 10
-end
-arch shop_building_west
-x 2
-y 11
-end
-arch tile_white_floor
-x 2
-y 12
-end
-arch westcwall_2_1_2
-x 2
-y 12
-end
-arch tile_white_floor
+arch grass_only
 x 3
 end
-arch westcwall_2_1_2
-x 3
-end
-arch shop_building_west
+arch grass_only
 x 3
 y 1
 end
-arch shop_building_west
+arch stonefloor2
 x 3
 y 2
 end
-arch shop_empty
+arch westcwall_2_1_2
+x 3
+y 2
+end
+arch shop_building_west
 x 3
 y 3
 end
-arch shop_empty
+arch shop_building_west
 x 3
 y 4
 end
@@ -250,10 +344,6 @@ arch shop_building_west
 x 3
 y 9
 end
-arch shop_empty
-x 3
-y 10
-end
 arch shop_building_west
 x 3
 y 10
@@ -262,29 +352,66 @@ arch shop_building_west
 x 3
 y 11
 end
-arch tile_white_floor
+arch shop_building_west
 x 3
 y 12
 end
-arch westcwall_2_1_2
-x 3
-y 12
-end
-arch tile_white_floor
-x 4
-end
-arch westcwall_2_1_2
-x 4
-end
 arch shop_building_west
+x 3
+y 13
+end
+arch stonefloor2
+x 3
+y 14
+end
+arch westcwall_2_1_2
+x 3
+y 14
+end
+arch grass_only
+x 3
+y 15
+end
+arch grass_only
+x 3
+y 16
+end
+arch grass_only
+x 3
+y 17
+end
+arch grass_only
+x 3
+y 18
+end
+arch grass_only
+x 3
+y 19
+end
+arch river_w-e
+x 3
+y 19
+end
+arch grass_only
+x 4
+end
+arch grass_only
 x 4
 y 1
 end
-arch shop_building_west
+arch light2
 x 4
 y 2
 end
-arch shop_empty
+arch stonefloor2
+x 4
+y 2
+end
+arch westcwall_win2
+x 4
+y 2
+end
+arch shop_building_west
 x 4
 y 3
 end
@@ -292,112 +419,363 @@ arch shop_empty
 x 4
 y 4
 end
-arch tile_white_floor
+arch light4
 x 4
 y 5
 end
+arch shop_empty
+x 4
+y 5
+end
+arch shop_empty
+x 4
+y 6
+end
+arch shop_empty
+x 4
+y 7
+end
+arch light4
+x 4
+y 8
+end
+arch shop_empty
+x 4
+y 8
+end
+arch shop_empty
+x 4
+y 9
+end
+arch shop_empty
+x 4
+y 10
+end
+arch light4
+x 4
+y 11
+end
+arch shop_empty
+x 4
+y 11
+end
+arch shop_empty
+x 4
+y 12
+end
+arch shop_building_west
+x 4
+y 13
+end
+arch stonefloor2
+x 4
+y 14
+end
+arch westcwall_2_1_2
+x 4
+y 14
+end
+arch grass_only
+x 4
+y 15
+end
+arch grass_only
+x 4
+y 16
+end
+arch grass_only
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch grass_only
+x 4
+y 19
+end
+arch river_w-e
+x 4
+y 19
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch stonefloor2
+x 5
+y 2
+end
+arch westcwall_2_1_2
+x 5
+y 2
+end
+arch shop_building_west
+x 5
+y 3
+end
+arch shop_building_west
+x 5
+y 4
+end
+arch shop_empty
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 6
+end
+arch shop_building_west
+x 5
+y 7
+end
+arch shop_building_west
+x 5
+y 8
+end
+arch shop_building_west
+x 5
+y 9
+end
+arch shop_building_west
+x 5
+y 10
+end
+arch shop_building_west
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch shop_building_west
+x 5
+y 12
+end
+arch shop_building_west
+x 5
+y 13
+end
+arch stonefloor2
+x 5
+y 14
+end
+arch westcwall_2_1_2
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 15
+end
+arch grass_only
+x 5
+y 16
+end
+arch grass_only
+x 5
+y 17
+end
+arch grass_only
+x 5
+y 18
+end
+arch grass_only
+x 5
+y 19
+end
+arch river_w-e
+x 5
+y 19
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch stonefloor2
+x 6
+y 2
+end
+arch westcwall_2_1_2
+x 6
+y 2
+end
+arch shop_building_west
+x 6
+y 3
+end
+arch shop_building_west
+x 6
+y 4
+end
+arch shop_empty
+x 6
+y 5
+end
+arch shop_empty
+x 6
+y 6
+end
+arch stonefloor2
+x 6
+y 7
+end
 arch westcwall_2_2_2
-x 4
-y 5
-end
-arch tile_white_floor
-x 4
-y 6
-end
-arch westcwall_2_1_1
-x 4
-y 6
-end
-arch tile_white_floor
-x 4
+x 6
 y 7
 end
-arch westcwall_win1
-x 4
-y 7
-end
-arch tile_white_floor
-x 4
+arch stonefloor2
+x 6
 y 8
 end
 arch westcwall_2_1_1
-x 4
+x 6
 y 8
 end
-arch tile_white_floor
-x 4
+arch light2
+x 6
+y 9
+end
+arch stonefloor2
+x 6
 y 9
 end
 arch westcwall_win1
-x 4
+x 6
 y 9
 end
-arch tile_white_floor
-x 4
+arch stonefloor2
+x 6
 y 10
 end
 arch westcwall_2_1_1
-x 4
+x 6
 y 10
 end
-arch tile_white_floor
-x 4
+arch light2
+x 6
 y 11
 end
-arch westcwall_2_1_1
-x 4
+arch stonefloor2
+x 6
 y 11
 end
-arch tile_white_floor
-x 4
+arch westcwall_win1
+x 6
+y 11
+end
+arch stonefloor2
+x 6
 y 12
 end
+arch westcwall_2_1_1
+x 6
+y 12
+end
+arch stonefloor2
+x 6
+y 13
+end
+arch westcwall_2_1_1
+x 6
+y 13
+end
+arch stonefloor2
+x 6
+y 14
+end
 arch westcwall_3_1
-x 4
-y 12
+x 6
+y 14
 end
-arch tile_white_floor
-x 5
+arch grass_only
+x 6
+y 15
 end
-arch westcwall_2_1_2
-x 5
+arch grass_only
+x 6
+y 16
 end
-arch shop_building_west
-x 5
+arch grass_only
+x 6
+y 17
+end
+arch grass_only
+x 6
+y 18
+end
+arch grass_only
+x 6
+y 19
+end
+arch river_w-e
+x 6
+y 19
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
-arch shop_empty
-x 5
+arch stonefloor2
+x 7
 y 2
 end
-arch shop_empty
-x 5
+arch westcwall_2_1_2
+x 7
+y 2
+end
+arch shop_building_west
+x 7
 y 3
 end
 arch shop_empty
-x 5
+x 7
 y 4
 end
-arch tile_white_floor
-x 5
+arch light4
+x 7
 y 5
 end
-arch swall_1_4
-x 5
+arch shop_empty
+x 7
 y 5
 end
-arch westcwall_1_3
-x 5
-y 5
-end
-arch tile_white_floor
-x 5
+arch shop_empty
+x 7
 y 6
 end
-arch tile_white_floor
-x 5
+arch stonefloor2
+x 7
 y 7
 end
+arch swall_1_4
+x 7
+y 7
+end
+arch westcwall_1_3
+x 7
+y 7
+end
+arch stonefloor2
+x 7
+y 8
+end
+arch stonefloor2
+x 7
+y 9
+end
 arch book_read
 name Building floor and walls
 msg
@@ -407,15 +785,15 @@ You can change an existing floor by building another on top. Same goes for walls
 All created floors are magic, and will preserve items you put on them.
 You can add a window in some walls. To remove the window, build a new wall.
 endmsg
-x 5
-y 7
+x 7
+y 9
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 5
-y 8
+arch stonefloor2
+x 7
+y 10
 end
 arch book_read
 name Building gates and buttons/pedestals
@@ -437,15 +815,15 @@ Also, it is possible to make buttons, levers, and pedestals underneath gates, ho
 * then build the button underneath it
 This is useful for making a gate avoid crushing people underneath it. Also, you can use this same technique with inverted gates in order to make a square that pushes objects placed on it off of it.
 endmsg
-x 5
-y 8
+x 7
+y 10
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 5
-y 9
+arch stonefloor2
+x 7
+y 11
 end
 arch book_read
 name Removing items
@@ -455,15 +833,15 @@ Simply apply it, and fire in the desired direction. It will remove the first bui
 Warning: a destroyer will remove items starting from the lowest order on the spot. Basically, this means the first removed item will be a pedestal (underground), then items on floor.
 Note that the destroyer will not remove walls or floors.
 endmsg
-x 5
-y 9
+x 7
+y 11
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 5
-y 10
+arch stonefloor2
+x 7
+y 12
 end
 arch sign
 msg
@@ -471,131 +849,240 @@ Welcome to Acme. Inc construction shop!
 You will find here everything you need to build your own customized home, sweet home.
 Make sure to read our documentation on how to build nice maps.
 endmsg
-x 5
-y 10
-end
-arch tile_white_floor
-x 5
-y 11
-end
-arch tile_white_floor
-x 5
+x 7
 y 12
 end
+arch button_small
+x 7
+y 13
+connected 1
+end
+arch stonefloor2
+x 7
+y 13
+end
+arch stonefloor2
+x 7
+y 14
+end
 arch westcwall_1_3
-x 5
-y 12
+x 7
+y 14
 end
-arch tile_white_floor
-x 6
+arch dungeon_magic
+x 7
+y 15
 end
-arch westcwall_2_1_2
-x 6
-end
-arch shop_building_west
-x 6
-y 1
-end
-arch shop_building_west
-x 6
-y 2
-end
-arch shop_empty
-x 6
-y 3
-end
-arch shop_empty
-x 6
-y 4
-end
-arch shop_mat
-x 6
-y 4
-end
-arch tile_white_floor
-x 6
-y 5
-end
-arch swall_2_1_2
-x 6
-y 5
-end
-arch tile_white_floor
-x 6
-y 6
-end
-arch shop_mat
-x 6
-y 6
-end
-arch tile_white_floor
-x 6
-y 7
-end
-arch tile_white_floor
-x 6
-y 8
-end
-arch tile_white_floor
-x 6
-y 9
-end
-arch tile_white_floor
-x 6
-y 10
-end
-arch tile_white_floor
-x 6
-y 11
-end
-arch tile_white_floor
-x 6
-y 12
-end
-arch oakdoor_2
+arch invis_exit
 slaying /world/world_122_117
 hp 17
 sp 4
-x 6
-y 12
-end
-arch tile_white_floor
 x 7
+y 15
 end
-arch westcwall_2_1_2
+arch grass_only
 x 7
+y 15
 end
-arch shop_building_west
+arch grass_only
 x 7
+y 16
+end
+arch grass_only
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch river_w-e
+x 7
+y 19
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch shop_building_west
-x 7
+arch stonefloor2
+x 8
 y 2
 end
-arch shop_empty
-x 7
+arch westcwall_2_1_2
+x 8
+y 2
+end
+arch shop_building_west
+x 8
 y 3
 end
-arch shop_empty
-x 7
+arch shop_building_west
+x 8
 y 4
 end
-arch tile_white_floor
-x 7
+arch shop_empty
+x 8
 y 5
 end
+arch shop_empty
+x 8
+y 6
+end
+arch shop_mat
+x 8
+y 6
+end
+arch stonefloor2
+x 8
+y 7
+end
+arch swall_2_1_2
+x 8
+y 7
+end
+arch stonefloor2
+x 8
+y 8
+end
+arch shop_mat
+x 8
+y 8
+end
+arch light4
+x 8
+y 9
+end
+arch stonefloor2
+x 8
+y 9
+end
+arch stonefloor2
+x 8
+y 10
+end
+arch stonefloor2
+x 8
+y 11
+end
+arch stonefloor2
+x 8
+y 12
+end
+arch light4
+x 8
+y 13
+end
+arch button_small
+x 8
+y 13
+connected 1
+end
+arch stonefloor2
+x 8
+y 13
+end
+arch button_small
+x 8
+y 14
+connected 1
+end
+arch stonefloor2
+x 8
+y 14
+end
+arch odoorn2_closed_1
+x 8
+y 14
+connected 1
+end
+arch dungeon_magic
+x 8
+y 15
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 17
+sp 4
+x 8
+y 15
+end
+arch grass_only
+x 8
+y 15
+end
+arch grass_only
+x 8
+y 16
+end
+arch grass_only
+x 8
+y 17
+end
+arch grass_only
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch bridge_ns
+x 8
+y 19
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch stonefloor2
+x 9
+y 2
+end
+arch westcwall_2_1_2
+x 9
+y 2
+end
+arch shop_building_west
+x 9
+y 3
+end
+arch shop_building_west
+x 9
+y 4
+end
+arch shop_empty
+x 9
+y 5
+end
+arch shop_empty
+x 9
+y 6
+end
+arch stonefloor2
+x 9
+y 7
+end
 arch swall_1_3
-x 7
-y 5
+x 9
+y 7
 end
 arch westcwall_1_4
-x 7
-y 5
+x 9
+y 7
 end
-arch tile_white_floor
-x 7
-y 6
+arch stonefloor2
+x 9
+y 8
 end
 arch book_read
 name Signs and talking books
@@ -610,15 +1097,15 @@ Click.
 
 Which will make it activate upon the somebody within two squares saying "blah", and will additionally say "Click." upon activation.
 endmsg
-x 7
-y 6
+x 9
+y 8
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 7
-y 7
+arch stonefloor2
+x 9
+y 9
 end
 arch book_read
 name Building restrictions
@@ -627,15 +1114,15 @@ To build on a spot, all items on this spot must be 'buildable'.
 Buildable items will display 'this is a buildable item' when examined.
 There are several exceptions though. In all cases you can build on marking runes as they are used for making gates and buttons work together. Also you can build signs and talking books on of books and or scrolls, because they are needed for specifying the message. Also, buttons, levers and pedestals can be build underneath gates. Don't worry, you should have some clear messages on why you can't build.
 endmsg
-x 7
-y 7
+x 9
+y 9
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 7
-y 8
+arch stonefloor2
+x 9
+y 10
 end
 arch book_read
 name Building other items
@@ -644,15 +1131,15 @@ All items not requiring any special handling are built simply by marking the app
 Note that, to avoid any issue, those items can not be picked up.
 Note also that you can build an item on another.
 endmsg
-x 7
-y 8
+x 9
+y 10
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 7
-y 9
+arch stonefloor2
+x 9
+y 11
 end
 arch book_read
 name Basic building instructions
@@ -667,253 +1154,227 @@ To build an item:
 * fire the builder in the desired direction
 Of course, the material is used when you build, so you need to buy quite a few.
 endmsg
-x 7
-y 9
+x 9
+y 11
 material 0
 no_pick 1
 identified 1
 end
-arch tile_white_floor
-x 7
-y 10
+arch stonefloor2
+x 9
+y 12
 end
 arch menu
-x 7
-y 10
-end
-arch tile_white_floor
-x 7
-y 11
-end
-arch tile_white_floor
-x 7
+x 9
 y 12
 end
+arch button_small
+x 9
+y 13
+connected 1
+end
+arch stonefloor2
+x 9
+y 13
+end
+arch stonefloor2
+x 9
+y 14
+end
 arch westcwall_1_4
-x 7
-y 12
+x 9
+y 14
 end
-arch tile_white_floor
-x 8
+arch dungeon_magic
+x 9
+y 15
 end
-arch westcwall_2_1_2
-x 8
+arch invis_exit
+slaying /world/world_122_117
+hp 17
+sp 4
+x 9
+y 15
 end
-arch shop_building_west
-x 8
+arch grass_only
+x 9
+y 15
+end
+arch grass_only
+x 9
+y 16
+end
+arch grass_only
+x 9
+y 17
+end
+arch grass_only
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch river_w-e
+x 9
+y 19
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
-arch shop_empty
-x 8
+arch light2
+x 10
 y 2
 end
-arch shop_empty
-x 8
+arch stonefloor2
+x 10
+y 2
+end
+arch westcwall_win2
+x 10
+y 2
+end
+arch shop_building_west
+x 10
 y 3
 end
 arch shop_empty
-x 8
+x 10
 y 4
 end
-arch tile_white_floor
-x 8
+arch light4
+x 10
 y 5
 end
+arch shop_empty
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
+arch stonefloor2
+x 10
+y 7
+end
 arch westcwall_2_2_3
-x 8
-y 5
-end
-arch tile_white_floor
-x 8
-y 6
-end
-arch westcwall_2_1_1
-x 8
-y 6
-end
-arch tile_white_floor
-x 8
+x 10
 y 7
 end
-arch westcwall_win1
-x 8
-y 7
-end
-arch tile_white_floor
-x 8
+arch stonefloor2
+x 10
 y 8
 end
 arch westcwall_2_1_1
-x 8
+x 10
 y 8
 end
-arch tile_white_floor
-x 8
+arch light2
+x 10
+y 9
+end
+arch stonefloor2
+x 10
 y 9
 end
 arch westcwall_win1
-x 8
+x 10
 y 9
 end
-arch tile_white_floor
-x 8
+arch stonefloor2
+x 10
 y 10
 end
 arch westcwall_2_1_1
-x 8
+x 10
 y 10
 end
-arch tile_white_floor
-x 8
+arch light2
+x 10
 y 11
 end
-arch westcwall_2_1_1
-x 8
+arch stonefloor2
+x 10
 y 11
 end
-arch tile_white_floor
-x 8
+arch westcwall_win1
+x 10
+y 11
+end
+arch stonefloor2
+x 10
 y 12
 end
+arch westcwall_2_1_1
+x 10
+y 12
+end
+arch stonefloor2
+x 10
+y 13
+end
+arch westcwall_2_1_1
+x 10
+y 13
+end
+arch stonefloor2
+x 10
+y 14
+end
 arch westcwall_3_1
-x 8
-y 12
-end
-arch tile_white_floor
-x 9
-end
-arch westcwall_2_1_2
-x 9
-end
-arch shop_building_west
-x 9
-y 1
-end
-arch shop_building_west
-x 9
-y 2
-end
-arch shop_empty
-x 9
-y 3
-end
-arch shop_empty
-x 9
-y 4
-end
-arch shop_building_west
-x 9
-y 5
-end
-arch shop_building_west
-x 9
-y 6
-end
-arch shop_building_west
-x 9
-y 7
-end
-arch shop_building_west
-x 9
-y 8
-end
-arch shop_building_west
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 10
-end
-arch shop_building_west
-x 9
-y 11
-end
-arch tile_white_floor
-x 9
-y 12
-end
-arch westcwall_2_1_2
-x 9
-y 12
-end
-arch tile_white_floor
 x 10
+y 14
 end
-arch westcwall_2_1_2
+arch grass_only
 x 10
+y 15
 end
-arch shop_building_west
+arch grass_only
 x 10
-y 1
+y 16
 end
-arch shop_building_west
+arch grass_only
 x 10
-y 2
+y 17
 end
-arch shop_empty
+arch grass_only
 x 10
-y 3
+y 18
 end
-arch shop_empty
+arch grass_only
 x 10
-y 4
+y 19
 end
-arch shop_building_west
+arch river_w-e
 x 10
-y 5
+y 19
 end
-arch shop_building_west
-x 10
-y 6
-end
-arch shop_building_west
-x 10
-y 7
-end
-arch shop_building_west
-x 10
-y 8
-end
-arch shop_building_west
-x 10
-y 9
-end
-arch shop_empty
-x 10
-y 10
-end
-arch shop_building_west
-x 10
-y 11
-end
-arch tile_white_floor
-x 10
-y 12
-end
-arch westcwall_2_1_2
-x 10
-y 12
-end
-arch tile_white_floor
+arch grass_only
 x 11
 end
-arch westcwall_2_1_2
-x 11
-end
-arch shop_building_west
+arch grass_only
 x 11
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 11
 y 2
 end
-arch shop_empty
+arch westcwall_2_1_2
+x 11
+y 2
+end
+arch shop_building_west
 x 11
 y 3
 end
-arch shop_empty
+arch shop_building_west
 x 11
 y 4
 end
@@ -925,19 +1386,19 @@ arch shop_empty
 x 11
 y 6
 end
-arch shop_empty
+arch shop_building_west
 x 11
 y 7
 end
-arch shop_empty
+arch shop_building_west
 x 11
 y 8
 end
-arch shop_empty
+arch shop_building_west
 x 11
 y 9
 end
-arch shop_empty
+arch shop_building_west
 x 11
 y 10
 end
@@ -945,41 +1406,74 @@ arch shop_building_west
 x 11
 y 11
 end
-arch tile_white_floor
+arch shop_empty
 x 11
 y 12
 end
+arch shop_building_west
+x 11
+y 13
+end
+arch stonefloor2
+x 11
+y 14
+end
 arch westcwall_2_1_2
 x 11
-y 12
+y 14
 end
-arch tile_white_floor
+arch grass_only
+x 11
+y 15
+end
+arch grass_only
+x 11
+y 16
+end
+arch grass_only
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch river_w-e
+x 11
+y 19
+end
+arch grass_only
 x 12
 end
-arch westcwall_2_1_2
-x 12
-end
-arch shop_building_west
+arch grass_only
 x 12
 y 1
 end
-arch shop_building_west
+arch stonefloor2
 x 12
 y 2
 end
-arch shop_empty
+arch westcwall_2_1_2
+x 12
+y 2
+end
+arch shop_building_west
 x 12
 y 3
 end
-arch shop_empty
+arch shop_building_west
 x 12
 y 4
 end
-arch shop_building_west
+arch shop_empty
 x 12
 y 5
 end
-arch shop_building_west
+arch shop_empty
 x 12
 y 6
 end
@@ -995,7 +1489,7 @@ arch shop_building_west
 x 12
 y 9
 end
-arch shop_empty
+arch shop_building_west
 x 12
 y 10
 end
@@ -1003,29 +1497,62 @@ arch shop_building_west
 x 12
 y 11
 end
-arch tile_white_floor
+arch shop_empty
 x 12
 y 12
 end
+arch shop_building_west
+x 12
+y 13
+end
+arch stonefloor2
+x 12
+y 14
+end
 arch westcwall_2_1_2
 x 12
-y 12
+y 14
 end
-arch tile_white_floor
+arch grass_only
+x 12
+y 15
+end
+arch grass_only
+x 12
+y 16
+end
+arch grass_only
+x 12
+y 17
+end
+arch grass_only
+x 12
+y 18
+end
+arch grass_only
+x 12
+y 19
+end
+arch river_w-e
+x 12
+y 19
+end
+arch grass_only
 x 13
 end
-arch westcwall_2_1_2
-x 13
-end
-arch shop_building_west
+arch grass_only
 x 13
 y 1
 end
-arch shop_building_west
+arch stonefloor2
 x 13
 y 2
 end
-arch shop_empty
+arch westcwall_2_1_2
+x 13
+y 2
+end
+arch shop_building_west
 x 13
 y 3
 end
@@ -1033,11 +1560,11 @@ arch shop_empty
 x 13
 y 4
 end
-arch shop_empty
+arch light4
 x 13
 y 5
 end
-arch shop_building_west
+arch shop_empty
 x 13
 y 5
 end
@@ -1045,31 +1572,19 @@ arch shop_empty
 x 13
 y 6
 end
-arch shop_building_west
-x 13
-y 6
-end
 arch shop_empty
 x 13
 y 7
 end
-arch shop_building_west
-x 13
-y 7
-end
-arch shop_empty
-x 13
-y 8
-end
-arch shop_building_west
+arch light4
 x 13
 y 8
 end
 arch shop_empty
 x 13
-y 9
+y 8
 end
-arch shop_building_west
+arch shop_empty
 x 13
 y 9
 end
@@ -1077,741 +1592,1534 @@ arch shop_empty
 x 13
 y 10
 end
-arch shop_building_west
+arch light4
 x 13
 y 11
 end
-arch tile_white_floor
+arch shop_empty
+x 13
+y 11
+end
+arch shop_empty
 x 13
 y 12
 end
-arch westcwall_2_1_2
+arch shop_building_west
 x 13
-y 12
+y 13
 end
-arch tile_white_floor
-x 14
-end
-arch westcwall_2_1_2
-x 14
-end
-arch shop_building_west
-x 14
-y 1
-end
-arch shop_empty
-x 14
-y 2
-end
-arch shop_empty
-x 14
-y 3
-end
-arch shop_empty
-x 14
-y 4
-end
-arch shop_empty
-x 14
-y 5
-end
-arch shop_empty
-x 14
-y 6
-end
-arch shop_empty
-x 14
-y 7
-end
-arch shop_empty
-x 14
-y 8
-end
-arch shop_empty
-x 14
-y 9
-end
-arch shop_empty
-x 14
-y 10
-end
-arch shop_building_west
-x 14
-y 11
-end
-arch tile_white_floor
-x 14
-y 12
-end
-arch westcwall_2_1_2
-x 14
-y 12
-end
-arch tile_white_floor
-x 15
-end
-arch westcwall_2_1_2
-x 15
-end
-arch shop_building_west
-x 15
-y 1
-end
-arch shop_building_west
-x 15
-y 2
-end
-arch shop_empty
-x 15
-y 3
-end
-arch shop_empty
-x 15
-y 4
-end
-arch shop_empty
-x 15
-y 5
-end
-arch shop_building_west
-x 15
-y 5
-end
-arch shop_empty
-x 15
-y 6
-end
-arch shop_building_west
-x 15
-y 6
-end
-arch shop_empty
-x 15
-y 7
-end
-arch shop_building_west
-x 15
-y 7
-end
-arch shop_empty
-x 15
-y 8
-end
-arch shop_building_west
-x 15
-y 8
-end
-arch shop_empty
-x 15
-y 9
-end
-arch shop_building_west
-x 15
-y 9
-end
-arch shop_empty
-x 15
-y 10
-end
-arch shop_empty
-x 15
-y 11
-end
-arch shop_building_west
-x 15
-y 11
-end
-arch tile_white_floor
-x 15
-y 12
-end
-arch westcwall_2_1_2
-x 15
-y 12
-end
-arch tile_white_floor
-x 16
-end
-arch westcwall_2_1_2
-x 16
-end
-arch shop_building_west
-x 16
-y 1
-end
-arch shop_building_west
-x 16
-y 2
-end
-arch shop_empty
-x 16
-y 3
-end
-arch shop_empty
-x 16
-y 4
-end
-arch shop_empty
-x 16
-y 5
-end
-arch shop_building_west
-x 16
-y 5
-end
-arch shop_empty
-x 16
-y 6
-end
-arch shop_building_west
-x 16
-y 6
-end
-arch shop_empty
-x 16
-y 7
-end
-arch shop_building_west
-x 16
-y 7
-end
-arch shop_empty
-x 16
-y 8
-end
-arch shop_building_west
-x 16
-y 8
-end
-arch shop_empty
-x 16
-y 9
-end
-arch shop_building_west
-x 16
-y 9
-end
-arch shop_empty
-x 16
-y 10
-end
-arch shop_empty
-x 16
-y 11
-end
-arch shop_building_west
-x 16
-y 11
-end
-arch tile_white_floor
-x 16
-y 12
-end
-arch westcwall_2_1_2
-x 16
-y 12
-end
-arch tile_white_floor
-x 17
-end
-arch westcwall_2_1_2
-x 17
-end
-arch shop_building_west
-x 17
-y 1
-end
-arch shop_empty
-x 17
-y 2
-end
-arch shop_empty
-x 17
-y 3
-end
-arch shop_empty
-x 17
-y 4
-end
-arch shop_empty
-x 17
-y 5
-end
-arch shop_empty
-x 17
-y 6
-end
-arch shop_empty
-x 17
-y 7
-end
-arch shop_empty
-x 17
-y 8
-end
-arch shop_empty
-x 17
-y 9
-end
-arch shop_empty
-x 17
-y 10
-end
-arch shop_empty
-x 17
-y 11
-end
-arch shop_building_west
-x 17
-y 11
-end
-arch tile_white_floor
-x 17
-y 12
-end
-arch westcwall_2_1_2
-x 17
-y 12
-end
-arch tile_white_floor
-x 18
-end
-arch westcwall_2_1_2
-x 18
-end
-arch shop_building_west
-x 18
-y 1
-end
-arch shop_building_west
-x 18
-y 2
-end
-arch shop_empty
-x 18
-y 3
-end
-arch shop_empty
-x 18
-y 4
-end
-arch shop_empty
-x 18
-y 5
-end
-arch shop_building_west
-x 18
-y 5
-end
-arch shop_empty
-x 18
-y 6
-end
-arch shop_building_west
-x 18
-y 6
-end
-arch shop_empty
-x 18
-y 7
-end
-arch shop_building_west
-x 18
-y 7
-end
-arch shop_empty
-x 18
-y 8
-end
-arch shop_building_west
-x 18
-y 8
-end
-arch shop_empty
-x 18
-y 9
-end
-arch shop_building_west
-x 18
-y 9
-end
-arch shop_empty
-x 18
-y 10
-end
-arch shop_empty
-x 18
-y 11
-end
-arch shop_building_west
-x 18
-y 11
-end
-arch tile_white_floor
-x 18
-y 12
-end
-arch westcwall_2_1_2
-x 18
-y 12
-end
-arch tile_white_floor
-x 19
-end
-arch westcwall_2_1_2
-x 19
-end
-arch shop_empty
-x 19
-y 1
-end
-arch shop_building_west
-x 19
-y 1
-end
-arch shop_empty
-x 19
-y 2
-end
-arch shop_building_west
-x 19
-y 2
-end
-arch shop_empty
-x 19
-y 3
-end
-arch shop_empty
-x 19
-y 4
-end
-arch shop_empty
-x 19
-y 5
-end
-arch shop_building_west
-x 19
-y 5
-end
-arch shop_empty
-x 19
-y 6
-end
-arch shop_building_west
-x 19
-y 6
-end
-arch shop_empty
-x 19
-y 7
-end
-arch shop_building_west
-x 19
-y 7
-end
-arch shop_empty
-x 19
-y 8
-end
-arch shop_building_west
-x 19
-y 8
-end
-arch shop_empty
-x 19
-y 9
-end
-arch shop_building_west
-x 19
-y 9
-end
-arch shop_empty
-x 19
-y 10
-end
-arch shop_empty
-x 19
-y 11
-end
-arch shop_building_west
-x 19
-y 11
-end
-arch tile_white_floor
-x 19
-y 12
-end
-arch westcwall_2_1_2
-x 19
-y 12
-end
-arch tile_white_floor
-x 20
-end
-arch westcwall_2_1_2
-x 20
-end
-arch shop_empty
-x 20
-y 1
-end
-arch shop_building_west
-x 20
-y 1
-end
-arch shop_empty
-x 20
-y 2
-end
-arch shop_empty
-x 20
-y 3
-end
-arch shop_empty
-x 20
-y 4
-end
-arch shop_empty
-x 20
-y 5
-end
-arch shop_empty
-x 20
-y 6
-end
-arch shop_empty
-x 20
-y 7
-end
-arch shop_empty
-x 20
-y 8
-end
-arch shop_empty
-x 20
-y 9
-end
-arch shop_empty
-x 20
-y 10
-end
-arch shop_empty
-x 20
-y 11
-end
-arch shop_building_west
-x 20
-y 11
-end
-arch tile_white_floor
-x 20
-y 12
-end
-arch westcwall_2_1_2
-x 20
-y 12
-end
-arch tile_white_floor
-x 21
-end
-arch westcwall_2_1_2
-x 21
-end
-arch shop_empty
-x 21
-y 1
-end
-arch shop_building_west
-x 21
-y 1
-end
-arch shop_empty
-x 21
-y 2
-end
-arch shop_building_west
-x 21
-y 2
-end
-arch shop_empty
-x 21
-y 3
-end
-arch shop_building_west
-x 21
-y 3
-end
-arch shop_empty
-x 21
-y 4
-end
-arch shop_building_west
-x 21
-y 4
-end
-arch shop_empty
-x 21
-y 5
-end
-arch shop_building_west
-x 21
-y 5
-end
-arch shop_empty
-x 21
-y 6
-end
-arch shop_building_west
-x 21
-y 6
-end
-arch shop_empty
-x 21
-y 7
-end
-arch shop_building_west
-x 21
-y 7
-end
-arch shop_empty
-x 21
-y 8
-end
-arch shop_building_west
-x 21
-y 8
-end
-arch shop_empty
-x 21
-y 9
-end
-arch shop_building_west
-x 21
-y 9
-end
-arch shop_empty
-x 21
-y 10
-end
-arch shop_building_west
-x 21
-y 10
-end
-arch shop_empty
-x 21
-y 11
-end
-arch shop_building_west
-x 21
-y 11
-end
-arch tile_white_floor
-x 21
-y 12
-end
-arch westcwall_2_1_2
-x 21
-y 12
-end
-arch tile_white_floor
-x 22
+arch stonefloor2
+x 13
+y 14
 end
 arch westcwall_2_2_3
-x 22
+x 13
+y 14
 end
-arch tile_white_floor
-x 22
+arch stonefloor2
+x 13
+y 15
+end
+arch westcwall_2_1_1
+x 13
+y 15
+end
+arch stonefloor2
+x 13
+y 16
+end
+arch westcwall_2_1_1
+x 13
+y 16
+end
+arch stonefloor2
+x 13
+y 17
+end
+arch westcwall_2_2_1
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch river_w-e
+x 13
+y 19
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch westcwall_2_1_1
-x 22
-y 1
-end
-arch tile_white_floor
-x 22
+arch stonefloor2
+x 14
 y 2
 end
-arch westcwall_2_1_1
-x 22
+arch westcwall_2_1_2
+x 14
 y 2
 end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 3
 end
-arch westcwall_2_1_1
-x 22
-y 3
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 4
 end
-arch westcwall_2_1_1
-x 22
-y 4
-end
-arch tile_white_floor
-x 22
+arch shop_empty
+x 14
 y 5
 end
-arch westcwall_2_1_1
-x 22
-y 5
-end
-arch tile_white_floor
-x 22
+arch shop_empty
+x 14
 y 6
 end
-arch westcwall_2_1_1
-x 22
-y 6
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 7
 end
-arch westcwall_2_1_1
-x 22
-y 7
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 8
 end
-arch westcwall_2_1_1
-x 22
-y 8
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 9
 end
-arch westcwall_2_1_1
-x 22
-y 9
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 10
 end
-arch westcwall_2_1_1
-x 22
-y 10
-end
-arch tile_white_floor
-x 22
+arch shop_building_west
+x 14
 y 11
 end
-arch westcwall_2_1_1
-x 22
-y 11
-end
-arch tile_white_floor
-x 22
+arch shop_empty
+x 14
 y 12
 end
+arch shop_building_west
+x 14
+y 13
+end
+arch shop_building_west
+x 14
+y 14
+end
+arch shop_building_west
+x 14
+y 15
+end
+arch shop_building_west
+x 14
+y 16
+end
+arch stonefloor2
+x 14
+y 17
+end
+arch westcwall_2_1_2
+x 14
+y 17
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch river_w-e
+x 14
+y 19
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch stonefloor2
+x 15
+y 2
+end
+arch westcwall_2_1_2
+x 15
+y 2
+end
+arch shop_building_west
+x 15
+y 3
+end
+arch shop_building_west
+x 15
+y 4
+end
+arch shop_empty
+x 15
+y 5
+end
+arch shop_empty
+x 15
+y 6
+end
+arch shop_empty
+x 15
+y 7
+end
+arch shop_building_west
+x 15
+y 7
+end
+arch shop_empty
+x 15
+y 8
+end
+arch shop_building_west
+x 15
+y 8
+end
+arch shop_empty
+x 15
+y 9
+end
+arch shop_building_west
+x 15
+y 9
+end
+arch shop_empty
+x 15
+y 10
+end
+arch shop_building_west
+x 15
+y 10
+end
+arch shop_empty
+x 15
+y 11
+end
+arch shop_building_west
+x 15
+y 11
+end
+arch shop_empty
+x 15
+y 12
+end
+arch light4
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 14
+end
+arch light4
+x 15
+y 15
+end
+arch shop_empty
+x 15
+y 15
+end
+arch shop_building_west
+x 15
+y 16
+end
+arch stonefloor2
+x 15
+y 17
+end
+arch westcwall_2_1_2
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch river_w-e
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch light2
+x 16
+y 2
+end
+arch stonefloor2
+x 16
+y 2
+end
+arch westcwall_win2
+x 16
+y 2
+end
+arch shop_building_west
+x 16
+y 3
+end
+arch shop_empty
+x 16
+y 4
+end
+arch light4
+x 16
+y 5
+end
+arch shop_empty
+x 16
+y 5
+end
+arch shop_empty
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+end
+arch light4
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 9
+end
+arch shop_empty
+x 16
+y 10
+end
+arch light4
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 12
+end
+arch shop_empty
+x 16
+y 13
+end
+arch shop_empty
+x 16
+y 14
+end
+arch shop_empty
+x 16
+y 15
+end
+arch shop_building_west
+x 16
+y 16
+end
+arch light2
+x 16
+y 17
+end
+arch stonefloor2
+x 16
+y 17
+end
+arch westcwall_2_1_2
+x 16
+y 17
+end
+arch westcwall_win2
+x 16
+y 17
+end
+arch grass_only
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch river_w-e
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch stonefloor2
+x 17
+y 2
+end
+arch westcwall_2_1_2
+x 17
+y 2
+end
+arch shop_building_west
+x 17
+y 3
+end
+arch shop_building_west
+x 17
+y 4
+end
+arch shop_empty
+x 17
+y 5
+end
+arch shop_empty
+x 17
+y 6
+end
+arch shop_empty
+x 17
+y 7
+end
+arch shop_building_west
+x 17
+y 7
+end
+arch shop_empty
+x 17
+y 8
+end
+arch shop_building_west
+x 17
+y 8
+end
+arch shop_empty
+x 17
+y 9
+end
+arch shop_building_west
+x 17
+y 9
+end
+arch shop_empty
+x 17
+y 10
+end
+arch shop_building_west
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch shop_building_west
+x 17
+y 11
+end
+arch shop_empty
+x 17
+y 12
+end
+arch shop_empty
+x 17
+y 13
+end
+arch shop_empty
+x 17
+y 14
+end
+arch shop_empty
+x 17
+y 15
+end
+arch shop_building_west
+x 17
+y 16
+end
+arch stonefloor2
+x 17
+y 17
+end
+arch westcwall_2_1_2
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch river_w-e
+x 17
+y 19
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch stonefloor2
+x 18
+y 2
+end
+arch westcwall_2_1_2
+x 18
+y 2
+end
+arch shop_building_west
+x 18
+y 3
+end
+arch shop_building_west
+x 18
+y 4
+end
+arch shop_empty
+x 18
+y 5
+end
+arch shop_empty
+x 18
+y 6
+end
+arch shop_empty
+x 18
+y 7
+end
+arch shop_building_west
+x 18
+y 7
+end
+arch shop_empty
+x 18
+y 8
+end
+arch shop_building_west
+x 18
+y 8
+end
+arch shop_empty
+x 18
+y 9
+end
+arch shop_building_west
+x 18
+y 9
+end
+arch shop_empty
+x 18
+y 10
+end
+arch shop_building_west
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 11
+end
+arch shop_building_west
+x 18
+y 11
+end
+arch shop_empty
+x 18
+y 12
+end
+arch shop_empty
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 14
+end
+arch shop_empty
+x 18
+y 15
+end
+arch shop_building_west
+x 18
+y 16
+end
+arch light2
+x 18
+y 17
+end
+arch stonefloor2
+x 18
+y 17
+end
+arch westcwall_2_1_2
+x 18
+y 17
+end
+arch westcwall_win2
+x 18
+y 17
+end
+arch grass_only
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch river_w-e
+x 18
+y 19
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch stonefloor2
+x 19
+y 2
+end
+arch westcwall_2_1_2
+x 19
+y 2
+end
+arch shop_building_west
+x 19
+y 3
+end
+arch shop_empty
+x 19
+y 4
+end
+arch light4
+x 19
+y 5
+end
+arch shop_empty
+x 19
+y 5
+end
+arch shop_empty
+x 19
+y 6
+end
+arch shop_empty
+x 19
+y 7
+end
+arch light4
+x 19
+y 8
+end
+arch shop_empty
+x 19
+y 8
+end
+arch shop_empty
+x 19
+y 9
+end
+arch shop_empty
+x 19
+y 10
+end
+arch light4
+x 19
+y 11
+end
+arch shop_empty
+x 19
+y 11
+end
+arch shop_empty
+x 19
+y 12
+end
+arch light4
+x 19
+y 13
+end
+arch shop_empty
+x 19
+y 13
+end
+arch shop_empty
+x 19
+y 14
+end
+arch light4
+x 19
+y 15
+end
+arch shop_empty
+x 19
+y 15
+end
+arch shop_building_west
+x 19
+y 16
+end
+arch stonefloor2
+x 19
+y 17
+end
+arch westcwall_2_1_2
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
+arch river_w-e
+x 19
+y 19
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch stonefloor2
+x 20
+y 2
+end
+arch westcwall_2_1_2
+x 20
+y 2
+end
+arch shop_building_west
+x 20
+y 3
+end
+arch shop_building_west
+x 20
+y 4
+end
+arch shop_empty
+x 20
+y 5
+end
+arch shop_empty
+x 20
+y 6
+end
+arch shop_empty
+x 20
+y 7
+end
+arch shop_building_west
+x 20
+y 7
+end
+arch shop_empty
+x 20
+y 8
+end
+arch shop_building_west
+x 20
+y 8
+end
+arch shop_empty
+x 20
+y 9
+end
+arch shop_building_west
+x 20
+y 9
+end
+arch shop_empty
+x 20
+y 10
+end
+arch shop_building_west
+x 20
+y 10
+end
+arch shop_empty
+x 20
+y 11
+end
+arch shop_building_west
+x 20
+y 11
+end
+arch shop_empty
+x 20
+y 12
+end
+arch shop_empty
+x 20
+y 13
+end
+arch shop_building_west
+x 20
+y 13
+end
+arch shop_building_west
+x 20
+y 14
+end
+arch shop_building_west
+x 20
+y 15
+end
+arch shop_building_west
+x 20
+y 16
+end
+arch stonefloor2
+x 20
+y 17
+end
+arch westcwall_2_1_2
+x 20
+y 17
+end
+arch grass_only
+x 20
+y 18
+end
+arch grass_only
+x 20
+y 19
+end
+arch river_w-e
+x 20
+y 19
+end
+arch grass_only
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch stonefloor2
+x 21
+y 2
+end
+arch westcwall_2_1_2
+x 21
+y 2
+end
+arch shop_empty
+x 21
+y 3
+end
+arch shop_building_west
+x 21
+y 3
+end
+arch shop_empty
+x 21
+y 4
+end
+arch shop_building_west
+x 21
+y 4
+end
+arch shop_empty
+x 21
+y 5
+end
+arch shop_empty
+x 21
+y 6
+end
+arch shop_empty
+x 21
+y 7
+end
+arch shop_building_west
+x 21
+y 7
+end
+arch shop_empty
+x 21
+y 8
+end
+arch shop_building_west
+x 21
+y 8
+end
+arch shop_empty
+x 21
+y 9
+end
+arch shop_building_west
+x 21
+y 9
+end
+arch shop_empty
+x 21
+y 10
+end
+arch shop_building_west
+x 21
+y 10
+end
+arch shop_empty
+x 21
+y 11
+end
+arch shop_building_west
+x 21
+y 11
+end
+arch shop_empty
+x 21
+y 12
+end
+arch shop_empty
+x 21
+y 13
+end
+arch shop_building_west
+x 21
+y 13
+end
+arch stonefloor2
+x 21
+y 14
+end
+arch westcwall_2_2_2
+x 21
+y 14
+end
+arch stonefloor2
+x 21
+y 15
+end
+arch westcwall_2_1_1
+x 21
+y 15
+end
+arch stonefloor2
+x 21
+y 16
+end
+arch westcwall_2_1_1
+x 21
+y 16
+end
+arch stonefloor2
+x 21
+y 17
+end
 arch westcwall_2_2_4
+x 21
+y 17
+end
+arch grass_only
+x 21
+y 18
+end
+arch grass_only
+x 21
+y 19
+end
+arch river_w-e
+x 21
+y 19
+end
+arch grass_only
+x 22
+end
+arch grass_only
+x 22
+y 1
+end
+arch light2
+x 22
+y 2
+end
+arch stonefloor2
+x 22
+y 2
+end
+arch westcwall_win2
+x 22
+y 2
+end
+arch shop_empty
+x 22
+y 3
+end
+arch shop_building_west
+x 22
+y 3
+end
+arch shop_empty
+x 22
+y 4
+end
+arch light4
+x 22
+y 5
+end
+arch shop_empty
+x 22
+y 5
+end
+arch shop_empty
+x 22
+y 6
+end
+arch shop_empty
+x 22
+y 7
+end
+arch light4
+x 22
+y 8
+end
+arch shop_empty
+x 22
+y 8
+end
+arch shop_empty
+x 22
+y 9
+end
+arch shop_empty
+x 22
+y 10
+end
+arch light4
+x 22
+y 11
+end
+arch shop_empty
+x 22
+y 11
+end
+arch shop_empty
 x 22
 y 12
 end
+arch shop_empty
+x 22
+y 13
+end
+arch shop_building_west
+x 22
+y 13
+end
+arch stonefloor2
+x 22
+y 14
+end
+arch westcwall_2_1_2
+x 22
+y 14
+end
+arch grass_only
+x 22
+y 15
+end
+arch grass_only
+x 22
+y 16
+end
+arch grass_only
+x 22
+y 17
+end
+arch grass_only
+x 22
+y 18
+end
+arch grass_only
+x 22
+y 19
+end
+arch river_w-e
+x 22
+y 19
+end
+arch grass_only
+x 23
+end
+arch grass_only
+x 23
+y 1
+end
+arch stonefloor2
+x 23
+y 2
+end
+arch westcwall_2_1_2
+x 23
+y 2
+end
+arch shop_empty
+x 23
+y 3
+end
+arch shop_building_west
+x 23
+y 3
+end
+arch shop_empty
+x 23
+y 4
+end
+arch shop_building_west
+x 23
+y 4
+end
+arch shop_empty
+x 23
+y 5
+end
+arch shop_building_west
+x 23
+y 5
+end
+arch shop_empty
+x 23
+y 6
+end
+arch shop_building_west
+x 23
+y 6
+end
+arch shop_empty
+x 23
+y 7
+end
+arch shop_building_west
+x 23
+y 7
+end
+arch shop_empty
+x 23
+y 8
+end
+arch shop_building_west
+x 23
+y 8
+end
+arch shop_empty
+x 23
+y 9
+end
+arch shop_building_west
+x 23
+y 9
+end
+arch shop_empty
+x 23
+y 10
+end
+arch shop_building_west
+x 23
+y 10
+end
+arch shop_empty
+x 23
+y 11
+end
+arch shop_building_west
+x 23
+y 11
+end
+arch shop_empty
+x 23
+y 12
+end
+arch shop_building_west
+x 23
+y 12
+end
+arch shop_empty
+x 23
+y 13
+end
+arch shop_building_west
+x 23
+y 13
+end
+arch stonefloor2
+x 23
+y 14
+end
+arch westcwall_2_1_2
+x 23
+y 14
+end
+arch grass_only
+x 23
+y 15
+end
+arch grass_only
+x 23
+y 16
+end
+arch grass_only
+x 23
+y 17
+end
+arch grass_only
+x 23
+y 18
+end
+arch grass_only
+x 23
+y 19
+end
+arch river_w-e
+x 23
+y 19
+end
+arch grass_only
+x 24
+end
+arch grass_only
+x 24
+y 1
+end
+arch stonefloor2
+x 24
+y 2
+end
+arch westcwall_2_2_3
+x 24
+y 2
+end
+arch stonefloor2
+x 24
+y 3
+end
+arch westcwall_2_1_1
+x 24
+y 3
+end
+arch stonefloor2
+x 24
+y 4
+end
+arch westcwall_2_1_1
+x 24
+y 4
+end
+arch stonefloor2
+x 24
+y 5
+end
+arch westcwall_2_1_1
+x 24
+y 5
+end
+arch stonefloor2
+x 24
+y 6
+end
+arch westcwall_2_1_1
+x 24
+y 6
+end
+arch stonefloor2
+x 24
+y 7
+end
+arch westcwall_2_1_1
+x 24
+y 7
+end
+arch light2
+x 24
+y 8
+end
+arch stonefloor2
+x 24
+y 8
+end
+arch westcwall_win1
+x 24
+y 8
+end
+arch stonefloor2
+x 24
+y 9
+end
+arch westcwall_2_1_1
+x 24
+y 9
+end
+arch stonefloor2
+x 24
+y 10
+end
+arch westcwall_2_1_1
+x 24
+y 10
+end
+arch stonefloor2
+x 24
+y 11
+end
+arch westcwall_2_1_1
+x 24
+y 11
+end
+arch stonefloor2
+x 24
+y 12
+end
+arch westcwall_2_1_1
+x 24
+y 12
+end
+arch stonefloor2
+x 24
+y 13
+end
+arch westcwall_2_1_1
+x 24
+y 13
+end
+arch stonefloor2
+x 24
+y 14
+end
+arch westcwall_2_2_4
+x 24
+y 14
+end
+arch grass_only
+x 24
+y 15
+end
+arch grass_only
+x 24
+y 16
+end
+arch grass_only
+x 24
+y 17
+end
+arch grass_only
+x 24
+y 18
+end
+arch grass_only
+x 24
+y 19
+end
+arch river_w-e
+x 24
+y 19
+end
+arch grass_only
+x 25
+end
+arch grass_only
+x 25
+y 1
+end
+arch grass_only
+x 25
+y 2
+end
+arch grass_only
+x 25
+y 3
+end
+arch grass_only
+x 25
+y 4
+end
+arch grass_only
+x 25
+y 5
+end
+arch grass_only
+x 25
+y 6
+end
+arch grass_only
+x 25
+y 7
+end
+arch grass_only
+x 25
+y 8
+end
+arch grass_only
+x 25
+y 9
+end
+arch grass_only
+x 25
+y 10
+end
+arch grass_only
+x 25
+y 11
+end
+arch grass_only
+x 25
+y 12
+end
+arch grass_only
+x 25
+y 13
+end
+arch grass_only
+x 25
+y 14
+end
+arch grass_only
+x 25
+y 15
+end
+arch grass_only
+x 25
+y 16
+end
+arch grass_only
+x 25
+y 17
+end
+arch grass_only
+x 25
+y 18
+end
+arch grass_only
+x 25
+y 19
+end
+arch river_w-e
+x 25
+y 19
+end
+arch grass_only
+x 26
+end
+arch grass_only
+x 26
+y 1
+end
+arch grass_only
+x 26
+y 2
+end
+arch grass_only
+x 26
+y 3
+end
+arch grass_only
+x 26
+y 4
+end
+arch grass_only
+x 26
+y 5
+end
+arch grass_only
+x 26
+y 6
+end
+arch grass_only
+x 26
+y 7
+end
+arch grass_only
+x 26
+y 8
+end
+arch grass_only
+x 26
+y 9
+end
+arch grass_only
+x 26
+y 10
+end
+arch grass_only
+x 26
+y 11
+end
+arch grass_only
+x 26
+y 12
+end
+arch grass_only
+x 26
+y 13
+end
+arch grass_only
+x 26
+y 14
+end
+arch grass_only
+x 26
+y 15
+end
+arch grass_only
+x 26
+y 16
+end
+arch grass_only
+x 26
+y 17
+end
+arch grass_only
+x 26
+y 18
+end
+arch grass_only
+x 26
+y 19
+end
+arch river_w-e
+x 26
+y 19
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 7a7d95a6c..a2aa6d8a9 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -5983,8 +5983,8 @@ end
 arch house_larg_west
 name Ye ol' Home Depote
 slaying /navar_city/misc/buildshop
-hp 6
-sp 10
+hp 8
+sp 12
 x 17
 y 4
 end