diff --git a/scorn/shops/alclass b/scorn/shops/alclass
index dc2558c8d..1432174d4 100644
--- a/scorn/shops/alclass
+++ b/scorn/shops/alclass
@@ -8,7 +8,7 @@ enter_x 8
 enter_y 16
 msg
 Created:  2005-08-10
-Modified: 2008-11-03 Rick Tanner
+Modified: 2011-04-10 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -1157,8 +1157,8 @@ no_magic 1
 end
 arch stair3_gstone_up
 slaying potionshop
-hp 16
-sp 11
+hp 14
+sp 17
 x 8
 y 16
 end
diff --git a/scorn/shops/potionshop b/scorn/shops/potionshop
index 449ec64f6..f99e4be96 100644
--- a/scorn/shops/potionshop
+++ b/scorn/shops/potionshop
@@ -4,276 +4,275 @@ difficulty 3
 region scorn
 shopitems potion:20;inorganic:60;container:20;*:-60
 shopmax 2000
-width 18
-height 16
+width 29
+height 22
 enter_x 14
 enter_y 14
 msg
 Created:  1996-05-02 bt (thomas@astro.psu.edu)
-Modified: 2008-12-02 Rick Tanner
+Modified: 2011-04-10 Rick Tanner
 endmsg
+outdoor 1
 end
-arch woodfloor
+arch grass_only
 end
-arch wwall_2_2_2
-end
-arch woodfloor
+arch grass_only
 y 1
 end
-arch wwall_2_1_1
-y 1
-end
-arch woodfloor
+arch grass_only
 y 2
 end
-arch wwall_2_1_1
-y 2
-end
-arch woodfloor
+arch grass_only
 y 3
 end
-arch wwall_2_1_1
-y 3
-end
-arch woodfloor
+arch grass_only
 y 4
 end
-arch wwall_2_1_1
-y 4
-end
-arch woodfloor
+arch grass_only
 y 5
 end
-arch wwall_2_1_1
-y 5
-end
-arch woodfloor
+arch grass_only
 y 6
 end
-arch wwall_2_1_1
-y 6
-end
-arch woodfloor
+arch grass_only
 y 7
 end
-arch wwall_2_1_1
-y 7
-end
-arch woodfloor
+arch grass_only
 y 8
 end
-arch wwall_2_1_1
-y 8
-end
-arch woodfloor
+arch grass_only
 y 9
 end
-arch wwall_2_1_1
-y 9
-end
-arch woodfloor
+arch grass_only
 y 10
 end
-arch wwall_2_1_1
-y 10
-end
-arch woodfloor
+arch grass_only
 y 11
 end
-arch wwall_2_1_1
-y 11
-end
-arch woodfloor
+arch grass_only
 y 12
 end
-arch wwall_2_1_1
-y 12
-end
-arch woodfloor
+arch grass_only
 y 13
 end
-arch wwall_2_1_1
-y 13
-end
-arch woodfloor
+arch grass_only
 y 14
 end
-arch wwall_2_1_1
-y 14
-end
-arch woodfloor
+arch grass_only
 y 15
 end
-arch wwall_2_2_1
-y 15
+arch grass_only
+y 16
 end
-arch woodfloor
+arch grass_only
+y 17
+end
+arch grass_only
+y 18
+end
+arch grass_only
+y 19
+end
+arch grass_only
+y 20
+end
+arch grass_only
+y 21
+end
+arch grass_only
 x 1
 end
-arch wwall_2_1_2
-x 1
-end
-arch shop_empty
+arch grass_only
 x 1
 y 1
 end
-arch shop_empty
+arch grass_only
 x 1
 y 2
 end
-arch shop_empty
+arch grass_only
 x 1
 y 3
 end
-arch shop_empty
+arch grass_only
 x 1
 y 4
 end
-arch shop_empty
+arch grass_only
 x 1
 y 5
 end
-arch shop_empty
+arch grass_only
 x 1
 y 6
 end
-arch shop_empty
+arch grass_only
 x 1
 y 7
 end
-arch shop_empty
+arch grass_only
 x 1
 y 8
 end
-arch shop_empty
+arch grass_only
 x 1
 y 9
 end
-arch shop_empty
+arch grass_only
 x 1
 y 10
 end
-arch shop_empty
+arch grass_only
 x 1
 y 11
 end
-arch shop_empty
+arch grass_only
 x 1
 y 12
 end
-arch shop_empty
+arch grass_only
 x 1
 y 13
 end
-arch shop_empty
+arch grass_only
 x 1
 y 14
 end
-arch woodfloor
+arch grass_only
 x 1
 y 15
 end
-arch wwall_2_1_2
+arch grass_only
 x 1
-y 15
+y 16
 end
-arch woodfloor
+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 grass_only
+x 1
+y 20
+end
+arch grass_only
+x 1
+y 21
+end
+arch grass_only
 x 2
 end
-arch wwall_2_1_2
-x 2
-end
-arch shop_alchemy
+arch grass_only
 x 2
 y 1
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 2
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 3
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 4
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 5
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 6
 end
-arch shop_empty
+arch grass_only
 x 2
 y 7
 end
-arch shop_empty
+arch grass_only
 x 2
 y 8
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 9
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 10
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 11
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 12
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 13
 end
-arch shop_alchemy
+arch grass_only
 x 2
 y 14
 end
-arch woodfloor
+arch grass_only
 x 2
 y 15
 end
-arch wwall_2_1_2
+arch grass_only
 x 2
-y 15
+y 16
 end
-arch woodfloor
+arch grass_only
+x 2
+y 17
+end
+arch grass_only
+x 2
+y 18
+end
+arch grass_only
+x 2
+y 19
+end
+arch grass_only
+x 2
+y 20
+end
+arch grass_only
+x 2
+y 21
+end
+arch grass_only
 x 3
 end
-arch wwall_3_3
-x 3
-end
-arch woodfloor
+arch grass_only
 x 3
 y 1
 end
-arch wwall_2_1_1
-x 3
-y 1
-end
-arch woodfloor
+arch grass_only
 x 3
 y 2
 end
-arch wwall_2_1_1
+arch light4
 x 3
-y 2
+y 3
 end
 arch woodfloor
 x 3
 y 3
 end
-arch wwall_2_1_1
+arch wall_2_2_2
 x 3
 y 3
 end
@@ -281,7 +280,7 @@ arch woodfloor
 x 3
 y 4
 end
-arch wwall_2_1_1
+arch wall_2_1_1
 x 3
 y 4
 end
@@ -289,7 +288,7 @@ arch woodfloor
 x 3
 y 5
 end
-arch wwall_2_1_1
+arch wall_2_1_1
 x 3
 y 5
 end
@@ -297,15 +296,27 @@ arch woodfloor
 x 3
 y 6
 end
-arch wwall_1_2
+arch wall_2_1_1
 x 3
 y 6
 end
-arch shop_empty
+arch light2
 x 3
 y 7
 end
-arch shop_empty
+arch woodfloor
+x 3
+y 7
+end
+arch window_win1
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch wall_2_1_1
 x 3
 y 8
 end
@@ -313,7 +324,7 @@ arch woodfloor
 x 3
 y 9
 end
-arch wwall_1_1
+arch wall_2_1_1
 x 3
 y 9
 end
@@ -321,7 +332,7 @@ arch woodfloor
 x 3
 y 10
 end
-arch wwall_2_1_1
+arch wall_2_1_1
 x 3
 y 10
 end
@@ -329,7 +340,7 @@ arch woodfloor
 x 3
 y 11
 end
