diff --git a/navar_city/shops/light_shop b/navar_city/shops/light_shop
new file mode 100644
index 000000000..d046eace7
--- /dev/null
+++ b/navar_city/shops/light_shop
@@ -0,0 +1,2122 @@
+arch map
+name Moro's Lamp Shop
+difficulty 3
+region navar
+shopitems shopitems lamp:95;*:-40
+shopmax 2000
+width 21
+height 21
+enter_x 4
+enter_y 16
+msg
+Created:  2022-04-30 Rick Tanner
+Modified: 2022-04-30 Rick Tanner
+endmsg
+end
+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 cobblestones2
+y 20
+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 cobblestones2
+x 1
+y 20
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch flagstone
+x 2
+y 2
+end
+arch wwall_2_2_2
+x 2
+y 2
+end
+arch flagstone
+x 2
+y 3
+end
+arch wwall_2_1_1
+x 2
+y 3
+end
+arch flagstone
+x 2
+y 4
+end
+arch wwall_2_1_1
+x 2
+y 4
+end
+arch flagstone
+x 2
+y 5
+end
+arch wwall_2_1_1
+x 2
+y 5
+end
+arch flagstone
+x 2
+y 6
+end
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 7
+end
+arch wwall_2_1_1
+x 2
+y 7
+end
+arch flagstone
+x 2
+y 8
+end
+arch wwall_2_1_1
+x 2
+y 8
+end
+arch flagstone
+x 2
+y 9
+end
+arch wwall_win1
+x 2
+y 9
+end
+arch flagstone
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 11
+end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch flagstone
+x 2
+y 12
+end
+arch wwall_2_1_1
+x 2
+y 12
+end
+arch flagstone
+x 2
+y 13
+end
+arch swall_1_4_half
+x 2
+y 13
+end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch flagstone
+x 2
+y 14
+end
+arch wwall_2_1_1
+x 2
+y 14
+end
+arch flagstone
+x 2
+y 15
+end
+arch wwall_2_1_1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch wwall_2_1_1
+x 2
+y 16
+end
+arch flagstone
+x 2
+y 17
+end
+arch wwall_2_1_1
+x 2
+y 17
+end
+arch flagstone
+x 2
+y 18
+end
+arch wwall_2_2_1
+x 2
+y 18
+end
+arch dungeon_magic
+x 2
+y 19
+end
+arch grass_only
+x 2
+y 19
+move_block all
+end
+arch dungeon_magic
+x 2
+y 20
+end
+arch cobblestones2
+x 2
+y 20
+move_block all
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch flagstone
+x 3
+y 2
+end
+arch wwall_2_1_2
+x 3
+y 2
+end
+arch shop_empty
+x 3
+y 3
+end
+arch shop_empty
+x 3
+y 4
+end
+arch shop_empty
+x 3
+y 5
+end
+arch shop_empty
+x 3
+y 6
+end
+arch shop_empty
+x 3
+y 7
+end
+arch shop_empty
+x 3
+y 8
+end
+arch shop_empty
+x 3
+y 9
+end
+arch shop_empty
+x 3
+y 10
+end
+arch shop_empty
+x 3
+y 11
+end
+arch shop_empty
+x 3
+y 12
+end
+arch flagstone
+x 3
+y 13
+end
+arch swall_2_1_2
+x 3
+y 13
+end
+arch flagstone
+x 3
+y 14
+end
+arch flagstone
+x 3
+y 15
+end
+arch flagstone
+x 3
+y 16
+end
+arch button_small
+x 3
+y 17
+connected 1
+end
+arch flagstone
+x 3
+y 17
+end
+arch flagstone
+x 3
+y 18
+end
+arch wwall_1_3
+x 3
+y 18
+end
+arch invis_exit
+slaying ../../world/world_122_117
+hp 13
+sp 6
+x 3
+y 19
+end
+arch grass_only
+x 3
+y 19
+end
+arch dungeon_magic
+x 3
+y 20
+end
+arch cobblestones2
+x 3
+y 20
+move_block all
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch flagstone
+x 4
+y 2
+end
+arch wwall_2_1_2
+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_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_mat
+x 4
+y 12
+end
+arch flagstone
+x 4
+y 13
+end
+arch swall_2_1_2
+x 4
+y 13
+end
+arch flagstone
+x 4
+y 14
+end
+arch shop_mat
+x 4
+y 14
+end
+arch flagstone
+x 4
+y 15
+end
+arch flagstone
+x 4
+y 16
+end
+arch button_small
+x 4
+y 17
+connected 1
+end
+arch flagstone
+x 4
+y 17
+end
+arch button_small
+x 4
+y 18
+connected 1
+end
+arch flagstone
+x 4
+y 18
+end
+arch odoorn2_closed_1
+x 4
+y 18
+connected 1
+end
+arch invis_exit
+slaying ../../world/world_122_117
+hp 13
+sp 6
+x 4
+y 19
+end
+arch grass_only
+x 4
+y 19
+end
+arch dungeon_magic
+x 4
+y 20
+end
+arch cobblestones2
+x 4
+y 20
+move_block all
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch flagstone
+x 5
+y 2
+end
+arch wwall_win2
+x 5
+y 2
+end
+arch shop_empty
+x 5
+y 3
+end
+arch shop_light
+x 5
+y 4
+end
+arch shop_empty
+x 5
+y 5
+end
+arch shop_light
+x 5
+y 6
+end
+arch shop_empty
+x 5
+y 7
+end
+arch shop_light
+x 5
+y 8
+end
+arch shop_empty
+x 5
+y 9
+end
+arch shop_light
+x 5
+y 10
+end
+arch shop_empty
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch flagstone
+x 5
+y 13
+end
+arch swall_2_1_2
+x 5
+y 13
+end
+arch flagstone
+x 5
+y 14
+end
+arch flagstone
+x 5
+y 15
+end
+arch menu
+x 5
+y 15
+end
+arch flagstone
+x 5
+y 16
+end
+arch button_small
+x 5
+y 17
+connected 1
+end
+arch flagstone
+x 5
+y 17
+end
+arch flagstone
+x 5
+y 18
+end
+arch wwall_1_4
+x 5
+y 18
+end
+arch invis_exit
+slaying ../../world/world_122_117
+hp 13
+sp 6
+x 5
+y 19
+end
+arch grass_only
+x 5
+y 19
+end
+arch dungeon_magic
+x 5
+y 20
+end
+arch cobblestones2
+x 5
+y 20
+move_block all
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch flagstone
+x 6
+y 2
+end
+arch wwall_2_1_2
+x 6
+y 2
+end
+arch shop_empty
+x 6
+y 3
+end
+arch shop_light
+x 6
+y 4
+end
+arch shop_empty
+x 6
+y 5
+end
+arch shop_light
+x 6
+y 6
+end
+arch shop_empty
+x 6
+y 7
+end
+arch shop_light
+x 6
+y 8
+end
+arch shop_empty
+x 6
+y 9
+end
+arch shop_light
+x 6
+y 10
+end
+arch shop_empty
+x 6
+y 11
+end
+arch shop_empty
+x 6
+y 12
+end
+arch flagstone
+x 6
+y 13
+end
+arch swall_2_2_3
+x 6
+y 13
+end
+arch flagstone
+x 6
+y 14
+end
+arch swall_2_1_1
+x 6
+y 14
+end
+arch flagstone
+x 6
+y 15
+end
+arch swall_2_1_1
+x 6
+y 15
+end
+arch flagstone
+x 6
+y 16
+end
+arch swall_2_1_1
+x 6
+y 16
+end
+arch flagstone
+x 6
+y 17
+end
+arch swall_2_1_1
+x 6
+y 17
+end
+arch flagstone
+x 6
+y 18
+end
+arch swall_1_2_half
+x 6
+y 18
+end
+arch wwall_2_1_2
+x 6
+y 18
+end
+arch dungeon_magic
+x 6
+y 19
+end
+arch grass_only
+x 6
+y 19
+move_block all
+end
+arch dungeon_magic
+x 6
+y 20
+end
+arch cobblestones2
+x 6
+y 20
+move_block all
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch flagstone
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch shop_empty
+x 7
+y 3
+end
+arch shop_light
+x 7
+y 4
+end
+arch shop_empty
+x 7
+y 5
+end
+arch shop_light
+x 7
+y 6
+end
+arch shop_empty
+x 7
+y 7
+end
+arch shop_light
+x 7
+y 8
+end
+arch shop_empty
+x 7
+y 9
+end
+arch shop_light
+x 7
+y 10
+end
+arch shop_empty
+x 7
+y 11
+end
+arch shop_empty
+x 7
+y 12
+end
+arch shop_empty
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 14
+end
+arch shop_empty
+x 7
+y 15
+end
+arch shop_empty
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 17
+end
+arch flagstone
+x 7
+y 18
+end
+arch wwall_2_1_2
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch cobblestones2
+x 7
+y 20
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch flagstone
+x 8
+y 2
+end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch shop_empty
+x 8
+y 3
+end
+arch shop_light
+x 8
+y 4
+end
+arch shop_empty
+x 8
+y 5
+end
+arch shop_light
+x 8
+y 6
+end
+arch shop_empty
+x 8
+y 7
+end
+arch shop_light
+x 8
+y 8
+end
+arch shop_empty
+x 8
+y 9
+end
+arch shop_light
+x 8
+y 10
+end
+arch shop_empty
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 12
+end
+arch shop_empty
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 14
+end
+arch shop_empty
+x 8
+y 15
+end
+arch shop_empty
+x 8
+y 16
+end
+arch shop_empty
+x 8
+y 17
+end
+arch flagstone
+x 8
+y 18
+end
+arch wwall_2_1_2
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch cobblestones2
+x 8
+y 20
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch flagstone
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch shop_empty
+x 9
+y 3
+end
+arch shop_light
+x 9
+y 4
+end
+arch shop_empty
+x 9
+y 5
+end
+arch shop_light
+x 9
+y 6
+end
+arch shop_empty
+x 9
+y 7
+end
+arch shop_light
+x 9
+y 8
+end
+arch shop_empty
+x 9
+y 9
+end
+arch shop_light
+x 9
+y 10
+end
+arch shop_empty
+x 9
+y 11
+end
+arch shop_empty
+x 9
+y 12
+end
+arch shop_light
+x 9
+y 13
+end
+arch shop_light
+x 9
+y 14
+end
+arch shop_light
+x 9
+y 15
+end
+arch shop_light
+x 9
+y 16
+end
+arch shop_empty
+x 9
+y 17
+end
+arch flagstone
+x 9
+y 18
+end
+arch wwall_2_1_2
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch cobblestones2
+x 9
+y 20
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch flagstone
+x 10
+y 2
+end
+arch wwall_win2
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 3
+end
+arch shop_empty
+x 10
+y 4
+end
+arch shop_empty
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
+arch shop_empty
+x 10
+y 7
+end
+arch shop_empty
+x 10
+y 8
+end
+arch shop_empty
+x 10
+y 9
+end
+arch shop_empty
+x 10
+y 10
+end
+arch shop_empty
+x 10
+y 11
+end
+arch shop_empty
+x 10
+y 12
+end
+arch shop_empty
+x 10
+y 13
+end
+arch shop_empty
+x 10
+y 14
+end
+arch shop_empty
+x 10
+y 15
+end
+arch shop_empty
+x 10
+y 16
+end
+arch shop_empty
+x 10
+y 17
+end
+arch flagstone
+x 10
+y 18
+end
+arch wwall_2_1_2
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch cobblestones2
+x 10
+y 20
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch flagstone
+x 11
+y 2
+end
+arch wwall_2_1_2
+x 11
+y 2
+end
+arch shop_empty
+x 11
+y 3
+end
+arch shop_light
+x 11
+y 4
+end
+arch shop_empty
+x 11
+y 5
+end
+arch shop_light
+x 11
+y 6
+end
+arch shop_empty
+x 11
+y 7
+end
+arch shop_light
+x 11
+y 8
+end
+arch shop_empty
+x 11
+y 9
+end
+arch shop_light
+x 11
+y 10
+end
+arch shop_empty
+x 11
+y 11
+end
+arch shop_empty
+x 11
+y 12
+end
+arch shop_light
+x 11
+y 13
+end
+arch shop_light
+x 11
+y 14
+end
+arch shop_light
+x 11
+y 15
+end
+arch shop_light
+x 11
+y 16
+end
+arch shop_empty
+x 11
+y 17
+end
+arch flagstone
+x 11
+y 18
+end
+arch wwall_win2
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch cobblestones2
+x 11
+y 20
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch flagstone
+x 12
+y 2
+end
+arch wwall_2_1_2
+x 12
+y 2
+end
+arch shop_empty
+x 12
+y 3
+end
+arch shop_light
+x 12
+y 4
+end
+arch shop_empty
+x 12
+y 5
+end
+arch shop_light
+x 12
+y 6
+end
+arch shop_empty
+x 12
+y 7
+end
+arch shop_light
+x 12
+y 8
+end
+arch shop_empty
+x 12
+y 9
+end
+arch shop_light
+x 12
+y 10
+end
+arch shop_empty
+x 12
+y 11
+end
+arch shop_empty
+x 12
+y 12
+end
+arch shop_empty
+x 12
+y 13
+end
+arch shop_empty
+x 12
+y 14
+end
+arch shop_empty
+x 12
+y 15
+end
+arch shop_empty
+x 12
+y 16
+end
+arch shop_empty
+x 12
+y 17
+end
+arch flagstone
+x 12
+y 18
+end
+arch wwall_2_1_2
+x 12
+y 18
+end
+arch grass_only
+x 12
+y 19
+end
+arch cobblestones2
+x 12
+y 20
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch flagstone
+x 13
+y 2
+end
+arch wwall_2_1_2
+x 13
+y 2
+end
+arch shop_empty
+x 13
+y 3
+end
+arch shop_light
+x 13
+y 4
+end
+arch shop_empty
+x 13
+y 5
+end
+arch shop_light
+x 13
+y 6
+end
+arch shop_empty
+x 13
+y 7
+end
+arch shop_light
+x 13
+y 8
+end
+arch shop_empty
+x 13
+y 9
+end
+arch shop_light
+x 13
+y 10
+end
+arch shop_empty
+x 13
+y 11
+end
+arch shop_empty
+x 13
+y 12
+end
+arch shop_light
+x 13
+y 13
+end
+arch shop_light
+x 13
+y 14
+end
+arch shop_light
+x 13
+y 15
+end
+arch shop_light
+x 13
+y 16
+end
+arch shop_empty
+x 13
+y 17
+end
+arch flagstone
+x 13
+y 18
+end
+arch wwall_2_1_2
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch cobblestones2
+x 13
+y 20
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch flagstone
+x 14
+y 2
+end
+arch wwall_2_1_2
+x 14
+y 2
+end
+arch shop_empty
+x 14
+y 3
+end
+arch shop_light
+x 14
+y 4
+end
+arch shop_empty
+x 14
+y 5
+end
+arch shop_light
+x 14
+y 6
+end
+arch shop_empty
+x 14
+y 7
+end
+arch shop_light
+x 14
+y 8
+end
+arch shop_empty
+x 14
+y 9
+end
+arch shop_light
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 11
+end
+arch shop_empty
+x 14
+y 12
+end
+arch shop_empty
+x 14
+y 13
+end
+arch shop_empty
+x 14
+y 14
+end
+arch shop_empty
+x 14
+y 15
+end
+arch shop_empty
+x 14
+y 16
+end
+arch shop_empty
+x 14
+y 17
+end
+arch flagstone
+x 14
+y 18
+end
+arch wwall_2_1_2
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch cobblestones2
+x 14
+y 20
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch flagstone
+x 15
+y 2
+end
+arch wwall_win2
+x 15
+y 2
+end
+arch shop_empty
+x 15
+y 3
+end
+arch shop_light
+x 15
+y 4
+end
+arch shop_empty
+x 15
+y 5
+end
+arch shop_light
+x 15
+y 6
+end
+arch shop_empty
+x 15
+y 7
+end
+arch shop_light
+x 15
+y 8
+end
+arch shop_empty
+x 15
+y 9
+end
+arch shop_light
+x 15
+y 10
+end
+arch shop_empty
+x 15
+y 11
+end
+arch shop_empty
+x 15
+y 12
+end
+arch shop_light
+x 15
+y 13
+end
+arch shop_light
+x 15
+y 14
+end
+arch shop_light
+x 15
+y 15
+end
+arch shop_light
+x 15
+y 16
+end
+arch shop_empty
+x 15
+y 17
+end
+arch flagstone
+x 15
+y 18
+end
+arch wwall_2_1_2
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch cobblestones2
+x 15
+y 20
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch wwall_2_1_2
+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_empty
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+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 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_empty
+x 16
+y 16
+end
+arch shop_empty
+x 16
+y 17
+end
+arch flagstone
+x 16
+y 18
+end
+arch wwall_2_1_2
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch cobblestones2
+x 16
+y 20
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch flagstone
+x 17
+y 2
+end
+arch wwall_2_1_2
+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_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_empty
+x 17
+y 16
+end
+arch shop_empty
+x 17
+y 17
+end
+arch flagstone
+x 17
+y 18
+end
+arch wwall_2_1_2
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch cobblestones2
+x 17
+y 20
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch flagstone
+x 18
+y 2
+end
+arch wwall_2_2_3
+x 18
+y 2
+end
+arch flagstone
+x 18
+y 3
+end
+arch wwall_2_1_1
+x 18
+y 3
+end
+arch flagstone
+x 18
+y 4
+end
+arch wwall_2_1_1
+x 18
+y 4
+end
+arch flagstone
+x 18
+y 5
+end
+arch wwall_2_1_1
+x 18
+y 5
+end
+arch flagstone
+x 18
+y 6
+end
+arch wwall_2_1_1
+x 18
+y 6
+end
+arch flagstone
+x 18
+y 7
+end
+arch wwall_2_1_1
+x 18
+y 7
+end
+arch flagstone
+x 18
+y 8
+end
+arch wwall_2_1_1
+x 18
+y 8
+end
+arch flagstone
+x 18
+y 9
+end
+arch wwall_win1
+x 18
+y 9
+end
+arch flagstone
+x 18
+y 10
+end
+arch wwall_2_1_1
+x 18
+y 10
+end
+arch flagstone
+x 18
+y 11
+end
+arch wwall_2_1_1
+x 18
+y 11
+end
+arch flagstone
+x 18
+y 12
+end
+arch wwall_2_1_1
+x 18
+y 12
+end
+arch flagstone
+x 18
+y 13
+end
+arch wwall_2_1_1
+x 18
+y 13
+end
+arch flagstone
+x 18
+y 14
+end
+arch wwall_2_1_1
+x 18
+y 14
+end
+arch flagstone
+x 18
+y 15
+end
+arch wwall_2_1_1
+x 18
+y 15
+end
+arch flagstone
+x 18
+y 16
+end
+arch wwall_2_1_1
+x 18
+y 16
+end
+arch flagstone
+x 18
+y 17
+end
+arch wwall_2_1_1
+x 18
+y 17
+end
+arch flagstone
+x 18
+y 18
+end
+arch wwall_2_2_4
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch cobblestones2
+x 18
+y 20
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch grass_only
+x 19
+y 3
+end
+arch grass_only
+x 19
+y 4
+end
+arch grass_only
+x 19
+y 5
+end
+arch grass_only
+x 19
+y 6
+end
+arch grass_only
+x 19
+y 7
+end
+arch grass_only
+x 19
+y 8
+end
+arch grass_only
+x 19
+y 9
+end
+arch grass_only
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch grass_only
+x 19
+y 12
+end
+arch grass_only
+x 19
+y 13
+end
+arch grass_only
+x 19
+y 14
+end
+arch grass_only
+x 19
+y 15
+end
+arch grass_only
+x 19
+y 16
+end
+arch grass_only
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
+arch cobblestones2
+x 19
+y 20
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch cobblestones2
+x 20
+y 2
+end
+arch cobblestones2
+x 20
+y 3
+end
+arch cobblestones2
+x 20
+y 4
+end
+arch cobblestones2
+x 20
+y 5
+end
+arch cobblestones2
+x 20
+y 6
+end
+arch cobblestones2
+x 20
+y 7
+end
+arch cobblestones2
+x 20
+y 8
+end
+arch cobblestones2
+x 20
+y 9
+end
+arch cobblestones2
+x 20
+y 10
+end
+arch cobblestones2
+x 20
+y 11
+end
+arch cobblestones2
+x 20
+y 12
+end
+arch cobblestones2
+x 20
+y 13
+end
+arch cobblestones2
+x 20
+y 14
+end
+arch cobblestones2
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 16
+end
+arch cobblestones2
+x 20
+y 17
+end
+arch cobblestones2
+x 20
+y 18
+end
+arch cobblestones2
+x 20
+y 19
+end
+arch cobblestones2
+x 20
+y 20
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 9faa7d64d..22c6bf414 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: 2022-01-15 Kevin Zheng
+Modified: 2022-04-30 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -4445,6 +4445,10 @@ arch grass
 x 12
 y 6
 end
+arch well
+x 12
+y 6
+end
 arch dungeon_magic
 x 12
 y 7
@@ -4794,7 +4798,11 @@ arch grass
 x 13
 y 6
 end
-arch well
+arch s_shop1
+name Moro's Lamp Shop
+slaying ../navar_city/shops/light_shop
+hp 4
+sp 16
 x 13
 y 6
 end