diff --git a/navar_city/misc/city1weapon b/navar_city/misc/city1weapon
index f077247f9..bade1caa4 100644
--- a/navar_city/misc/city1weapon
+++ b/navar_city/misc/city1weapon
@@ -8,130 +8,1289 @@ shopgreed 1.00000
 shopmin 20
 shopmax 10000
 shoprace human
-width 21
-height 11
+width 25
+height 23
 enter_x 1
 enter_y 2
 msg
 Created:  1993-10-27
-Modified: 2008-12-10 Rick Tanner
+Modified: 2011-04-29 Rick Tanner
 endmsg
+outdoor 1
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch cobblestones2
+y 19
+end
+arch cobblestones2
+y 20
+end
+arch grass_only
+y 21
+end
+arch grass_only
+y 22
+end
+arch cobblestones2
+x 1
+end
+arch cobblestones2
+x 1
+y 1
+end
+arch cobblestones2
+x 1
+y 2
+end
+arch cobblestones2
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 4
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 8
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
+x 1
+y 13
+end
+arch cobblestones2
+x 1
+y 14
+end
+arch cobblestones2
+x 1
+y 15
+end
+arch cobblestones2
+x 1
+y 16
+end
+arch cobblestones2
+x 1
+y 17
+end
+arch cobblestones2
+x 1
+y 18
+end
+arch cobblestones2
+x 1
+y 19
+end
+arch cobblestones2
+x 1
+y 20
+end
+arch grass_only
+x 1
+y 21
+end
+arch grass_only
+x 1
+y 22
+end
+arch cobblestones2
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch stonefloor2
+x 2
+y 2
 end
 arch wwall_2_2_2
-end
-arch flagstone
-name floor
-face shop_empty.111
-y 1
-end
-arch wwall_1_2
-y 1
-end
-arch flagstone
-name floor
-face shop_empty.111
+x 2
 y 2
 end
-arch oakdoor_1
-slaying /world/world_122_117
-hp 16
-sp 8
-y 2
-end
-arch flagstone
-name floor
-face shop_empty.111
+arch stonefloor2
+x 2
 y 3
 end
-arch swall_1_4_half
+arch wwall_2_1_1
+x 2
 y 3
 end
-arch wwall_1_1
-y 3
-end
-arch shop_empty
+arch stonefloor2
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
-arch shop_empty
+arch stonefloor2
+x 2
 y 5
 end
+arch wwall_2_1_1
+x 2
+y 5
+end
+arch stonefloor2
+x 2
+y 6
+end
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch stonefloor2
+x 2
+y 7
+end
 arch swall_1_4_half
-y 5
-end
-arch wwall_2_1_1
-y 5
-end
-arch shop_empty
-y 6
-end
-arch wwall_2_1_1
-y 6
-end
-arch shop_empty
+x 2
 y 7
 end
 arch wwall_2_1_1
+x 2
 y 7
 end
-arch shop_empty
+arch light2
+x 2
 y 8
 end
-arch wwall_2_1_1
+arch stonefloor2
+x 2
 y 8
 end
-arch shop_empty
+arch wwall_win1
+x 2
+y 8
+end
+arch stonefloor2
+x 2
 y 9
 end
 arch wwall_2_1_1
+x 2
 y 9
 end
-arch shop_empty
+arch stonefloor2
+x 2
 y 10
 end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch stonefloor2
+x 2
+y 11
+end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch stonefloor2
+x 2
+y 12
+end
+arch wwall_2_1_1
+x 2
+y 12
+end
+arch stonefloor2
+x 2
+y 13
+end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch stonefloor2
+x 2
+y 14
+end
+arch wwall_2_1_1
+x 2
+y 14
+end
+arch light2
+x 2
+y 15
+end
+arch stonefloor2
+x 2
+y 15
+end
+arch wwall_win1
+x 2
+y 15
+end
+arch stonefloor2
+x 2
+y 16
+end
+arch wwall_2_1_1
+x 2
+y 16
+end
+arch stonefloor2
+x 2
+y 17
+end
+arch wwall_2_1_1
+x 2
+y 17
+end
+arch stonefloor2
+x 2
+y 18
+end
+arch wwall_2_1_1
+x 2
+y 18
+end
+arch stonefloor2
+x 2
+y 19
+end
+arch wwall_2_1_1
+x 2
+y 19
+end
+arch stonefloor2
+x 2
+y 20
+end
 arch wwall_2_2_1
-y 10
+x 2
+y 20
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch grass_only
+x 2
+y 21
 end
-arch wwall_2_1_2
-x 1
+arch grass_only
+x 2
+y 22
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch cobblestones2
+x 3
+end
+arch cobblestones2
+x 3
 y 1
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch stonefloor2
+x 3
 y 2
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch wwall_2_1_2
+x 3
+y 2
+end
+arch light4
+x 3
 y 3
 end
-arch swall_2_1_2
-x 1
+arch shop_weapon
+x 3
+y 3
+end
+arch shop_weapon
+x 3
+y 4
+end
+arch shop_weapon
+x 3
+y 5
+end
+arch shop_weapon
+x 3
+y 6
+end
+arch shop_weapon
+x 3
+y 7
+end
+arch shop_weapon
+x 3
+y 8
+end
+arch shop_weapon
+x 3
+y 9
+end
+arch shop_weapon
+x 3
+y 10
+end
+arch shop_weapon
+x 3
+y 11
+end
+arch shop_weapon
+x 3
+y 12
+end
+arch shop_weapon
+x 3
+y 13
+end
+arch shop_empty
+x 3
+y 14
+end
+arch shop_special
+x 3
+y 15
+end
+arch shop_books
+x 3
+y 16
+end
+arch shop_potions
+x 3
+y 17
+end
+arch shop_amulets
+x 3
+y 18
+end
+arch shop_special
+x 3
+y 19
+end
+arch stonefloor2
+x 3
+y 20
+end
+arch wwall_2_1_2
+x 3
+y 20
+end
+arch grass_only
+x 3
+y 21
+end
+arch grass_only
+x 3
+y 22
+end
+arch cobblestones2
+x 4
+end
+arch cobblestones2
+x 4
+y 1
+end
+arch stonefloor2
+x 4
+y 2
+end
+arch wwall_2_1_2
+x 4
+y 2
+end
+arch shop_weapon
+x 4
 y 3
 end
 arch shop_empty