-arch wwall_2_1_1
+arch wall_2_1_1
 x 3
 y 11
 end
@@ -337,15 +348,19 @@ arch woodfloor
 x 3
 y 12
 end
-arch wwall_2_1_1
+arch wall_3_2
 x 3
 y 12
 end
+arch light2
+x 3
+y 13
+end
 arch woodfloor
 x 3
 y 13
 end
-arch wwall_2_1_1
+arch window_win1
 x 3
 y 13
 end
@@ -353,7 +368,7 @@ arch woodfloor
 x 3
 y 14
 end
-arch wwall_2_1_1
+arch wall_2_1_1
 x 3
 y 14
 end
@@ -361,40 +376,85 @@ arch woodfloor
 x 3
 y 15
 end
-arch wwall_3_1
+arch wall_2_1_1
 x 3
 y 15
 end
 arch woodfloor
+x 3
+y 16
+end
+arch wall_2_1_1
+x 3
+y 16
+end
+arch woodfloor
+x 3
+y 17
+end
+arch wall_2_1_1
+x 3
+y 17
+end
+arch light4
+x 3
+y 18
+end
+arch woodfloor
+x 3
+y 18
+end
+arch wall_2_2_1
+x 3
+y 18
+end
+arch grass_only
+x 3
+y 19
+end
+arch grass_only
+x 3
+y 20
+end
+arch grass_only
+x 3
+y 21
+end
+arch grass_only
 x 4
 end
-arch wwall_2_1_2
-x 4
-end
-arch shop_alchemy
+arch grass_only
 x 4
 y 1
 end
-arch shop_alchemy
+arch grass_only
 x 4
 y 2
 end
-arch shop_alchemy
+arch woodfloor
 x 4
 y 3
 end
-arch shop_alchemy
+arch wall_2_1_2
+x 4
+y 3
+end
+arch shop_empty
 x 4
 y 4
 end
-arch shop_alchemy
+arch shop_empty
 x 4
 y 5
 end
-arch shop_alchemy
+arch shop_empty
 x 4
 y 6
 end
+arch light4
+x 4
+y 7
+end
 arch shop_empty
 x 4
 y 7
@@ -403,27 +463,39 @@ arch shop_empty
 x 4
 y 8
 end
-arch shop_minerals
+arch shop_empty
 x 4
 y 9
 end
-arch shop_minerals
+arch shop_empty
 x 4
 y 10
 end
-arch shop_minerals
+arch shop_empty
 x 4
 y 11
 end
-arch shop_minerals
+arch light4
 x 4
 y 12
 end
-arch shop_minerals
+arch shop_empty
+x 4
+y 12
+end
+arch swall_1_4_half
+x 4
+y 12
+end
+arch wall_1_3
+x 4
+y 12
+end
+arch woodfloor
 x 4
 y 13
 end
-arch shop_minerals
+arch woodfloor
 x 4
 y 14
 end
@@ -431,692 +503,16 @@ arch woodfloor
 x 4
 y 15
 end
-arch wwall_2_1_2
-x 4
-y 15
-end
-arch woodfloor
-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_empty
-x 5
-y 5
-end
-arch shop_empty
-x 5
-y 6
-end
-arch shop_empty
-x 5
-y 7
-end
-arch shop_empty
-x 5
-y 8
-end
-arch shop_empty
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 10
-end
-arch shop_empty
-x 5
-y 11
-end
-arch shop_empty
-x 5
-y 12
-end
-arch shop_empty
-x 5
-y 13
-end
-arch shop_empty
-x 5
-y 14
-end
-arch woodfloor
-x 5
-y 15
-end
-arch wwall_2_1_2
-x 5
-y 15
-end
-arch woodfloor
-x 6
-end
-arch wwall_2_1_2
-x 6
-end
-arch shop_alchemy
-x 6
-y 1
-end
-arch shop_alchemy
-x 6
-y 2
-end
-arch shop_alchemy
-x 6
-y 3
-end
-arch shop_alchemy
-x 6
-y 4
-end
-arch shop_alchemy
-x 6
-y 5
-end
-arch shop_alchemy
-x 6
-y 6
-end
-arch shop_empty
-x 6
-y 7
-end
-arch shop_empty
-x 6
-y 8
-end
-arch shop_minerals
-x 6
-y 9
-end
-arch shop_minerals
-x 6
-y 10
-end
-arch shop_minerals
-x 6
-y 11
-end
-arch shop_minerals
-x 6
-y 12
-end
-arch shop_minerals
-x 6
-y 13
-end
-arch shop_minerals
-x 6
-y 14
-end
-arch woodfloor
-x 6
-y 15
-end
-arch wwall_2_1_2
-x 6
-y 15
-end
-arch woodfloor
-x 7
-end
-arch wwall_3_3
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch wwall_2_1_1
-x 7
-y 1
-end
-arch woodfloor
-x 7
-y 2
-end
-arch wwall_2_1_1
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch wwall_2_1_1
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch wwall_2_1_1
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
-end
-arch wwall_2_1_1
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch wwall_1_2
-x 7
-y 6
-end
-arch shop_empty
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
-arch wwall_1_1
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 10
-end
-arch wwall_2_1_1
-x 7
-y 10
-end
-arch woodfloor
-x 7
-y 11
-end
-arch wwall_2_1_1
-x 7
-y 11
-end
-arch woodfloor
-x 7
-y 12
-end
-arch wwall_2_1_1
-x 7
-y 12
-end
-arch woodfloor
-x 7
-y 13
-end
-arch wwall_2_1_1
-x 7
-y 13
-end
-arch woodfloor
-x 7
-y 14
-end
-arch wwall_2_1_1
-x 7
-y 14
-end
-arch woodfloor
-x 7
-y 15
-end
-arch wwall_3_1
-x 7
-y 15
-end
-arch woodfloor
-x 8
-end
-arch wwall_2_1_2
-x 8
-end
-arch shop_books
-sp 5
-x 8
-y 1
-end
-arch shop_books
-sp 5
-x 8
-y 2
-end
-arch shop_books
-sp 5
-x 8
-y 3
-end
-arch shop_alchemy
-x 8
-y 4
-end
-arch shop_alchemy
-x 8
-y 5
-end
-arch shop_alchemy
-x 8
-y 6
-end
-arch shop_empty
-x 8
-y 7
-end
-arch shop_empty
-x 8
-y 8
-end
-arch shop_potions
-x 8
-y 9
-end
-arch shop_potions
-x 8
-y 10
-end
-arch shop_potions
-x 8
-y 11
-end
-arch shop_potions
-x 8
-y 12
-end
-arch shop_potions
-x 8
-y 13
-end
-arch shop_potions
-x 8
-y 14
-end
-arch woodfloor
-x 8
-y 15
-end
-arch wwall_2_1_2
-x 8
-y 15
-end
-arch woodfloor
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch shop_empty
-x 9
-y 1
-end
-arch shop_empty
-x 9
-y 2
-end
-arch shop_empty
-x 9
-y 3
-end
-arch shop_empty
-x 9
-y 4
-end
-arch shop_empty
-x 9
-y 5
-end
-arch shop_empty
-x 9
-y 6
-end
-arch shop_empty
-x 9
-y 7
-end
-arch shop_empty
-x 9
-y 8
-end
-arch shop_empty
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 10
-end
-arch shop_empty
-x 9
-y 11
-end
-arch shop_empty
-x 9
-y 12
-end
-arch shop_empty
-x 9
-y 13
-end
-arch shop_potions
-x 9
-y 14
-end
-arch woodfloor
-x 9
-y 15
-end
-arch wwall_2_1_2
-x 9
-y 15
-end
-arch woodfloor
-x 10
-end
-arch wwall_2_1_2
-x 10
-end
-arch shop_potions
-x 10
-y 1
-end
-arch shop_potions
-x 10
-y 2
-end
-arch shop_potions
-x 10
-y 3
-end
-arch shop_alchemy
-x 10
-y 4
-end
-arch shop_alchemy
-x 10
-y 5
-end
-arch shop_alchemy
-x 10
-y 6
-end
-arch shop_empty
-x 10
-y 7
-end
-arch shop_empty
-x 10
-y 8
-end
-arch shop_potions
-x 10
-y 9
-end
-arch shop_potions
-x 10
-y 10
-end
-arch shop_potions
-x 10
-y 11
-end
-arch shop_potions
-x 10
-y 12
-end
-arch shop_potions
-x 10
-y 13
-end
-arch shop_potions
-x 10
-y 14
-end
-arch woodfloor
-x 10
-y 15
-end
-arch wwall_2_1_2
-x 10
-y 15
-end
-arch woodfloor
-x 11
-end
-arch wwall_3_3
-x 11
-end
-arch woodfloor
-x 11
-y 1
-end
-arch wwall_2_1_1
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 2
-end
-arch wwall_2_1_1
-x 11
-y 2
-end
-arch woodfloor
-x 11
-y 3
-end
-arch wwall_2_1_1
-x 11
-y 3
-end
-arch woodfloor
-x 11
-y 4
-end
-arch wwall_2_1_1
-x 11
-y 4
-end
-arch woodfloor
-x 11
-y 5
-end
-arch wwall_2_1_1
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch wwall_2_2_1
-x 11
-y 6
-end
-arch shop_empty
-x 11
-y 7
-end
-arch shop_empty
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch wwall_2_2_2
-x 11
-y 9
-end
-arch woodfloor
-x 11
-y 10
-end
-arch woodfloor
-x 11
-y 10
-end
-arch wwall_2_1_1
-x 11
-y 10
-end
-arch woodfloor
-x 11
-y 11
-end
-arch wwall_2_1_1
-x 11
-y 11
-end
-arch woodfloor
-x 11
-y 12
-end
-arch wwall_2_1_1
-x 11
-y 12
-end
-arch woodfloor
-x 11
-y 13
-end
-arch wwall_win1
-x 11
-y 13
-end
-arch woodfloor
-x 11
-y 14
-end
-arch wwall_2_1_1
-x 11
-y 14
-end
-arch woodfloor
-x 11
-y 15
-end
-arch wwall_3_1
-x 11
-y 15
-end
-arch woodfloor
-x 12
-end
-arch wwall_2_1_2
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch clock
-x 12
-y 1
-no_pick 1
-end
-arch woodfloor
-x 12
-y 2
-end
-arch woodfloor
-x 12
-y 3
-end
-arch woodfloor
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch woodfloor
-x 12
-y 6
-end
-arch wwall_2_1_2
-x 12
-y 6
-end
-arch shop_empty
-x 12
-y 7
-end
-arch shop_empty
-x 12
-y 8
-end
-arch shop_mat
-x 12
-y 8
-end
-arch woodfloor
-x 12
-y 9
-end
-arch wwall_2_1_2
-x 12
-y 9
-end
-arch woodfloor
-x 12
-y 10
-end
-arch shop_mat
-x 12
-y 10
-end
-arch woodfloor
-x 12
-y 11
-end
-arch menu
-x 12
-y 11
-end
-arch woodfloor
-x 12
-y 12
-end
 arch bench_1_4
-x 12
-y 12
+x 4
+y 15
 move_block all
 no_magic 1
 damned 1
 end
 arch woodfloor
-x 12
-y 13
+x 4
+y 16
 end
 arch dwarf_wiz
 name Izchucio the Alchemist
@@ -1130,6 +526,1004 @@ If you're really interested in alchemy
 you'd better buy a day pass and get
 going.
 endmsg
+x 4
+y 16
+end
+arch woodfloor
+x 4
+y 17
+end
+arch woodfloor
+x 4
+y 18
+end
+arch wall_2_1_2
+x 4
+y 18
+end
+arch grass_only
+x 4
+y 19
+end
+arch grass_only
+x 4
+y 20
+end
+arch grass_only
+x 4
+y 21
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch grass_only
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch window_win2
+x 5
+y 3
+end
+arch shop_alchemy
+x 5
+y 4
+end
+arch shop_alchemy
+x 5
+y 5
+end
+arch shop_alchemy
+x 5
+y 6
+end
+arch shop_alchemy
+x 5
+y 7
+end
+arch shop_alchemy
+x 5
+y 8
+end
+arch shop_alchemy
+x 5
+y 9
+end
+arch shop_empty
+x 5
+y 10
+end
+arch shop_empty
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch swall_2_1_2
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch woodfloor
+x 5
+y 14
+end
+arch light4
+x 5
+y 15
+end
+arch woodfloor
+x 5
+y 15
+end
+arch bench_2_2_3
+x 5
+y 15
+move_block all
+no_magic 1
+damned 1
+end
+arch woodfloor
+x 5
+y 16
+end
+arch bench_2_1_1
+x 5
+y 16
+move_block all
+no_magic 1
+damned 1
+end
+arch woodfloor
+x 5
+y 17
+end
+arch bench_1_2
+x 5
+y 17
+move_block all
+no_magic 1
+damned 1
+end
+arch woodfloor
+x 5
+y 18
+end
+arch wall_1_3
+x 5
+y 18
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 37
+x 5
+y 19
+end
+arch cobblestones2
+x 5
+y 19
+end
+arch grass_only
+x 5
+y 20
+end
+arch grass_only
+x 5
+y 21
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch grass_only
+x 6
+y 2
+end
+arch light4
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 3
+end
+arch wall_3_3
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch wall_2_1_1
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch wall_2_1_1
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch wall_2_1_1
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch wall_2_1_1
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch wall_2_1_1
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch wall_1_2
+x 6
+y 9
+end
+arch light4
+x 6
+y 10
+end
+arch shop_empty
+x 6
+y 10
+end
+arch shop_empty
+x 6
+y 11
+end
+arch shop_empty
+x 6
+y 12
+end
+arch swall_2_1_2
+x 6
+y 12
+end
+arch woodfloor
+x 6
+y 13
+end
+arch menu
+x 6
+y 13
+end
+arch woodfloor
+x 6
+y 14
+end
+arch woodfloor
+x 6
+y 15
+end
+arch woodfloor
+x 6
+y 16
+end
+arch button_small
+x 6
+y 17
+connected 12
+end
+arch woodfloor
+x 6
+y 17
+end
+arch button_small
+x 6
+y 18
+connected 12
+end
+arch woodfloor
+x 6
+y 18
+end
+arch odoorn2_closed_1
+x 6
+y 18
+connected 12
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 37
+x 6
+y 19
+end
+arch cobblestones2
+x 6
+y 19
+end
+arch cobblestones2
+x 6
+y 20
+end
+arch cobblestones2
+x 6
+y 21
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch grass_only
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch wall_2_1_2
+x 7
+y 3
+end
+arch shop_alchemy
+x 7
+y 4
+end
+arch shop_alchemy
+x 7
+y 5
+end
+arch shop_alchemy
+x 7
+y 6
+end
+arch shop_alchemy
+x 7
+y 7
+end
+arch shop_alchemy
+x 7
+y 8
+end
+arch shop_alchemy
+x 7
+y 9
+end
+arch shop_empty
+x 7
+y 10
+end
+arch shop_empty
+x 7
+y 11
+end
+arch shop_mat
+x 7
+y 11
+end
+arch shop_empty
+x 7
+y 12
+end
+arch swall_2_1_2
+x 7
+y 12
+end
+arch woodfloor
+x 7
+y 13
+end
+arch shop_mat
+x 7
+y 13
+end
+arch woodfloor
+x 7
+y 14
+end
+arch woodfloor
+x 7
+y 15
+end
+arch woodfloor
+x 7
+y 16
+end
+arch button_small
+x 7
+y 17
+connected 12
+end
+arch woodfloor
+x 7
+y 17
+end
+arch woodfloor
+x 7
+y 18
+end
+arch wall_1_4
+x 7
+y 18
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 37
+x 7
+y 19
+end
+arch cobblestones2
+x 7
+y 19
+end
+arch grass_only
+x 7
+y 20
+end
+arch grass_only
+x 7
+y 21
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch grass_only
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch window_win2
+x 8
+y 3
+end
+arch shop_alchemy
+x 8
+y 4
+end
+arch shop_empty
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch light4
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 8
+end
+arch shop_empty
+x 8
+y 9
+end
+arch shop_empty
+x 8
+y 10
+end
+arch shop_empty
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 12
+end
+arch swall_2_1_2
+x 8
+y 12
+end
+arch woodfloor
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
+arch woodfloor
+x 8
+y 16
+end
+arch woodfloor
+x 8
+y 17
+end
+arch woodfloor
+x 8
+y 18
+end
+arch wall_2_1_2
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch grass_only
+x 8
+y 20
+end
+arch grass_only
+x 8
+y 21
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch grass_only
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch wall_2_1_2
+x 9
+y 3
+end
+arch shop_alchemy
+x 9
+y 4
+end
+arch shop_alchemy
+x 9
+y 5
+end
+arch shop_alchemy
+x 9
+y 6
+end
+arch shop_alchemy
+x 9
+y 7
+end
+arch shop_alchemy
+x 9
+y 8
+end
+arch shop_alchemy
+x 9
+y 9
+end
+arch shop_empty
+x 9
+y 10
+end
+arch shop_empty
+x 9
+y 11
+end
+arch shop_empty
+x 9
+y 12
+end
+arch swall_2_1_2
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch light4
+x 9
+y 15
+end
+arch woodfloor
+x 9
+y 15
+end
+arch wall_1_4
+x 9
+y 15
+end
+arch woodfloor
+x 9
+y 16
+end
+arch woodfloor
+x 9
+y 17
+end
+arch diamond_converter
+name Healing Potion: 1400 pp
+slaying money
+other_arch potion_heal
+sp 1
+food 70000
+x 9
+y 17
+end
+arch woodfloor
+x 9
+y 18
+end
+arch wall_2_1_2
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch grass_only
+x 9
+y 20
+end
+arch grass_only
+x 9
+y 21
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch grass_only
+x 10
+y 2
+end
+arch light4
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 3
+end
+arch wall_3_3
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch wall_2_1_1
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch wall_2_1_1
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch wall_2_1_1
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch wall_2_1_1
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch wall_2_1_1
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch wall_1_2
+x 10
+y 9
+end
+arch light4
+x 10
+y 10
+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 swall_2_1_2
+x 10
+y 12
+end
+arch woodfloor
+x 10
+y 13
+end
+arch woodfloor
+x 10
+y 14
+end
+arch trigger_marker
+slaying potion_shop1
+msg
+You have one day's use of these facilities.
+endmsg
+food 504
+x 10
+y 14
+speed 1.0
+connected 10
+end
+arch altar_trigger
+name Drop 200 platinum for day pass
+slaying money
+food 10000
+x 10
+y 14
+connected 10
+end
+arch woodfloor
+x 10
+y 15
+end
+arch wall_2_1_2
+x 10
+y 15
+end
+arch woodfloor
+x 10
+y 16
+end
+arch woodfloor
+x 10
+y 17
+end
+arch woodfloor
+x 10
+y 18
+end
+arch wall_2_1_2
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch grass_only
+x 10
+y 20
+end
+arch grass_only
+x 10
+y 21
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch grass_only
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch wall_2_1_2
+x 11
+y 3
+end
+arch shop_books
+sp 5
+x 11
+y 4
+end
+arch shop_books
+sp 5
+x 11
+y 5
+end
+arch shop_books
+sp 5
+x 11
+y 6
+end
+arch shop_alchemy
+x 11
+y 7
+end
+arch shop_alchemy
+x 11
+y 8
+end
+arch shop_alchemy
+x 11
+y 9
+end
+arch shop_empty
+x 11
+y 10
+end
+arch shop_empty
+x 11
+y 11
+end
+arch shop_empty
+x 11
+y 12
+end
+arch swall_2_1_2
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
+arch woodfloor
+x 11
+y 14
+end
+arch wall_2_2_2
+x 11
+y 14
+end
+arch woodfloor
+x 11
+y 15
+end
+arch wall_2_2_4
+x 11
+y 15
+end
+arch woodfloor
+x 11
+y 16
+end
+arch woodfloor
+x 11
+y 17
+end
+arch diamond_converter
+name Mana Potion: 1400 pp
+slaying money
+other_arch potion_magic
+sp 1
+food 70000
+x 11
+y 17
+end
+arch light4
+x 11
+y 18
+end
+arch woodfloor
+x 11
+y 18
+end
+arch window_win2
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 11
+y 20
+end
+arch grass_only
+x 11
+y 21
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch grass_only
+x 12
+y 2
+end
+arch woodfloor
+x 12
+y 3
+end
+arch window_win2
+x 12
+y 3
+end
+arch shop_minerals
+x 12
+y 4
+end
+arch shop_empty
+x 12
+y 5
+end
+arch shop_empty
+x 12
+y 6
+end
+arch light4
+x 12
+y 7
+end
+arch shop_empty
+x 12
+y 7
+end
+arch shop_empty
+x 12
+y 8
+end
+arch shop_empty
+x 12
+y 9
+end
+arch shop_empty
+x 12
+y 10
+end
+arch shop_empty
+x 12
+y 11
+end
+arch light4
+x 12
+y 12
+end
+arch shop_empty
+x 12
+y 12
+end
+arch swall_1_3_half
+x 12
+y 12
+end
+arch wall_1_4
+x 12
+y 12
+end
+arch woodfloor
 x 12
 y 13
 end