-x 1
+x 4
 y 4
 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 shop_empty
+x 4
+y 8
+end
+arch shop_empty
+x 4
+y 9
+end
+arch shop_empty
+x 4
+y 10
+end
+arch shop_empty
+x 4
+y 11
+end
+arch shop_empty
+x 4
+y 12
+end
+arch shop_empty
+x 4
+y 13
+end
+arch shop_empty
+x 4
+y 14
+end
+arch shop_armour
+x 4
+y 15
+end
+arch shop_scrolls
+x 4
+y 16
+end
+arch shop_food
+x 4
+y 17
+end
+arch shop_wands
+x 4
+y 18
+end
+arch shop_armour
+x 4
+y 19
+end
+arch stonefloor2
+x 4
+y 20
+end
+arch wwall_2_1_2
+x 4
+y 20
+end
+arch grass_only
+x 4
+y 21
+end
+arch grass_only
+x 4
+y 22
+end
+arch cobblestones2
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch stonefloor2
+x 5
+y 2
+end
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch shop_weapon
+x 5
+y 3
+end
+arch shop_empty
+x 5
+y 4
+end
+arch light4
+x 5
+y 5
+end
+arch shop_weapon
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 6
+end
+arch shop_weapon
+x 5
+y 7
+end
+arch shop_empty
+x 5
+y 8
+end
+arch light4
+x 5
+y 9
+end
+arch shop_weapon
+x 5
+y 9
+end
+arch shop_empty
+x 5
+y 10
+end
+arch shop_weapon
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch light4
+x 5
+y 13
+end
+arch shop_weapon
+x 5
+y 13
+end
+arch shop_empty
+x 5
+y 14
+end
+arch shop_ring
+x 5
+y 15
+end
+arch shop_special
+x 5
+y 16
+end
+arch light4
+x 5
+y 17
+end
+arch shop_food
+x 5
+y 17
+end
+arch shop_ring
+x 5
+y 18
+end
+arch shop_ring
+x 5
+y 19
+end
+arch light2
+x 5
+y 20
+end
+arch stonefloor2
+x 5
+y 20
+end
+arch wwall_win2
+x 5
+y 20
+end
+arch grass_only
+x 5
+y 21
+end
+arch grass_only
+x 5
+y 22
+end
+arch cobblestones2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch light2
+x 6
+y 2
+end
+arch stonefloor2
+x 6
+y 2
+end
+arch wwall_win2
+x 6
+y 2
+end
+arch shop_weapon
+x 6
+y 3
+end
+arch shop_empty
+x 6
+y 4
+end
+arch shop_weapon
+x 6
+y 5
+end
+arch shop_empty
+x 6
+y 6
+end
+arch shop_weapon
+x 6
+y 7
+end
+arch shop_empty
+x 6
+y 8
+end
+arch shop_weapon
+x 6
+y 9
+end
+arch shop_empty
+x 6
+y 10
+end
+arch shop_weapon
+x 6
+y 11
+end
+arch shop_empty
+x 6
+y 12
+end
+arch shop_weapon
+x 6
+y 13
+end
+arch shop_empty
+x 6
+y 14
+end
+arch shop_special
+x 6
+y 15
+end
+arch shop_books
+x 6
+y 16
+end
+arch shop_potions
+x 6
+y 17
+end
+arch shop_amulets
+x 6
+y 18
+end
+arch shop_special
+x 6
+y 19
+end
+arch stonefloor2
+x 6
+y 20
+end
+arch wwall_2_1_2
+x 6
+y 20
+end
+arch grass_only
+x 6
+y 21
+end
+arch grass_only
+x 6
+y 22
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch stonefloor2
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch shop_weapon
+x 7
+y 3
+end
+arch shop_empty
+x 7
+y 4
+end
+arch shop_weapon
+x 7
+y 5
+end
+arch shop_empty
+x 7
+y 6
+end
+arch shop_weapon
+x 7
+y 7
+end
+arch shop_empty
+x 7
+y 8
+end
+arch shop_weapon
+x 7
+y 9
+end
+arch shop_empty
+x 7
+y 10
+end
+arch shop_weapon
+x 7
+y 11
+end
+arch shop_empty
+x 7
+y 12
+end
+arch shop_weapon
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 14
+end
+arch shop_armour
+x 7
+y 15
+end
+arch shop_scrolls
+x 7
+y 16
+end
+arch shop_food
+x 7
+y 17
+end
+arch shop_wands
+x 7
+y 18
+end
+arch shop_armour
+x 7
+y 19
+end
+arch stonefloor2
+x 7
+y 20
+end
+arch wwall_2_1_2
+x 7
+y 20
+end
+arch grass_only
+x 7
+y 21
+end
+arch grass_only
+x 7
+y 22
+end
+arch cobblestones2
+x 8
+end
+arch cobblestones2
+x 8
+y 1
+end
+arch stonefloor2
+x 8
+y 2
+end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch shop_weapon
+x 8
+y 3
+end
+arch shop_empty
+x 8
+y 4
+end
+arch shop_weapon
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch shop_weapon
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 8
+end
+arch shop_weapon
+x 8
+y 9
+end
+arch shop_empty
+x 8
+y 10
+end
+arch shop_weapon
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 12
+end
+arch shop_weapon
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 14
+end
+arch shop_ring
+x 8
+y 15
+end
+arch shop_special
+x 8
+y 16
+end
+arch light4
+x 8
+y 17
+end
+arch shop_food
+x 8
+y 17
+end
+arch shop_ring
+x 8
+y 18
+end
+arch shop_ring
+x 8
+y 19
+end
+arch stonefloor2
+x 8
+y 20
+end
+arch wwall_2_1_2
+x 8
+y 20
+end
+arch grass_only
+x 8
+y 21
+end
+arch grass_only
+x 8
+y 22
+end
+arch cobblestones2
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch stonefloor2
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch light4
+x 9
+y 3
+end
+arch shop_weapon
+x 9
+y 3
+end
+arch shop_empty
+x 9
+y 4
+end
+arch shop_weapon
+x 9
+y 5
+end
+arch shop_empty
+x 9
+y 6
+end
+arch shop_weapon
+x 9
+y 7
+end
+arch shop_empty
+x 9
+y 8
+end
+arch shop_weapon
+x 9
+y 9
+end
+arch shop_empty
+x 9
+y 10
+end
+arch shop_weapon
+x 9
+y 11
+end
+arch shop_empty
+x 9
+y 12
+end
+arch shop_weapon
+x 9
+y 13
+end
+arch shop_empty
+x 9
+y 14
+end
+arch shop_empty
+x 9
+y 15
+end
+arch shop_empty
+x 9
+y 16
+end
+arch shop_empty
+x 9
+y 17
+end
+arch shop_empty
+x 9
+y 18
+end
+arch shop_empty
+x 9
+y 19
+end
+arch stonefloor2
+x 9
+y 20
+end
+arch wwall_2_1_2
+x 9
+y 20
+end
+arch grass_only
+x 9
+y 21
+end
+arch grass_only
+x 9
+y 22
+end
+arch cobblestones2
+x 10
+end
+arch cobblestones2
+x 10
+y 1
+end
+arch stonefloor2
+x 10
+y 2
+end
+arch wwall_2_1_2
+x 10
+y 2
+end
+arch shop_weapon
+x 10
+y 3
+end
+arch shop_empty
+x 10
+y 4
+end
+arch shop_weapon
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
+arch shop_weapon
+x 10
+y 7
+end
+arch shop_empty
+x 10
+y 8
+end
+arch shop_weapon
+x 10
+y 9
+end
+arch shop_empty
+x 10
+y 10
+end
+arch shop_weapon
+x 10
+y 11
+end
+arch shop_empty
+x 10
+y 12
+end
+arch shop_weapon
+x 10
+y 13
+end
+arch shop_empty
+x 10
+y 14
+end
+arch stonefloor2
+x 10
+y 15
+end
+arch swall_2_2_2
+x 10
+y 15
+end
+arch stonefloor2
+x 10
+y 16
+end
+arch swall_2_1_1
+x 10
+y 16
+end
+arch stonefloor2
+x 10
+y 17
+end
+arch swall_2_1_1
+x 10
+y 17
+end
+arch stonefloor2
+x 10
+y 18
+end
+arch swall_2_1_1
+x 10
+y 18
+end
+arch stonefloor2
+x 10
+y 19
+end
+arch swall_2_1_1
+x 10
+y 19
+end
+arch stonefloor2
+x 10
+y 20
+end
+arch swall_1_2_half
+x 10
+y 20
+end
+arch wwall_2_1_2
+x 10
+y 20
+end
+arch grass_only
+x 10
+y 21
+end
+arch grass_only
+x 10
+y 22
+end
+arch cobblestones2
+x 11
+end
+arch cobblestones2
+x 11
+y 1
+end
+arch stonefloor2
+x 11
+y 2
+end
+arch wwall_2_1_2
+x 11
+y 2
+end
+arch shop_weapon
+x 11
+y 3
+end
+arch shop_empty
+x 11
+y 4
+end
+arch shop_weapon
+x 11
+y 5
+end
+arch shop_empty
+x 11
+y 6
+end
+arch shop_weapon
+x 11
+y 7
+end
+arch shop_empty
+x 11
+y 8
+end
+arch shop_weapon
+x 11
+y 9
+end
+arch shop_empty
+x 11
+y 10
+end
+arch shop_weapon
+x 11
+y 11
+end
+arch shop_empty
+x 11
+y 12
+end
+arch shop_empty
+x 11
+y 13
+end
+arch shop_empty
+x 11
+y 14
+end
+arch stonefloor2
+x 11
+y 15
+end
+arch swall_2_1_2
+x 11
+y 15
+end
+arch stonefloor2
+x 11
+y 16
+end
+arch stonefloor2
+x 11
+y 17
+end
+arch stonefloor2
+x 11
+y 18
+end
 arch smith
 name Red
 msg
@@ -142,760 +1301,471 @@ I don't wanna hear no complainin
 Hello adventure, welcome to my shop, I
 do have some weapons around
 endmsg
-x 1
-y 4
+x 11
+y 18
+end
+arch button_small
+x 11
+y 19
+connected 1
+end
+arch stonefloor2
+x 11
+y 19
+end
+arch stonefloor2
+x 11
+y 20
+end
+arch wwall_1_3
+x 11
+y 20
+end
+arch dungeon_magic
+x 11
+y 21
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 8
+x 11
+y 21
+end
+arch grass_only
+x 11
+y 21
+end
+arch grass_only
+x 11
+y 22
+end
+arch cobblestones2
+x 12
+end
+arch cobblestones2
+x 12
+y 1
+end
+arch light2
+x 12
+y 2
+end
+arch stonefloor2
+x 12
+y 2
+end
+arch wwall_win2
+x 12
+y 2
+end
+arch shop_weapon
+x 12
+y 3
 end
 arch shop_empty
-x 1
+x 12
+y 4
+end
+arch light4
+x 12
 y 5
 end
-arch swall_2_1_2
-x 1
+arch shop_weapon
+x 12
 y 5
 end
-arch shop_potions
-x 1
+arch shop_empty
+x 12
 y 6
 end