@@ -1137,28 +1531,1114 @@ arch woodfloor
 x 12
 y 14
 end
+arch wall_2_1_2
+x 12
+y 14
+end
 arch woodfloor
 x 12
 y 15
 end
-arch wwall_2_1_2
+arch woodfloor
 x 12
-y 15
+y 16
 end
 arch woodfloor
-x 13
-end
-arch wwall_2_1_2
-x 13
+x 12
+y 17
 end
 arch woodfloor
+x 12
+y 18
+end
+arch wall_2_1_2
+x 12
+y 18
+end
+arch grass_only
+x 12
+y 19
+end
+arch grass_only
+x 12
+y 20
+end
+arch grass_only
+x 12
+y 21
+end
+arch grass_only
+x 13
+end
+arch grass_only
 x 13
 y 1
 end
+arch grass_only
+x 13
+y 2
+end
+arch woodfloor
+x 13
+y 3
+end
+arch wall_2_1_2
+x 13
+y 3
+end
+arch shop_potions
+x 13
+y 4
+end
+arch shop_potions
+x 13
+y 5
+end
+arch shop_potions
+x 13
+y 6
+end
+arch shop_alchemy
+x 13
+y 7
+end
+arch shop_alchemy
+x 13
+y 8
+end
+arch shop_alchemy
+x 13
+y 9
+end
+arch shop_empty
+x 13
+y 10
+end
+arch shop_empty
+x 13
+y 11
+end
+arch shop_empty
+x 13
+y 12
+end
+arch wall_2_1_2
+x 13
+y 12
+end
+arch woodfloor
+x 13
+y 13
+end
+arch woodfloor
+x 13
+y 14
+end
+arch wall_2_1_2
+x 13
+y 14
+end
+arch woodfloor
+x 13
+y 15
+end
+arch woodfloor
+x 13
+y 16
+end
+arch wall_1_1
+x 13
+y 16
+end
+arch woodfloor
+x 13
+y 17
+end
+arch wall_2_1_1
+x 13
+y 17
+end
+arch woodfloor
+x 13
+y 18
+end
+arch wall_3_1
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch grass_only
+x 13
+y 20
+end
+arch grass_only
+x 13
+y 21
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch grass_only
+x 14
+y 2
+end
+arch light4
+x 14
+y 3
+end
+arch woodfloor
+x 14
+y 3
+end
+arch wall_3_3
+x 14
+y 3
+end
+arch woodfloor
+x 14
+y 4
+end
+arch wall_2_1_1
+x 14
+y 4
+end
+arch woodfloor
+x 14
+y 5
+end
+arch wall_2_1_1
+x 14
+y 5
+end
+arch woodfloor
+x 14
+y 6
+end
+arch wall_2_1_1
+x 14
+y 6
+end
+arch woodfloor
+x 14
+y 7
+end
+arch wall_2_1_1
+x 14
+y 7
+end
+arch woodfloor
+x 14
+y 8
+end
+arch wall_2_1_1
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
+arch wall_1_2
+x 14
+y 9
+end
+arch light4
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 11
+end
+arch shop_empty
+x 14
+y 12
+end
+arch wall_2_1_2
+x 14
+y 12
+end
+arch woodfloor
+x 14
+y 13
+end
+arch woodfloor
+x 14
+y 14
+end
+arch wall_2_1_2
+x 14
+y 14
+end
+arch woodfloor
+x 14
+y 15
+end
+arch woodfloor
+x 14
+y 16
+end
+arch light4
+x 14
+y 17
+end
+arch woodfloor
+x 14
+y 17
+end
+arch woodfloor
+x 14
+y 17
+end
+arch stair3_gstone_do
+slaying alclass
+hp 8
+sp 16
+x 14
+y 17
+end
+arch woodfloor
+x 14
+y 18
+end
+arch wall_2_1_2
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
+x 14
+y 20
+end
+arch grass_only
+x 14
+y 21
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
+y 2
+end
+arch woodfloor
+x 15
+y 3
+end
+arch wall_2_1_2
+x 15
+y 3
+end
+arch shop_potions
+x 15
+y 4
+end
+arch shop_potions
+x 15
+y 5
+end
+arch shop_potions
+x 15
+y 6
+end
+arch shop_potions
+x 15
+y 7
+end
+arch shop_potions
+x 15
+y 8
+end
+arch shop_potions
+x 15
+y 9
+end
+arch shop_empty
+x 15
+y 10
+end
+arch shop_empty
+x 15
+y 11
+end
+arch shop_empty
+x 15
+y 12
+end
+arch wall_2_1_2
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch woodfloor
+x 15
+y 14
+end
+arch wall_2_2_3
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 15
+end
+arch window_win1
+x 15
+y 15
+end
+arch woodfloor
+x 15
+y 16
+end
+arch wall_2_1_1
+x 15
+y 16
+end
+arch woodfloor
+x 15
+y 17
+end
+arch wall_2_1_1
+x 15
+y 17
+end
+arch woodfloor
+x 15
+y 18
+end
+arch wall_3_1
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 15
+y 20
+end
+arch grass_only
+x 15
+y 21
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch grass_only
+x 16
+y 2
+end
+arch woodfloor
+x 16
+y 3
+end
+arch window_win2
+x 16
+y 3
+end
+arch shop_potions
+x 16
+y 4
+end
+arch shop_empty
+x 16
+y 5
+end
+arch shop_empty
+x 16
+y 6
+end
+arch light4
+x 16
+y 7
+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 wall_2_1_2
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 13
+end
+arch woodfloor
+x 16
+y 14
+end
+arch woodfloor
+x 16
+y 15
+end
+arch woodfloor
+x 16
+y 16
+end
+arch woodfloor
+x 16
+y 17
+end
+arch woodfloor
+x 16
+y 18
+end
+arch wall_2_1_2
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch grass_only
+x 16
+y 20
+end
+arch grass_only
+x 16
+y 21
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch grass_only
+x 17
+y 2
+end
+arch woodfloor
+x 17
+y 3
+end
+arch wall_2_1_2
+x 17
+y 3
+end
+arch shop_potions
+x 17
+y 4
+end
+arch shop_potions
+x 17
+y 5
+end
+arch shop_potions
+x 17
+y 6
+end
+arch shop_potions
+x 17
+y 7
+end
+arch shop_potions
+x 17
+y 8
+end
+arch shop_potions
+x 17
+y 9
+end
+arch shop_empty
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch light4
+x 17
+y 12
+end
+arch shop_empty
+x 17
+y 12
+end
+arch wall_3_3
+x 17
+y 12
+end
+arch woodfloor
+x 17
+y 13
+end
+arch window_win1
+x 17
+y 13
+end
+arch woodfloor
+x 17
+y 14
+end
+arch wall_2_1_1
+x 17
+y 14
+end
+arch woodfloor
+x 17
+y 15
+end
+arch wall_2_1_1
+x 17
+y 15
+end
+arch light4
+x 17
+y 16
+end
+arch woodfloor
+x 17
+y 16
+end
+arch wall_1_2
+x 17
+y 16
+end
+arch woodfloor
+x 17
+y 17
+end
+arch woodfloor
+x 17
+y 18
+end
+arch wall_2_1_2
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch grass_only
+x 17
+y 20
+end
+arch grass_only
+x 17
+y 21
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch grass_only
+x 18
+y 2
+end
+arch light4
+x 18
+y 3
+end
+arch woodfloor
+x 18
+y 3
+end
+arch wall_3_3
+x 18
+y 3
+end
+arch woodfloor
+x 18
+y 4
+end
+arch wall_2_1_1
+x 18
+y 4
+end
+arch woodfloor
+x 18
+y 5
+end
+arch wall_2_1_1
+x 18
+y 5
+end
+arch woodfloor
+x 18
+y 6
+end
+arch wall_2_1_1
+x 18
+y 6
+end
+arch woodfloor
+x 18
+y 7
+end
+arch wall_2_1_1
+x 18
+y 7
+end
+arch woodfloor
+x 18
+y 8
+end
+arch wall_2_1_1
+x 18
+y 8
+end
+arch woodfloor
+x 18
+y 9
+end
+arch wall_1_2
+x 18
+y 9
+end
+arch light4
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 11
+end
+arch shop_empty
+x 18
+y 12
+end
+arch wall_2_1_2
+x 18
+y 12
+end
+arch woodfloor
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch woodfloor
+x 18
+y 14
+end
+arch pedestal
+x 18
+y 14
+invisible 1
+connected 11
+end
+arch woodfloor
+x 18
+y 15
+end
+arch woodfloor
+x 18
+y 15
+end
+arch mdoor_closed_1
+x 18
+y 15
+connected 11
+end
+arch check_floor
+slaying potion_shop1
+x 18
+y 16
+connected 11
+end
+arch woodfloor
+x 18
+y 16
+end
+arch woodfloor
+x 18
+y 17
+end
+arch woodfloor
+x 18
+y 18
+end
+arch wall_2_1_2
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch grass_only
+x 18
+y 20
+end
+arch grass_only
+x 18
+y 21
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch woodfloor
+x 19
+y 3
+end
+arch wall_2_1_2
+x 19
+y 3
+end
+arch shop_minerals
+x 19
+y 4
+end
+arch shop_minerals
+x 19
+y 5
+end
+arch shop_minerals
+x 19
+y 6
+end
+arch shop_minerals
+x 19
+y 7
+end
+arch shop_minerals
+x 19
+y 8
+end
+arch shop_minerals
+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 wall_2_2_2
+x 19
+y 11
+end
+arch light4
+x 19
+y 12
+end
+arch shop_empty
+x 19
+y 12
+end
+arch wall_2_2_4
+x 19
+y 12
+end
+arch woodfloor
+x 19
+y 13
+end
+arch light4
+x 19
+y 14
+end
+arch woodfloor
+x 19
+y 14
+end
+arch wall_1_1
+x 19
+y 14
+end
+arch woodfloor
+x 19
+y 15
+end
+arch wall_2_1_1
+x 19
+y 15
+end
+arch woodfloor
+x 19
+y 16
+end
+arch window_win1
+x 19
+y 16
+end
+arch woodfloor
+x 19
+y 17
+end
+arch wall_2_1_1
+x 19
+y 17
+end
+arch light4
+x 19
+y 18
+end
+arch woodfloor
+x 19
+y 18
+end
+arch wall_3_1
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
+arch grass_only
+x 19
+y 20
+end
+arch grass_only
+x 19
+y 21
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch grass_only
+x 20
+y 2
+end
+arch woodfloor
+x 20
+y 3
+end
+arch window_win2
+x 20
+y 3
+end
+arch shop_minerals
+x 20
+y 4
+end
+arch shop_empty
+x 20
+y 5
+end
+arch shop_empty
+x 20
+y 6
+end
+arch light4
+x 20
+y 7
+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 wall_2_1_2
+x 20
+y 11
+end
+arch woodfloor
+x 20
+y 12
+end
+arch clock
+x 20
+y 12
+no_pick 1
+end
+arch woodfloor
+x 20
+y 13
+end
+arch woodfloor
+x 20
+y 14
+end
+arch woodfloor
+x 20
+y 15
+end
+arch woodfloor
+x 20
+y 16
+end
+arch woodfloor
+x 20
+y 17
+end
+arch diamond_converter
+name drop platinum to buy pyrite
+slaying money
+other_arch pyrite
+food 200
+x 20
+y 17
+end
+arch woodfloor
+x 20
+y 18
+end
+arch wall_2_1_2
+x 20
+y 18
+end
+arch grass_only
+x 20
+y 19
+end
+arch grass_only
+x 20
+y 20
+end
+arch grass_only
+x 20
+y 21
+end
+arch grass_only
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch grass_only
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch wall_2_1_2
+x 21
+y 3
+end
+arch shop_minerals
+x 21
+y 4
+end
+arch shop_minerals
+x 21
+y 5
+end
+arch shop_minerals
+x 21
+y 6
+end
+arch shop_minerals
+x 21
+y 7
+end
+arch shop_minerals
+x 21
+y 8
+end
+arch shop_minerals
+x 21
+y 9
+end
+arch shop_empty
+x 21
+y 10
+end
+arch shop_empty
+x 21
+y 11
+end
+arch window_win2
+x 21
+y 11
+end
+arch woodfloor
+x 21
+y 12
+end
 arch table_3
 name lab bench
-x 13
-y 1
+x 21
+y 12
 no_pick 1
 end
 arch book_read
@@ -1170,629 +2650,909 @@ Then perform the skill of alchemy on it.
 If your recipe is true and your skill is sufficient,
 then you will have made what you hoped for.
 endmsg
-x 13
-y 1
+x 21
+y 12
 level 6
 no_pick 1
 end
 arch woodfloor
-x 13
-y 2
+x 21
+y 13
 end
 arch woodfloor
-x 13
-y 3
-end
-arch woodfloor
-x 13
-y 4
+x 21
+y 14
 end
 arch cauldron
-x 13
-y 4
+x 21
+y 14
 no_pick 1
 end
 arch woodfloor
-x 13
+x 21
+y 15
+end
+arch woodfloor
+x 21
+y 16
+end
+arch woodfloor
+x 21
+y 17
+end
+arch diamond_converter
+name drop platinum to buy gypsum
+slaying money
+other_arch gypsum
+food 200
+x 21
+y 17
+end
+arch light4
+x 21
+y 18
+end
+arch woodfloor
+x 21
+y 18
+end
+arch window_win2
+x 21
+y 18
+end
+arch grass_only
+x 21
+y 19
+end
+arch grass_only
+x 21
+y 20
+end
+arch grass_only
+x 21
+y 21
+end
+arch grass_only
+x 22
+end
+arch grass_only
+x 22
+y 1
+end
+arch grass_only
+x 22
+y 2
+end
+arch light4
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 3
+end
+arch wall_3_3
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 4
+end
+arch wall_2_1_1
+x 22
+y 4
+end
+arch woodfloor
+x 22
+y 5
+end
+arch wall_2_1_1
+x 22
 y 5
 end
 arch woodfloor