-arch shop_amulets
-x 1
+arch light4
+x 12
 y 7
 end
-arch shop_special
-x 1
+arch shop_weapon
+x 12
+y 7
+end
+arch shop_empty
+x 12
 y 8
 end
-arch shop_books
-x 1
+arch light4
+x 12
+y 9
+end
+arch shop_weapon
+x 12
 y 9
 end
 arch shop_empty
-x 1
+x 12
 y 10
 end
-arch wwall_2_1_2
-x 1
-y 10
+arch light4
+x 12
+y 11
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
+arch shop_weapon
+x 12
+y 11
 end
-arch wwall_2_1_2
-x 2
+arch shop_empty
+x 12
+y 12
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 1
+arch shop_empty
+x 12
+y 13
+end
+arch light4
+x 12
+y 14
+end
+arch shop_empty
+x 12
+y 14
+end
+arch shop_mat
+x 12
+y 14
+end
+arch stonefloor2
+x 12
+y 15
+end
+arch swall_2_1_2
+x 12
+y 15
+end
+arch stonefloor2
+x 12
+y 16
+end
+arch shop_mat
+x 12
+y 16
+end
+arch stonefloor2
+x 12
+y 17
 end
 arch menu
-x 2
+x 12
+y 17
+end
+arch light4
+x 12
+y 18
+end
+arch stonefloor2
+x 12
+y 18
+end
+arch button_small
+x 12
+y 19
+connected 1
+end
+arch stonefloor2
+x 12
+y 19
+end
+arch button_small
+x 12
+y 20
+connected 1
+end
+arch stonefloor2
+x 12
+y 20
+end
+arch odoorn2_closed_1
+x 12
+y 20
+connected 1
+end
+arch dungeon_magic
+x 12
+y 21
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 8
+x 12
+y 21
+end
+arch grass_only
+x 12
+y 21
+end
+arch grass_only
+x 12
+y 22
+end
+arch cobblestones2
+x 13
+end
+arch cobblestones2
+x 13
 y 1
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
+arch stonefloor2
+x 13
 y 2
 end
-arch shop_mat
-x 2
+arch wwall_2_1_2
+x 13
 y 2
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
+arch shop_weapon
+x 13
 y 3
 end
+arch shop_empty
+x 13
+y 4
+end
+arch shop_weapon
+x 13
+y 5
+end
+arch shop_empty
+x 13
+y 6
+end
+arch shop_weapon
+x 13
+y 7
+end
+arch shop_empty
+x 13
+y 8
+end
+arch shop_weapon
+x 13
+y 9
+end
+arch shop_empty
+x 13
+y 10
+end
+arch shop_weapon
+x 13
+y 11
+end
+arch shop_empty
+x 13
+y 12
+end
+arch shop_empty
+x 13
+y 13
+end
+arch shop_empty
+x 13
+y 14
+end
+arch stonefloor2
+x 13
+y 15
+end
 arch swall_2_1_2
-x 2
+x 13
+y 15
+end
+arch stonefloor2
+x 13
+y 16
+end
+arch stonefloor2
+x 13
+y 17
+end
+arch stonefloor2
+x 13
+y 18
+end
+arch button_small
+x 13
+y 19
+connected 1
+end
+arch stonefloor2
+x 13
+y 19
+end
+arch stonefloor2
+x 13
+y 20
+end
+arch wwall_1_4
+x 13
+y 20
+end
+arch dungeon_magic
+x 13
+y 21
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 8
+x 13
+y 21
+end
+arch grass_only
+x 13
+y 21
+end
+arch grass_only
+x 13
+y 22
+end
+arch cobblestones2
+x 14
+end
+arch cobblestones2
+x 14
+y 1
+end
+arch stonefloor2
+x 14
+y 2
+end
+arch wwall_2_1_2
+x 14
+y 2
+end
+arch shop_weapon
+x 14
 y 3
 end
 arch shop_empty
-x 2
+x 14
 y 4
 end
+arch shop_weapon
+x 14
+y 5
+end
 arch shop_empty
-x 2
-y 5
-end
-arch swall_2_1_2
-x 2
-y 5
-end
-arch shop_food
-x 2
+x 14
 y 6
 end
-arch shop_wands
-x 2
+arch shop_weapon
+x 14
 y 7
 end
-arch shop_armour
-x 2
+arch shop_empty
+x 14
 y 8
 end
-arch shop_scrolls
-x 2
+arch shop_weapon
+x 14
 y 9
 end
 arch shop_empty
-x 2
+x 14
 y 10
 end
-arch wwall_2_1_2
-x 2
-y 10
+arch shop_weapon
+x 14
+y 11
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
+arch shop_empty
+x 14
+y 12
 end
-arch wwall_2_1_2
-x 3
+arch shop_weapon
+x 14
+y 13
 end
-arch swall_1_1_half
-x 3
+arch shop_empty
+x 14
+y 14
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 1
+arch stonefloor2
+x 14
+y 15
+end
+arch swall_2_2_3
+x 14
+y 15
+end
+arch stonefloor2
+x 14
+y 16
 end
 arch swall_2_1_1
-x 3
-y 1
+x 14
+y 16
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 2
+arch stonefloor2
+x 14
+y 17
 end
 arch swall_2_1_1
-x 3
-y 2
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 3
-end
-arch swall_2_2_4
-x 3
-y 3
-end
-arch shop_empty
-x 3
-y 4
-end
-arch shop_empty
-x 3
-y 5
-end
-arch swall_1_3
-x 3
-y 5
-end
-arch shop_food
-x 3
-y 6
-end
-arch shop_ring
-x 3
-y 7
-end
-arch shop_ring
-x 3
-y 8
-end
-arch shop_special
-x 3
-y 9
-end
-arch shop_empty
-x 3
-y 10
-end
-arch wwall_2_1_2
-x 3
-y 10
-end
-arch shop_empty
-x 4
-end
-arch wwall_2_1_2
-x 4
-end
-arch shop_empty
-x 4
-y 1
-end
-arch shop_empty
-x 4
-y 2
-end
-arch shop_mat
-x 4
-y 2
-end
-arch shop_empty
-x 4
-y 3
-end
-arch shop_empty
-x 4
-y 4
-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 shop_empty
-x 4
-y 8
-end
-arch shop_special
-x 4
-y 9
-end
-arch shop_empty
-x 4
-y 10
-end
-arch wwall_2_1_2
-x 4
-y 10
-end
-arch shop_empty
-x 5
-end
-arch wwall_2_1_2
-x 5
-end
-arch shop_empty
-x 5
-y 1
-end
-arch shop_empty
-x 5
-y 2
-end
-arch shop_empty
-x 5
-y 3
-end
-arch shop_empty
-x 5
-y 4
-end
-arch shop_weapon
-x 5
-y 5
-end
-arch shop_empty
-x 5
-y 6
-end
-arch shop_weapon
-x 5
-y 7
-end
-arch shop_empty
-x 5
-y 8
-end
-arch shop_weapon
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 10
-end
-arch wwall_2_1_2
-x 5
-y 10
-end
-arch shop_empty
-x 6
-end
-arch wwall_2_1_2
-x 6
-end
-arch shop_weapon
-x 6
-y 1
-end
-arch shop_empty
-x 6
-y 2
-end
-arch shop_weapon
-x 6
-y 3
-end
-arch shop_empty
-x 6
-y 4
-end
-arch shop_weapon
-x 6
-y 5
-end
-arch shop_empty
-x 6
-y 6
-end
-arch shop_weapon
-x 6
-y 7
-end
-arch shop_empty
-x 6
-y 8
-end
-arch shop_weapon
-x 6
-y 9
-end
-arch shop_empty
-x 6
-y 10
-end
-arch wwall_2_1_2
-x 6
-y 10
-end
-arch shop_empty
-x 7
-end
-arch wwall_2_1_2
-x 7
-end
-arch shop_weapon
-x 7
-y 1
-end
-arch shop_empty
-x 7
-y 2
-end
-arch shop_weapon
-x 7
-y 3
-end
-arch shop_empty
-x 7
-y 4
-end
-arch shop_weapon
-x 7
-y 5
-end
-arch shop_empty
-x 7
-y 6
-end
-arch shop_weapon
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 8
-end
-arch shop_weapon
-x 7
-y 9
-end
-arch shop_empty
-x 7
-y 10
-end
-arch wwall_2_1_2
-x 7
-y 10
-end
-arch shop_empty
-x 8
-end
-arch wwall_2_1_2
-x 8
-end
-arch shop_weapon
-x 8
-y 1
-end
-arch shop_empty
-x 8
-y 2
-end
-arch shop_weapon
-x 8
-y 3
-end
-arch shop_empty
-x 8
-y 4
-end
-arch shop_weapon
-x 8
-y 5
-end
-arch shop_empty
-x 8
-y 6
-end
-arch shop_weapon
-x 8
-y 7
-end
-arch shop_empty
-x 8
-y 8
-end
-arch shop_weapon
-x 8
-y 9
-end
-arch shop_empty
-x 8
-y 10
-end
-arch wwall_2_1_2
-x 8
-y 10
-end
-arch shop_empty
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch shop_weapon
-x 9
-y 1
-end
-arch shop_empty
-x 9
-y 2
-end
-arch shop_weapon
-x 9
-y 3
-end
-arch shop_empty
-x 9
-y 4
-end
-arch shop_weapon
-x 9
-y 5
-end
-arch shop_empty
-x 9
-y 6
-end
-arch shop_weapon
-x 9
-y 7
-end
-arch shop_empty
-x 9
-y 8
-end
-arch shop_weapon
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 10
-end
-arch wwall_2_1_2
-x 9
-y 10
-end
-arch shop_empty
-x 10
-end
-arch wwall_2_1_2
-x 10
-end
-arch shop_weapon
-x 10
-y 1
-end
-arch shop_empty
-x 10
-y 2
-end
-arch shop_weapon
-x 10
-y 3
-end
-arch shop_empty
-x 10
-y 4
-end
-arch shop_weapon
-x 10
-y 5
-end
-arch shop_empty
-x 10
-y 6
-end
-arch shop_weapon
-x 10
-y 7
-end
-arch shop_empty
-x 10
-y 8
-end
-arch shop_weapon
-x 10
-y 9
-end
-arch shop_empty
-x 10
-y 10
-end
-arch wwall_2_1_2
-x 10
-y 10
-end
-arch shop_empty
-x 11
-end
-arch wwall_2_1_2
-x 11
-end
-arch shop_weapon
-x 11
-y 1
-end
-arch shop_empty
-x 11
-y 2
-end
-arch shop_weapon
-x 11
-y 3
-end
-arch shop_empty
-x 11
-y 4
-end
-arch shop_weapon
-x 11
-y 5
-end
-arch shop_empty
-x 11
-y 6
-end
-arch shop_weapon
-x 11
-y 7
-end
-arch shop_empty
-x 11
-y 8
-end
-arch shop_weapon
-x 11
-y 9
-end
-arch shop_empty
-x 11
-y 10
-end
-arch wwall_2_1_2
-x 11
-y 10
-end
-arch shop_empty
-x 12
-end
-arch wwall_2_1_2
-x 12
-end
-arch shop_weapon
-x 12
-y 1
-end
-arch shop_empty
-x 12
-y 2
-end
-arch shop_weapon
-x 12
-y 3
-end
-arch shop_empty
-x 12
-y 4
-end
-arch shop_weapon
-x 12
-y 5
-end
-arch shop_empty
-x 12
-y 6
-end
-arch shop_weapon
-x 12
-y 7
-end
-arch shop_empty
-x 12
-y 8
-end
-arch shop_weapon
-x 12
-y 9
-end
-arch shop_empty
-x 12
-y 10
-end
-arch wwall_2_1_2
-x 12
-y 10
-end
-arch shop_empty
-x 13
-end
-arch wwall_2_1_2
-x 13
-end
-arch shop_weapon
-x 13
-y 1
-end
-arch shop_empty
-x 13
-y 2
-end
-arch shop_weapon
-x 13
-y 3
-end
-arch shop_empty
-x 13
-y 4
-end
-arch shop_weapon
-x 13
-y 5
-end
-arch shop_empty
-x 13
-y 6
-end
-arch shop_weapon
-x 13
-y 7
-end
-arch shop_empty
-x 13
-y 8
-end
-arch shop_weapon
-x 13
-y 9
-end
-arch shop_empty
-x 13
-y 10
-end
-arch wwall_2_1_2
-x 13
-y 10
-end
-arch shop_empty
 x 14