-x 13
+x 22
 y 6
 end
-arch wwall_2_2_3
-x 13
+arch wall_2_1_1
+x 22
 y 6
 end
 arch woodfloor
-x 13
+x 22
 y 7
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_1
+x 22
 y 7
 end
 arch woodfloor
-x 13
+x 22
 y 8
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_1
+x 22
 y 8
 end
 arch woodfloor
-x 13
+x 22
 y 9
 end
-arch wwall_2_2_4
-x 13
+arch wall_1_2
+x 22
 y 9
 end
-arch woodfloor
-x 13
+arch light4
+x 22
 y 10
 end
-arch woodfloor
-x 13
+arch shop_empty
+x 22
+y 10
+end
+arch shop_empty
+x 22
+y 11
+end
+arch wall_2_1_2
+x 22
 y 11
 end
 arch woodfloor
-x 13
+x 22
 y 12
 end
-arch bench_2_2_3
-x 13
+arch woodfloor
+x 22
 y 12
-move_block all
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 13
-y 13
-end
-arch bench_2_1_1
-x 13
-y 13
-move_block all
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 13
-y 14
-end
-arch bench_1_2
-x 13
-y 14
-move_block all
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 13
-y 15
-end
-arch wwall_1_3
-x 13
-y 15
-end
-arch woodfloor
-x 14
-end
-arch wwall_2_1_2
-x 14
-end
-arch woodfloor
-x 14
-y 1
 end
 arch table_3
 name lab bench
-x 14
-y 1
+x 22
+y 12
 no_pick 1
 end
 arch woodfloor
-x 14
-y 2
-end
-arch woodfloor
-x 14
-y 3
-end
-arch woodfloor
-x 14
-y 4
-end
-arch woodfloor
-x 14
-y 5
-end
-arch woodfloor
-x 14
-y 6
-end
-arch pedestal
-x 14
-y 6
-invisible 1
-connected 11
-end
-arch woodfloor
-x 14
-y 7
-end
-arch mdoor_closed_1
-x 14
-y 7
-connected 11
-end
-arch woodfloor
-x 14
-y 8
-end
-arch check_floor
-slaying potion_shop1
-x 14
-y 8
-connected 11
-end
-arch woodfloor
-x 14
-y 9
-end
-arch woodfloor
-x 14
-y 10
-end
-arch woodfloor
-x 14
-y 11
-end
-arch woodfloor
-x 14
-y 12
-end
-arch woodfloor
-x 14
+x 22
 y 13
 end
 arch woodfloor