+y 17
+end
+arch stonefloor2
+x 14
+y 18
+end
+arch swall_2_1_1
+x 14
+y 18
+end
+arch stonefloor2
+x 14
+y 19
+end
+arch swall_2_1_1
+x 14
+y 19
+end
+arch stonefloor2
+x 14
+y 20
+end
+arch swall_1_2_half
+x 14
+y 20
 end
 arch wwall_2_1_2
 x 14
+y 20
 end
-arch shop_weapon
+arch grass_only
 x 14
-y 1
+y 21
 end
-arch shop_empty
+arch grass_only
 x 14
-y 2
+y 22
 end
-arch shop_weapon
-x 14
-y 3
-end
-arch shop_empty
-x 14
-y 4
-end
-arch shop_weapon
-x 14
-y 5
-end
-arch shop_empty
-x 14
-y 6
-end
-arch shop_weapon
-x 14
-y 7
-end
-arch shop_empty
-x 14
-y 8
-end
-arch shop_weapon
-x 14
-y 9
-end
-arch shop_empty
-x 14
-y 10
-end
-arch wwall_2_1_2
-x 14
-y 10
-end
-arch shop_empty
+arch cobblestones2
 x 15
 end
-arch wwall_2_1_2
-x 15
-end
-arch shop_weapon
+arch cobblestones2
 x 15
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 15
 y 2
 end
+arch wwall_2_1_2
+x 15
+y 2
+end
+arch light4
+x 15
+y 3
+end
 arch shop_weapon
 x 15
 y 3
@@ -928,21 +1798,70 @@ arch shop_empty
 x 15
 y 10
 end
-arch wwall_2_1_2
+arch shop_weapon
 x 15
-y 10
+y 11
 end
 arch shop_empty
+x 15
+y 12
+end
+arch shop_weapon
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 14
+end
+arch shop_empty
+x 15
+y 15
+end
+arch shop_empty
+x 15
+y 16
+end
+arch shop_empty
+x 15
+y 17
+end
+arch shop_empty
+x 15
+y 18
+end
+arch shop_empty
+x 15
+y 19
+end
+arch stonefloor2
+x 15
+y 20
+end
+arch wwall_2_1_2
+x 15
+y 20
+end
+arch grass_only
+x 15
+y 21
+end
+arch grass_only
+x 15
+y 22
+end
+arch cobblestones2
 x 16
 end
-arch wwall_2_1_2
-x 16
-end
-arch shop_weapon
+arch cobblestones2
 x 16
 y 1
 end
-arch shop_empty
+arch stonefloor2
+x 16
+y 2
+end
+arch wwall_2_1_2
 x 16
 y 2
 end
@@ -978,21 +1897,74 @@ arch shop_empty
 x 16
 y 10
 end
+arch shop_weapon
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 12
+end
+arch shop_weapon
+x 16
+y 13
+end
+arch shop_empty
+x 16
+y 14
+end
+arch shop_weapon
+x 16
+y 15
+end
+arch shop_empty
+x 16
+y 16
+end
+arch light4
+x 16
+y 17
+end
+arch shop_weapon
+x 16
+y 17
+end
+arch shop_empty
+x 16
+y 18
+end
+arch shop_weapon
+x 16
+y 19
+end
+arch stonefloor2
+x 16
+y 20
+end
 arch wwall_2_1_2
 x 16
-y 10
+y 20
 end
-arch shop_empty
+arch grass_only
+x 16
+y 21
+end
+arch grass_only
+x 16
+y 22
+end
+arch cobblestones2
 x 17
 end
-arch wwall_2_1_2
-x 17
-end
-arch shop_weapon
+arch cobblestones2
 x 17
 y 1
 end
-arch shop_empty
+arch stonefloor2
+x 17
+y 2
+end
+arch wwall_2_1_2
 x 17
 y 2
 end
@@ -1028,25 +2000,78 @@ arch shop_empty
 x 17
 y 10
 end