-x 14
+x 22
+y 14
+end
+arch light4
+x 22
+y 15
+end
+arch woodfloor
+x 22
+y 15
+end
+arch woodfloor
+x 22
+y 16
+end
+arch woodfloor
+x 22
+y 17
+end
+arch diamond_converter
+name drop platinum to buy phosphorus
+slaying money
+other_arch phosphorus
+food 800
+x 22
+y 17
+end
+arch woodfloor
+x 22
+y 18
+end
+arch wall_2_1_2
+x 22
+y 18
+end
+arch grass_only
+x 22
+y 19
+end
+arch grass_only
+x 22
+y 20
+end
+arch grass_only
+x 22
+y 21
+end
+arch grass_only
+x 23
+end
+arch grass_only
+x 23
+y 1
+end
+arch grass_only
+x 23
+y 2
+end
+arch woodfloor
+x 23
+y 3
+end
+arch window_win2
+x 23
+y 3
+end
+arch shop_alchemy
+x 23
+y 4
+end
+arch shop_alchemy
+x 23
+y 5
+end
+arch shop_alchemy
+x 23
+y 6
+end
+arch shop_alchemy
+x 23
+y 7
+end
+arch shop_alchemy
+x 23
+y 8
+end
+arch shop_alchemy
+x 23
+y 9
+end
+arch shop_empty
+x 23
+y 10
+end
+arch shop_empty
+x 23
+y 11
+end
+arch window_win2
+x 23
+y 11
+end
+arch woodfloor
+x 23
+y 12
+end
+arch woodfloor
+x 23
+y 13
+end
+arch woodfloor
+x 23
 y 14
 end
 arch woodfloor
-x 14
-y 15
-end
-arch oakdoor_2
-slaying /world/world_104_115
-hp 44
-sp 37
-x 14
+x 23
 y 15
 end
 arch woodfloor
-x 15
-end
-arch wwall_2_1_2
-x 15
+x 23
+y 16
 end
 arch woodfloor
-x 15
+x 23
+y 17
+end
+arch diamond_converter
+name drop platinum to buy salt
+slaying money
+other_arch salt
+food 250
+x 23
+y 17
+end
+arch woodfloor
+x 23
+y 18
+end
+arch wall_2_1_2
+x 23
+y 18
+end
+arch grass_only
+x 23
+y 19
+end
+arch grass_only
+x 23
+y 20
+end
+arch grass_only
+x 23
+y 21
+end
+arch grass_only
+x 24
+end
+arch grass_only
+x 24
 y 1
 end
+arch grass_only
+x 24
+y 2
+end
+arch woodfloor
+x 24
+y 3
+end
+arch wall_2_1_2
+x 24
+y 3
+end
+arch shop_empty
+x 24
+y 4
+end
+arch shop_empty
+x 24
+y 5
+end
+arch shop_empty
+x 24
+y 6
+end
+arch light4
+x 24
+y 7
+end
+arch shop_empty
+x 24
+y 7
+end
+arch shop_empty
+x 24
+y 8
+end
+arch shop_empty
+x 24
+y 9
+end
+arch shop_empty
+x 24
+y 10
+end
+arch shop_empty
+x 24
+y 11
+end
+arch wall_2_1_2
+x 24
+y 11
+end
+arch woodfloor
+x 24
+y 12
+end
 arch diamond_converter
 name drop gold to buy keys
 slaying money
 other_arch key
 sp 1
 food 100
-x 15
-y 1
-end
-arch woodfloor
-x 15
-y 2
-end
-arch diamond_converter
-name drop platinum to buy pyrite
-slaying money
-other_arch pyrite
-food 200
-x 15
-y 2
-end
-arch woodfloor
-x 15
-y 3
-end
-arch diamond_converter
-name drop platinum to buy gypsum
-slaying money
-other_arch gypsum
-food 200
-x 15
-y 3
-end
-arch woodfloor
-x 15
-y 4
-end
-arch diamond_converter
-name drop platinum to buy phosphorus
-slaying money
-other_arch phosphorus
-food 800
-x 15
-y 4
-end
-arch woodfloor
-x 15
-y 5
-end
-arch diamond_converter
-name drop platinum to buy salt
-slaying money
-other_arch salt
-food 250
-x 15
-y 5
-end
-arch woodfloor
-x 15
-y 6
-end
-arch wwall_2_2_2
-x 15
-y 6
-end
-arch woodfloor
-x 15
-y 7
-end
-arch wwall_2_1_1
-x 15
-y 7
-end
-arch woodfloor
-x 15
-y 8
-end
-arch wwall_2_2_1
-x 15
-y 8
-end
-arch woodfloor
-x 15
-y 9
-end
-arch woodfloor
-x 15
-y 10
-end
-arch woodfloor
-x 15
-y 11
-end
-arch woodfloor
-x 15
+x 24
 y 12
 end
 arch woodfloor
-x 15
+x 24
 y 13
 end
-arch woodfloor
-x 15
-y 14
-end
-arch woodfloor
-x 15
-y 15
-end
-arch wwall_1_4
-x 15
-y 15
-end
-arch woodfloor
-x 16
-end
-arch wwall_2_1_2
-x 16
-end
-arch woodfloor
-x 16
-y 1
-end
 arch diamond_converter
 name drop platinum to buy water
 slaying money
 other_arch water
 food 50
-x 16
-y 1
+x 24
+y 13
 end
 arch woodfloor
-x 16
-y 2
+x 24
+y 14
 end
 arch diamond_converter
 name drop platinum to buy lead
 slaying money
 other_arch lead
 food 1800
-x 16
-y 2
+x 24
+y 14
 end
 arch woodfloor
-x 16
-y 3
+x 24
+y 15
 end
 arch diamond_converter
 name drop platinum to buy mineral oil
 slaying money
 other_arch min_oil
 food 200
-x 16
-y 3
+x 24
+y 15
 end
 arch woodfloor
-x 16
-y 4
+x 24
+y 16
 end
 arch diamond_converter
 name drop platinum to buy cinnabar
 slaying money
 other_arch cinnabar
 food 1200
-x 16
-y 4
+x 24
+y 16
 end
 arch woodfloor
-x 16
-y 5
+x 24
+y 17
 end
 arch diamond_converter
 name drop platinum to buy sulphur
 slaying money
 other_arch sulphur
 food 400
-x 16
-y 5
-end
-arch dungeon_magic
-x 16
-y 6
+x 24
+y 17
 end
 arch woodfloor
-x 16
-y 6
+x 24
+y 18
 end
-arch wwall_win2
-x 16
-y 6
+arch wall_2_1_2
+x 24
+y 18
 end
-arch grass
-x 16
-y 7
+arch grass_only
+x 24
+y 19
 end
-arch tree4
-x 16
-y 7
+arch grass_only
+x 24
+y 20
 end
-arch woodfloor
-x 16
-y 8
+arch grass_only
+x 24
+y 21
 end
-arch wwall_2_1_2
-x 16
-y 8
+arch grass_only
+x 25
 end