+arch shop_weapon
+x 17
+y 11
+end
+arch shop_empty
+x 17
+y 12
+end
+arch shop_weapon
+x 17
+y 13
+end
+arch shop_empty
+x 17
+y 14
+end
+arch shop_weapon
+x 17
+y 15
+end
+arch shop_empty
+x 17
+y 16
+end
+arch shop_weapon
+x 17
+y 17
+end
+arch shop_empty
+x 17
+y 18
+end
+arch shop_weapon
+x 17
+y 19
+end
+arch stonefloor2
+x 17
+y 20
+end
 arch wwall_2_1_2
 x 17
-y 10
+y 20
 end
-arch shop_empty
+arch grass_only
+x 17
+y 21
+end
+arch grass_only
+x 17
+y 22
+end
+arch cobblestones2
 x 18
 end
-arch wwall_2_1_2
-x 18
-end
-arch shop_weapon
+arch cobblestones2
 x 18
 y 1
 end
-arch shop_empty
+arch light2
 x 18
 y 2
 end
-arch shop_empty
+arch stonefloor2
+x 18
+y 2
+end
+arch wwall_win2
+x 18
+y 2
+end
+arch shop_weapon
 x 18
 y 3
 end
@@ -1078,21 +2103,70 @@ arch shop_empty
 x 18
 y 10
 end
-arch wwall_2_1_2
+arch shop_weapon
 x 18
-y 10
+y 11
 end
 arch shop_empty
-x 19
-end
-arch wwall_2_1_2
-x 19
+x 18
+y 12
 end
 arch shop_weapon
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 14
+end
+arch shop_weapon
+x 18
+y 15
+end
+arch shop_empty
+x 18
+y 16
+end
+arch shop_weapon
+x 18
+y 17
+end
+arch shop_empty
+x 18
+y 18
+end
+arch shop_weapon
+x 18
+y 19
+end
+arch stonefloor2
+x 18
+y 20
+end
+arch wwall_2_1_2
+x 18
+y 20
+end
+arch grass_only
+x 18
+y 21
+end
+arch grass_only
+x 18
+y 22
+end
+arch cobblestones2
+x 19
+end
+arch cobblestones2
 x 19
 y 1
 end
-arch shop_weapon
+arch stonefloor2
+x 19
+y 2
+end
+arch wwall_2_1_2
 x 19
 y 2
 end
@@ -1100,15 +2174,19 @@ arch shop_weapon
 x 19
 y 3
 end
-arch shop_weapon
+arch shop_empty
 x 19
 y 4
 end
+arch light4
+x 19
+y 5
+end
 arch shop_weapon
 x 19
 y 5
 end
-arch shop_weapon
+arch shop_empty
 x 19
 y 6
 end
@@ -1116,10 +2194,14 @@ arch shop_weapon
 x 19
 y 7
 end
-arch shop_weapon
+arch shop_empty
 x 19
 y 8
 end
+arch light4
+x 19
+y 9
+end
 arch shop_weapon
 x 19
 y 9
@@ -1128,93 +2210,626 @@ arch shop_empty
 x 19
 y 10
 end
-arch wwall_2_1_2
+arch shop_weapon
 x 19
+y 11
+end
+arch shop_empty
+x 19
+y 12
+end
+arch light4
+x 19
+y 13
+end
+arch shop_weapon
+x 19
+y 13
+end
+arch shop_empty
+x 19
+y 14
+end
+arch shop_weapon
+x 19
+y 15
+end
+arch shop_empty
+x 19
+y 16
+end
+arch shop_weapon
+x 19
+y 17
+end
+arch shop_empty
+x 19
+y 18
+end
+arch shop_weapon
+x 19
+y 19
+end
+arch light2
+x 19
+y 20
+end
+arch stonefloor2
+x 19
+y 20
+end
+arch wwall_win2
+x 19
+y 20
+end
+arch grass_only
+x 19
+y 21
+end
+arch grass_only
+x 19
+y 22
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch stonefloor2
+x 20
+y 2
+end
+arch wwall_2_1_2
+x 20
+y 2
+end
+arch shop_weapon
+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_empty
+x 20
+y 12
+end
+arch shop_empty
+x 20
+y 13
+end
+arch shop_empty
+x 20
+y 14
+end
+arch shop_weapon
+x 20
+y 15
+end
+arch shop_empty
+x 20
+y 16
+end
+arch light4
+x 20
+y 17
+end
+arch shop_weapon
+x 20
+y 17
+end
+arch shop_empty
+x 20
+y 18
+end
+arch shop_weapon
+x 20
+y 19
+end
+arch stonefloor2
+x 20
+y 20
+end
+arch wwall_2_1_2
+x 20
+y 20
+end
+arch grass_only
+x 20
+y 21
+end
+arch grass_only
+x 20
+y 22
+end
+arch cobblestones2
+x 21
+end
+arch cobblestones2
+x 21
+y 1
+end
+arch stonefloor2
+x 21
+y 2
+end
+arch wwall_2_1_2
+x 21
+y 2
+end
+arch light4
+x 21
+y 3
+end
+arch shop_weapon
+x 21
+y 3
+end
+arch shop_weapon
+x 21
+y 4
+end
+arch shop_weapon
+x 21
+y 5
+end
+arch shop_weapon
+x 21
+y 6
+end
+arch shop_weapon
+x 21
+y 7
+end
+arch shop_weapon
+x 21
+y 8
+end
+arch shop_weapon
+x 21
+y 9
+end
+arch shop_weapon
+x 21
+y 10
+end
+arch shop_weapon
+x 21
+y 11
+end
+arch shop_weapon
+x 21
+y 12
+end
+arch shop_weapon
+x 21
+y 13
+end
+arch shop_weapon
+x 21
+y 14
+end
+arch shop_weapon
+x 21
+y 15
+end
+arch shop_weapon
+x 21
+y 16
+end
+arch shop_weapon
+x 21
+y 17
+end
+arch shop_weapon
+x 21
+y 18
+end
+arch shop_weapon
+x 21
+y 19
+end
+arch stonefloor2
+x 21
+y 20
+end
+arch wwall_2_1_2
+x 21
+y 20
+end
+arch grass_only
+x 21
+y 21
+end
+arch grass_only
+x 21
+y 22
+end
+arch cobblestones2
+x 22
+end
+arch cobblestones2
+x 22
+y 1
+end
+arch stonefloor2
+x 22
+y 2
 end
 arch wwall_2_2_3
-x 20
-end
-arch shop_empty
-x 20
-y 1
-end
-arch wwall_2_1_1
-x 20
-y 1
-end
-arch shop_empty
-x 20
+x 22
 y 2
 end
-arch wwall_2_1_1
-x 20
-y 2
-end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 3
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 3
 end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 4
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 4
 end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 5
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 5
 end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 6
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 6
 end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 7
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 7
 end
-arch shop_empty
-x 20
+arch light2
+x 22
 y 8
 end
-arch wwall_2_1_1
-x 20
+arch stonefloor2
+x 22
 y 8
 end
-arch shop_empty
-x 20
+arch wwall_win1
+x 22
+y 8
+end
+arch stonefloor2
+x 22
 y 9
 end
 arch wwall_2_1_1
-x 20
+x 22
 y 9
 end
-arch shop_empty
-x 20
+arch stonefloor2
+x 22
 y 10
 end
+arch wwall_2_1_1
+x 22
+y 10
+end
+arch stonefloor2
+x 22
+y 11
+end
+arch wwall_2_1_1
+x 22
+y 11
+end
+arch stonefloor2
+x 22
+y 12
+end
+arch wwall_2_1_1
+x 22
+y 12
+end
+arch stonefloor2
+x 22
+y 13
+end
+arch wwall_2_1_1
+x 22
+y 13
+end
+arch stonefloor2
+x 22
+y 14
+end
+arch wwall_2_1_1
+x 22
+y 14
+end
+arch light2
+x 22
+y 15
+end
+arch stonefloor2
+x 22
+y 15
+end
+arch wwall_win1
+x 22
+y 15
+end
+arch stonefloor2
+x 22
+y 16
+end
+arch wwall_2_1_1
+x 22
+y 16
+end
+arch stonefloor2
+x 22
+y 17
+end
+arch wwall_2_1_1
+x 22
+y 17
+end
+arch stonefloor2
+x 22
+y 18
+end
+arch wwall_2_1_1
+x 22
+y 18
+end
+arch stonefloor2
+x 22
+y 19
+end
+arch wwall_2_1_1
+x 22
+y 19
+end
+arch stonefloor2
+x 22
+y 20
+end
 arch wwall_2_2_4
-x 20
+x 22
+y 20
+end
+arch grass_only
+x 22
+y 21
+end
+arch grass_only
+x 22
+y 22
+end
+arch cobblestones2
+x 23
+end
+arch cobblestones2
+x 23
+y 1
+end
+arch cobblestones2
+x 23
+y 2
+end
+arch cobblestones2
+x 23
+y 3
+end
+arch cobblestones2
+x 23
+y 4
+end
+arch cobblestones2
+x 23
+y 5
+end
+arch cobblestones2
+x 23
+y 6
+end
+arch cobblestones2
+x 23
+y 7
+end
+arch cobblestones2
+x 23
+y 8
+end
+arch cobblestones2
+x 23
+y 9
+end
+arch cobblestones2
+x 23
 y 10
 end
+arch cobblestones2
+x 23
+y 11
+end
+arch cobblestones2
+x 23
+y 12
+end
+arch cobblestones2
+x 23
+y 13
+end
+arch cobblestones2
+x 23
+y 14
+end
+arch cobblestones2
+x 23
+y 15
+end
+arch cobblestones2
+x 23
+y 16
+end
+arch cobblestones2
+x 23
+y 17
+end
+arch cobblestones2
+x 23
+y 18
+end
+arch cobblestones2
+x 23
+y 19
+end
+arch cobblestones2
+x 23
+y 20
+end
+arch grass_only
+x 23
+y 21
+end
+arch grass_only
+x 23
+y 22
+end
+arch cobblestones2
+x 24
+end
+arch cobblestones2
+x 24
+y 1
+end
+arch cobblestones2
+x 24
+y 2
+end
+arch cobblestones2
+x 24
+y 3
+end
+arch cobblestones2
+x 24
+y 4
+end
+arch cobblestones2
+x 24
+y 5
+end
+arch cobblestones2
+x 24
+y 6
+end
+arch cobblestones2
+x 24
+y 7
+end
+arch cobblestones2
+x 24
+y 8
+end
+arch cobblestones2
+x 24
+y 9
+end
+arch cobblestones2
+x 24
+y 10
+end
+arch cobblestones2
+x 24
+y 11
+end
+arch cobblestones2
+x 24
+y 12
+end
+arch cobblestones2
+x 24
+y 13
+end
+arch cobblestones2
+x 24
+y 14
+end
+arch cobblestones2
+x 24
+y 15
+end
+arch cobblestones2
+x 24
+y 16
+end
+arch cobblestones2
+x 24
+y 17
+end
+arch cobblestones2
+x 24
+y 18
+end
+arch cobblestones2
+x 24
+y 19
+end
+arch cobblestones2
+x 24
+y 20
+end
+arch grass_only
+x 24
+y 21
+end
+arch grass_only
+x 24
+y 22
+end
diff --git a/world/world_122_117 b/world/world_122_117
index e7bec0a68..c07ffeec0 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2011-04-25 Rick Tanner
+Modified: 2011-04-29 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -5656,8 +5656,8 @@ end
 arch store_weapons
 name Red's Weapons Bazzar
 slaying /navar_city/misc/city1weapon
-hp 1
-sp 2
+hp 12
+sp 18
 x 16
 y 7
 end