-arch woodfloor
-x 16
-y 9
-end
-arch trigger_marker
-slaying potion_shop1
-msg
-You have one day's use of these facilities.
-endmsg
-food 504
-x 16
-y 9
-speed 1.0
-connected 10
-end
-arch altar_trigger
-name Drop 200 platinum for day pass
-slaying money
-food 10000
-x 16
-y 9
-connected 10
-end
-arch woodfloor
-x 16
-y 10
-end
-arch wwall_1_4
-x 16
-y 10
-end
-arch woodfloor
-x 16
-y 11
-end
-arch stair3_gstone_do
-slaying alclass
-hp 8
-sp 16
-x 16
-y 11
-end
-arch woodfloor
-x 16
-y 12
-end
-arch wwall_1_4
-x 16
-y 12
-end
-arch woodfloor
-x 16
-y 13
-end
-arch diamond_converter
-name Mana Potion: 1400 pp
-slaying money
-other_arch potion_magic
-sp 1
-food 70000
-x 16
-y 13
-end
-arch woodfloor
-x 16
-y 14
-end
-arch diamond_converter
-name Healing Potion: 1400 pp
-slaying money
-other_arch potion_heal
-sp 1
-food 70000
-x 16
-y 14
-end
-arch woodfloor
-x 16
-y 15
-end
-arch wwall_2_1_2
-x 16
-y 15
-end
-arch woodfloor
-x 17
-end
-arch wwall_2_2_3
-x 17
-end
-arch woodfloor
-x 17
+arch grass_only
+x 25
 y 1
 end
-arch wwall_2_1_1
-x 17
-y 1
-end
-arch woodfloor
-x 17
+arch grass_only
+x 25
 y 2
 end
-arch wwall_2_1_1
-x 17
-y 2
-end
-arch woodfloor
-x 17
-y 3
-end
-arch wwall_2_1_1
-x 17
+arch light4
+x 25
 y 3
 end
 arch woodfloor
-x 17
+x 25
+y 3
+end
+arch wall_2_2_3
+x 25
+y 3
+end
+arch woodfloor
+x 25
 y 4
 end
-arch wwall_2_1_1
-x 17
+arch wall_2_1_1
+x 25
 y 4
 end
 arch woodfloor
-x 17
+x 25
 y 5
 end
-arch wwall_2_1_1
-x 17
+arch wall_2_1_1
+x 25
 y 5
 end
 arch woodfloor
-x 17
+x 25
 y 6
 end
-arch wwall_2_2_4
-x 17
+arch wall_2_1_1
+x 25
 y 6
 end
-arch grass
-x 17
+arch light2
+x 25
 y 7
 end
 arch woodfloor
-x 17
+x 25
+y 7
+end
+arch window_win1
+x 25
+y 7
+end
+arch woodfloor
+x 25
 y 8
 end
-arch wwall_2_2_3
-x 17
+arch wall_2_1_1
+x 25
 y 8
 end
 arch woodfloor
-x 17
+x 25
 y 9
 end
-arch wwall_2_1_1
-x 17
+arch wall_2_1_1
+x 25
 y 9
 end
 arch woodfloor
-x 17
+x 25
 y 10
 end
-arch wwall_3_4
-x 17
+arch wall_2_1_1
+x 25
 y 10
 end
-arch woodfloor
-x 17
-y 11
-end
-arch wwall_2_1_1
-x 17
+arch light4
+x 25
 y 11
 end
 arch woodfloor
-x 17
-y 12
+x 25
+y 11
 end
-arch wwall_3_4
-x 17
-y 12
+arch wall_3_4
+x 25
+y 11
 end
 arch woodfloor
-x 17
-y 13
+x 25
+y 12
 end
-arch wwall_2_1_1
-x 17
+arch wall_2_1_1
+x 25
+y 12
+end
+arch light2
+x 25
 y 13
 end
 arch woodfloor
-x 17
+x 25
+y 13
+end
+arch window_win1
+x 25
+y 13
+end
+arch woodfloor
+x 25
 y 14
 end
-arch wwall_2_1_1
-x 17
+arch wall_2_1_1
+x 25
 y 14
 end
 arch woodfloor
-x 17
+x 25
 y 15
 end
-arch wwall_2_2_4
-x 17
+arch wall_2_1_1
+x 25
 y 15
 end
+arch woodfloor
+x 25
+y 16
+end
+arch wall_2_1_1
+x 25
+y 16
+end
+arch woodfloor
+x 25
+y 17
+end
+arch wall_2_1_1
+x 25
+y 17
+end
+arch light4
+x 25
+y 18
+end
+arch woodfloor
+x 25
+y 18
+end
+arch wall_2_2_4
+x 25
+y 18
+end
+arch grass_only
+x 25
+y 19
+end
+arch grass_only
+x 25
+y 20
+end
+arch grass_only
+x 25
+y 21
+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 grass_only
+x 26
+y 20
+end
+arch grass_only
+x 26
+y 21
+end
+arch grass_only
+x 27
+end
+arch grass_only
+x 27
+y 1
+end
+arch grass_only
+x 27
+y 2
+end
+arch grass_only
+x 27
+y 3
+end
+arch grass_only
+x 27
+y 4
+end
+arch grass_only
+x 27
+y 5
+end
+arch grass_only
+x 27
+y 6
+end
+arch grass_only
+x 27
+y 7
+end
+arch grass_only
+x 27
+y 8
+end
+arch grass_only
+x 27
+y 9
+end
+arch grass_only
+x 27
+y 10
+end
+arch grass_only
+x 27
+y 11
+end
+arch grass_only
+x 27
+y 12
+end
+arch grass_only
+x 27
+y 13
+end
+arch grass_only
+x 27
+y 14
+end
+arch grass_only
+x 27
+y 15
+end
+arch grass_only
+x 27
+y 16
+end
+arch grass_only
+x 27
+y 17
+end
+arch grass_only
+x 27
+y 18
+end
+arch grass_only
+x 27
+y 19
+end
+arch grass_only
+x 27
+y 20
+end
+arch grass_only
+x 27
+y 21
+end
+arch grass_only
+x 28
+end
+arch grass_only
+x 28
+y 1
+end
+arch grass_only
+x 28
+y 2
+end
+arch grass_only
+x 28
+y 3
+end
+arch grass_only
+x 28
+y 4
+end
+arch grass_only
+x 28
+y 5
+end
+arch grass_only
+x 28
+y 6
+end
+arch grass_only
+x 28
+y 7
+end
+arch grass_only
+x 28
+y 8
+end
+arch grass_only
+x 28
+y 9
+end
+arch grass_only
+x 28
+y 10
+end
+arch grass_only
+x 28
+y 11
+end
+arch grass_only
+x 28
+y 12
+end
+arch grass_only
+x 28
+y 13
+end
+arch grass_only
+x 28
+y 14
+end
+arch grass_only
+x 28
+y 15
+end
+arch grass_only
+x 28
+y 16
+end
+arch grass_only
+x 28
+y 17
+end
+arch grass_only
+x 28
+y 18
+end
+arch grass_only
+x 28
+y 19
+end
+arch grass_only
+x 28
+y 20
+end
+arch grass_only
+x 28
+y 21
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 2190c4ecb..afb8be5c1 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2011-04-06 Rick Tanner
+Modified: 2011-04-10 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -12910,8 +12910,8 @@ end
 arch store_alchemy
 name Alchemy Shop
 slaying /scorn/shops/potionshop
-hp 14
-sp 14
+hp 6
+sp 16
 x 44
 y 36
 end
@@ -12919,7 +12919,7 @@ arch dungeon_magic
 x 44
 y 37
 end
-arch grass
+arch cobblestones2
 x 44
 y 37
 end