diff --git a/scorn/shops/alclass b/scorn/shops/alclass
new file mode 100644
index 000000000..c231ccce7
--- /dev/null
+++ b/scorn/shops/alclass
@@ -0,0 +1,2121 @@
+arch map
+name alclass
+region scorn
+msg
+Creator: CF Java Map Editor
+Date:    8/10/2005
+endmsg
+width 17
+height 17
+enter_x 8
+enter_y 16
+end
+arch flagstone
+end
+arch awall_2_2_2
+end
+arch flagstone
+y 1
+end
+arch awall_2_1_1
+y 1
+end
+arch flagstone
+y 2
+end
+arch awall_2_1_1
+y 2
+end
+arch flagstone
+y 3
+end
+arch awall_2_1_1
+y 3
+end
+arch flagstone
+y 4
+end
+arch awall_2_1_1
+y 4
+end
+arch flagstone
+y 5
+end
+arch awall_2_1_1
+y 5
+end
+arch flagstone
+y 6
+end
+arch awall_2_1_1
+y 6
+end
+arch flagstone
+y 7
+end
+arch awall_2_1_1
+y 7
+end
+arch flagstone
+y 8
+end
+arch awall_2_1_1
+y 8
+end
+arch flagstone
+y 9
+end
+arch awall_2_1_1
+y 9
+end
+arch flagstone
+y 10
+end
+arch awall_2_1_1
+y 10
+end
+arch flagstone
+y 11
+end
+arch awall_2_1_1
+y 11
+end
+arch flagstone
+y 12
+end
+arch awall_2_1_1
+y 12
+end
+arch flagstone
+y 13
+end
+arch awall_2_1_1
+y 13
+end
+arch flagstone
+y 14
+end
+arch awall_2_1_1
+y 14
+end
+arch flagstone
+y 15
+end
+arch awall_2_1_1
+y 15
+end
+arch flagstone
+y 16
+end
+arch awall_2_2_1
+y 16
+end
+arch flagstone
+x 1
+end
+arch awall_2_1_2
+x 1
+end
+arch flagstone
+x 1
+y 1
+end
+arch chair_1.4
+no_pick 1
+x 1
+y 1
+end
+arch flagstone
+x 1
+y 2
+end
+arch table
+no_pick 1
+x 1
+y 2
+end
+arch flagstone
+x 1
+y 3
+end
+arch swall_1_4
+x 1
+y 3
+end
+arch flagstone
+no_magic 1
+x 1
+y 4
+end
+arch flagstone
+x 1
+y 5
+end
+arch swall_1_4
+x 1
+y 5
+end
+arch flagstone
+no_magic 1
+x 1
+y 6
+end
+arch diamond_converter
+name drop platinum to buy salt
+slaying platinacoin
+other_arch salt
+food 5
+x 1
+y 6
+end
+arch flagstone
+no_magic 1
+x 1
+y 7
+end
+arch diamond_converter
+name drop platinum to buy sulphur
+slaying platinacoin
+other_arch sulphur
+food 8
+x 1
+y 7
+end
+arch flagstone
+no_magic 1
+x 1
+y 8
+end
+arch diamond_converter
+name drop platinum to buy phosphorus
+slaying platinacoin
+other_arch phosphorus
+food 16
+x 1
+y 8
+end
+arch flagstone
+no_magic 1
+x 1
+y 9
+end
+arch diamond_converter
+name drop platinum to buy cinnabar
+slaying platinacoin
+other_arch cinnabar
+food 24
+x 1
+y 9
+end
+arch flagstone
+no_magic 1
+x 1
+y 10
+end
+arch diamond_converter
+name drop platinum to buy water
+slaying platinacoin
+other_arch water
+food 1
+x 1
+y 10
+end
+arch flagstone
+x 1
+y 11
+end
+arch swall_1_4
+x 1
+y 11
+end
+arch flagstone
+no_magic 1
+x 1
+y 12
+end
+arch flagstone
+no_magic 1
+x 1
+y 13
+end
+arch flagstone
+no_magic 1
+x 1
+y 14
+end
+arch flagstone
+no_magic 1
+x 1
+y 15
+end
+arch flagstone
+x 1
+y 16
+end
+arch awall_2_1_2
+x 1
+y 16
+end
+arch flagstone
+x 2
+end
+arch awall_2_1_2
+x 2
+end
+arch flagstone
+x 2
+y 1
+end
+arch cauldron
+no_pick 1
+x 2
+y 1
+end
+arch flagstone
+x 2
+y 2
+end
+arch flagstone
+no_magic 1
+x 2
+y 3
+end
+arch ggate_closed
+connected 3
+no_magic 1
+x 2
+y 3
+end
+arch flagstone
+no_magic 1
+x 2
+y 4
+end
+arch flagstone
+x 2
+y 5
+end
+arch swall_2_1_2
+x 2
+y 5
+end
+arch flagstone
+no_magic 1
+x 2
+y 6
+end
+arch diamond_converter
+name drop platinum to buy mineral oil
+slaying platinacoin
+other_arch min_oil
+food 4
+x 2
+y 6
+end
+arch flagstone
+no_magic 1
+x 2
+y 7
+end
+arch diamond_converter
+name drop platinum to buy pyrite
+slaying platinacoin
+other_arch pyrite
+food 4
+x 2
+y 7
+end
+arch flagstone
+no_magic 1
+x 2
+y 8
+end
+arch diamond_converter
+name drop platinum to buy lead
+slaying platinacoin
+other_arch lead
+food 36
+x 2
+y 8
+end
+arch flagstone
+no_magic 1
+x 2
+y 9
+end
+arch diamond_converter
+name drop platinum to buy salt
+slaying platinacoin
+other_arch salt
+x 2
+y 9
+end
+arch flagstone
+no_magic 1
+x 2
+y 10
+end
+arch diamond_converter
+name drop platinum to buy gypsum
+slaying platinacoin
+other_arch gypsum
+food 4
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 11
+end
+arch swall_2_1_2
+x 2
+y 11
+end
+arch flagstone
+no_magic 1
+x 2
+y 12
+end
+arch flagstone
+no_magic 1
+x 2
+y 13
+end
+arch flagstone
+no_magic 1
+x 2
+y 14
+end
+arch flagstone
+no_magic 1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch awall_2_1_2
+x 2
+y 16
+end
+arch flagstone
+x 3
+end
+arch awall_2_1_2
+x 3
+end
+arch flagstone
+x 3
+y 1
+end
+arch swall_1_1
+x 3
+y 1
+end
+arch flagstone
+x 3
+y 2
+end
+arch swall_2_1_1
+x 3
+y 2
+end
+arch flagstone
+x 3
+y 3
+end
+arch swall_3_1
+x 3
+y 3
+end
+arch flagstone
+no_magic 1
+x 3
+y 4
+end
+arch flagstone
+x 3
+y 5
+end
+arch swall_2_2_3
+x 3
+y 5
+end
+arch flagstone
+x 3
+y 6
+end
+arch swall_2_1_1
+x 3
+y 6
+end
+arch flagstone
+x 3
+y 7
+end
+arch swall_1_2
+x 3
+y 7
+end
+arch flagstone
+x 3
+y 8
+end
+arch grate_closed_2
+connected 1
+no_magic 1
+x 3
+y 8
+end
+arch flagstone
+x 3
+y 9
+end
+arch swall_1_1
+x 3
+y 9
+end
+arch flagstone
+x 3
+y 10
+end
+arch swall_2_1_1
+x 3
+y 10
+end
+arch flagstone
+x 3
+y 11
+end
+arch swall_3_4
+x 3
+y 11
+end
+arch flagstone
+x 3
+y 12
+end
+arch swall_1_2
+x 3
+y 12
+end
+arch flagstone
+no_magic 1
+x 3
+y 13
+end
+arch grate_closed_2
+connected 1
+no_magic 1
+x 3
+y 13
+end
+arch flagstone
+x 3
+y 14
+end
+arch swall_1_1
+x 3
+y 14
+end
+arch flagstone
+x 3
+y 15
+end
+arch swall_1_2
+x 3
+y 15
+end
+arch flagstone
+x 3
+y 16
+end
+arch awall_2_1_2
+x 3
+y 16
+end
+arch flagstone
+x 4
+end
+arch awall_2_1_2
+x 4
+end
+arch flagstone
+x 4
+y 1
+end
+arch chair_1.4
+no_pick 1
+x 4
+y 1
+end
+arch flagstone
+x 4
+y 2
+end
+arch table
+no_pick 1
+x 4
+y 2
+end
+arch flagstone
+x 4
+y 3
+end
+arch swall_2_1_2
+x 4
+y 3
+end
+arch flagstone
+no_magic 1
+x 4
+y 4
+end
+arch flagstone
+no_magic 1
+x 4
+y 5
+end
+arch flagstone
+no_magic 1
+x 4
+y 6
+end
+arch flagstone
+no_magic 1
+x 4
+y 7
+end
+arch flagstone
+no_magic 1
+x 4
+y 8
+end
+arch flagstone
+no_magic 1
+x 4
+y 9
+end
+arch flagstone
+no_magic 1
+x 4
+y 10
+end
+arch flagstone
+no_magic 1
+x 4
+y 11
+end
+arch flagstone
+no_magic 1
+x 4
+y 12
+end
+arch flagstone
+no_magic 1
+x 4
+y 13
+end
+arch flagstone
+no_magic 1
+x 4
+y 14
+end
+arch flagstone
+no_magic 1
+x 4
+y 15
+end
+arch flagstone
+x 4
+y 16
+end
+arch awall_2_1_2
+x 4
+y 16
+end
+arch flagstone
+x 5
+end
+arch awall_2_1_2
+x 5
+end
+arch flagstone
+x 5
+y 1
+end
+arch cauldron
+no_pick 1
+x 5
+y 1
+end
+arch flagstone
+x 5
+y 2
+end
+arch flagstone
+no_magic 1
+x 5
+y 3
+end
+arch ggate_closed
+connected 3
+no_magic 1
+x 5
+y 3
+end
+arch flagstone
+no_magic 1
+x 5
+y 4
+end
+arch flagstone
+no_magic 1
+x 5
+y 5
+end
+arch flagstone
+no_magic 1
+x 5
+y 6
+end
+arch flagstone
+no_magic 1
+x 5
+y 7
+end
+arch flagstone
+no_magic 1
+x 5
+y 8
+end
+arch flagstone
+no_magic 1
+x 5
+y 9
+end
+arch flagstone
+no_magic 1
+x 5
+y 10
+end
+arch chair_1.4
+no_pick 1
+x 5
+y 10
+end
+arch flagstone
+no_magic 1
+x 5
+y 11
+end
+arch chair_1.4
+no_pick 1
+x 5
+y 11
+end
+arch flagstone
+no_magic 1
+x 5
+y 12
+end
+arch flagstone
+no_magic 1
+x 5
+y 13
+end
+arch flagstone
+no_magic 1
+x 5
+y 14
+end
+arch flagstone
+no_magic 1
+x 5
+y 15
+end
+arch flagstone
+x 5
+y 16
+end
+arch awall_2_1_2
+x 5
+y 16
+end
+arch flagstone
+x 6
+end
+arch awall_2_1_2
+x 6
+end
+arch flagstone
+x 6
+y 1
+end
+arch swall_1_1
+x 6
+y 1
+end
+arch flagstone
+x 6
+y 2
+end
+arch swall_2_1_1
+x 6
+y 2
+end
+arch flagstone
+x 6
+y 3
+end
+arch swall_3_1
+x 6
+y 3
+end
+arch flagstone
+no_magic 1
+x 6
+y 4
+end
+arch flagstone
+no_magic 1
+x 6
+y 5
+end
+arch flagstone
+x 6
+y 6
+end
+arch swall_2_2_2
+x 6
+y 6
+end
+arch flagstone
+x 6
+y 7
+end
+arch swall_2_1_1
+x 6
+y 7
+end
+arch flagstone
+x 6
+y 8
+end
+arch swall_2_1_1
+x 6
+y 8
+end
+arch flagstone
+x 6
+y 9
+end
+arch swall_2_1_1
+x 6
+y 9
+end
+arch flagstone
+x 6
+y 10
+end
+arch swall_2_1_1
+x 6
+y 10
+end
+arch flagstone
+x 6
+y 11
+end
+arch swall_2_2_1
+x 6
+y 11
+end
+arch flagstone
+no_magic 1
+x 6
+y 12
+end
+arch chair_1.3
+no_pick 1
+x 6
+y 12
+end
+arch flagstone
+no_magic 1
+x 6
+y 13
+end
+arch flagstone
+no_magic 1
+x 6
+y 14
+end
+arch flagstone
+no_magic 1
+x 6
+y 15
+end
+arch flagstone
+x 6
+y 16
+end
+arch awall_2_1_2
+x 6
+y 16
+end
+arch flagstone
+x 7
+end
+arch awall_2_1_2
+x 7
+end
+arch flagstone
+x 7
+y 1
+end
+arch table
+no_pick 1
+x 7
+y 1
+end
+arch flagstone
+x 7
+y 2
+end
+arch flagstone
+x 7
+y 3
+end
+arch swall_2_1_2
+x 7
+y 3
+end
+arch flagstone
+no_magic 1
+x 7
+y 4
+end
+arch flagstone
+no_magic 1
+x 7
+y 5
+end
+arch flagstone
+x 7
+y 6
+end
+arch swall_1_3
+x 7
+y 6
+end
+arch flagstone
+no_magic 1
+x 7
+y 7
+end
+arch bookshelf
+no_pick 1
+x 7
+y 7
+end
+arch flagstone
+x 7
+y 8
+end
+arch flagstone
+x 7
+y 9
+end
+arch button_lever
+name ingredients rooms
+connected 1
+x 7
+y 9
+end
+arch flagstone
+x 7
+y 10
+end
+arch table_3
+no_pick 1
+x 7
+y 10
+end
+arch flagstone
+x 7
+y 11
+end
+arch swall_2_1_2
+x 7
+y 11
+end
+arch flagstone
+no_magic 1
+x 7
+y 12
+end
+arch chair_1.3
+no_pick 1
+x 7
+y 12
+end
+arch flagstone
+no_magic 1
+x 7
+y 13
+end
+arch flagstone
+no_magic 1
+x 7
+y 14
+end
+arch awall_1_1
+x 7
+y 14
+end
+arch flagstone
+no_magic 1
+x 7
+y 15
+end
+arch awall_2_1_1
+x 7
+y 15
+end
+arch flagstone
+x 7
+y 16
+end
+arch awall_2_2_4
+x 7
+y 16
+end
+arch flagstone
+x 8
+end
+arch awall_2_1_2
+x 8
+end
+arch flagstone
+x 8
+y 1
+end
+arch cauldron
+no_pick 1
+x 8
+y 1
+end
+arch flagstone
+x 8
+y 2
+end
+arch chair_1.3
+no_pick 1
+x 8
+y 2
+end
+arch flagstone
+no_magic 1
+x 8
+y 3
+end
+arch ggate_closed
+connected 3
+no_magic 1
+x 8
+y 3
+end
+arch flagstone
+no_magic 1
+x 8
+y 4
+end
+arch flagstone
+no_magic 1
+x 8
+y 5
+end
+arch flagstone
+no_magic 1
+x 8
+y 6
+end
+arch grate_open_1
+connected 2
+no_magic 1
+x 8
+y 6
+end
+arch flagstone
+no_magic 1
+x 8
+y 7
+end
+arch button_lever
+name teacher door
+connected 2
+x 8
+y 7
+end
+arch flagstone
+x 8
+y 8
+end
+arch button_lever
+name student rooms
+connected 3
+x 8
+y 8
+end
+arch flagstone
+x 8
+y 9
+end
+arch chair_3.1
+no_pick 1
+x 8
+y 9
+end
+arch flagstone
+x 8
+y 10
+end
+arch cauldron
+no_pick 1
+x 8
+y 10
+end
+arch flagstone
+x 8
+y 11
+end
+arch swall_2_1_2
+x 8
+y 11
+end
+arch flagstone
+no_magic 1
+x 8
+y 12
+end
+arch flagstone
+no_magic 1
+x 8
+y 13
+end
+arch flagstone
+no_magic 1
+x 8
+y 14
+end
+arch grate_closed_1
+connected 4
+no_magic 1
+x 8
+y 14
+end
+arch flagstone
+no_magic 1
+x 8
+y 15
+end
+arch altar_trigger
+name drop 2000 platinum to access alchemy classroom
+slaying platinacoin
+food 2000
+connected 4
+last_sp 1
+x 8
+y 15
+end
+arch flagstone
+no_magic 1
+x 8
+y 16
+end
+arch stair3_gstone_up
+slaying potionshop
+hp 16
+sp 11
+x 8
+y 16
+end
+arch flagstone
+x 9
+end
+arch awall_2_1_2
+x 9
+end
+arch flagstone
+x 9
+y 1
+end
+arch table
+no_pick 1
+x 9
+y 1
+end
+arch flagstone
+x 9
+y 2
+end
+arch flagstone
+x 9
+y 3
+end
+arch swall_2_1_2
+x 9
+y 3
+end
+arch flagstone
+no_magic 1
+x 9
+y 4
+end
+arch flagstone
+no_magic 1
+x 9
+y 5
+end
+arch flagstone
+x 9
+y 6
+end
+arch swall_1_4
+x 9
+y 6
+end
+arch flagstone
+no_magic 1
+x 9
+y 7
+end
+arch clock
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
+arch flagstone
+x 9
+y 9
+end
+arch flagstone
+x 9
+y 10
+end
+arch table_3
+no_pick 1
+x 9
+y 10
+end
+arch flagstone
+x 9
+y 11
+end
+arch swall_2_1_2
+x 9
+y 11
+end
+arch flagstone
+no_magic 1
+x 9
+y 12
+end
+arch chair_1.3
+no_pick 1
+x 9
+y 12
+end
+arch flagstone
+no_magic 1
+x 9
+y 13
+end
+arch flagstone
+no_magic 1
+x 9
+y 14
+end
+arch awall_1_1
+x 9
+y 14
+end
+arch flagstone
+no_magic 1
+x 9
+y 15
+end
+arch awall_2_1_1
+x 9
+y 15
+end
+arch flagstone
+x 9
+y 16
+end
+arch awall_2_2_1
+x 9
+y 16
+end
+arch flagstone
+x 10
+end
+arch awall_2_1_2
+x 10
+end
+arch flagstone
+x 10
+y 1
+end
+arch swall_1_1
+x 10
+y 1
+end
+arch flagstone
+x 10
+y 2
+end
+arch swall_2_1_1
+x 10
+y 2
+end
+arch flagstone
+x 10
+y 3
+end
+arch swall_3_1
+x 10
+y 3
+end
+arch flagstone
+no_magic 1
+x 10
+y 4
+end
+arch flagstone
+no_magic 1
+x 10
+y 5
+end
+arch flagstone
+x 10
+y 6
+end
+arch swall_2_2_3
+x 10
+y 6
+end
+arch flagstone
+x 10
+y 7
+end
+arch swall_2_1_1
+x 10
+y 7
+end
+arch flagstone
+x 10
+y 8
+end
+arch swall_2_1_1
+x 10
+y 8
+end
+arch flagstone
+x 10
+y 9
+end
+arch swall_2_1_1
+x 10
+y 9
+end
+arch flagstone
+x 10
+y 10
+end
+arch swall_2_1_1
+x 10
+y 10
+end
+arch flagstone
+x 10
+y 11
+end
+arch swall_2_2_4
+x 10
+y 11
+end
+arch flagstone
+no_magic 1
+x 10
+y 12
+end
+arch chair_1.3
+no_pick 1
+x 10
+y 12
+end
+arch flagstone
+no_magic 1
+x 10
+y 13
+end
+arch flagstone
+no_magic 1
+x 10
+y 14
+end
+arch flagstone
+no_magic 1
+x 10
+y 15
+end
+arch flagstone
+x 10
+y 16
+end
+arch awall_2_1_2
+x 10
+y 16
+end
+arch flagstone
+x 11
+end
+arch awall_2_1_2
+x 11
+end
+arch flagstone
+x 11
+y 1
+end
+arch cauldron
+no_pick 1
+x 11
+y 1
+end
+arch flagstone
+x 11
+y 2
+end
+arch flagstone
+no_magic 1
+x 11
+y 3
+end
+arch ggate_closed
+connected 3
+no_magic 1
+x 11
+y 3
+end
+arch flagstone
+no_magic 1
+x 11
+y 4
+end
+arch flagstone
+no_magic 1
+x 11
+y 5
+end
+arch flagstone
+no_magic 1
+x 11
+y 6
+end
+arch flagstone
+no_magic 1
+x 11
+y 7
+end
+arch flagstone
+no_magic 1
+x 11
+y 8
+end
+arch flagstone
+no_magic 1
+x 11
+y 9
+end
+arch flagstone
+no_magic 1
+x 11
+y 10
+end
+arch chair_1.2
+no_pick 1
+x 11
+y 10
+end
+arch flagstone
+no_magic 1
+x 11
+y 11
+end
+arch chair_1.2
+no_pick 1
+x 11
+y 11
+end
+arch flagstone
+no_magic 1
+x 11
+y 12
+end
+arch flagstone
+no_magic 1
+x 11
+y 13
+end
+arch flagstone
+no_magic 1
+x 11
+y 14
+end
+arch flagstone
+no_magic 1
+x 11
+y 15
+end
+arch flagstone
+x 11
+y 16
+end
+arch awall_2_1_2
+x 11
+y 16
+end
+arch flagstone
+x 12
+end
+arch awall_2_1_2
+x 12
+end
+arch flagstone
+x 12
+y 1
+end
+arch chair_1.2
+no_pick 1
+x 12
+y 1
+end
+arch flagstone
+x 12
+y 2
+end
+arch table
+no_pick 1
+x 12
+y 2
+end
+arch flagstone
+x 12
+y 3
+end
+arch swall_2_1_2
+x 12
+y 3
+end
+arch flagstone
+no_magic 1
+x 12
+y 4
+end
+arch flagstone
+no_magic 1
+x 12
+y 5
+end
+arch flagstone
+no_magic 1
+x 12
+y 6
+end
+arch flagstone
+no_magic 1
+x 12
+y 7
+end
+arch flagstone
+no_magic 1
+x 12
+y 8
+end
+arch flagstone
+no_magic 1
+x 12
+y 9
+end
+arch flagstone
+no_magic 1
+x 12
+y 10
+end
+arch flagstone
+no_magic 1
+x 12
+y 11
+end
+arch flagstone
+no_magic 1
+x 12
+y 12
+end
+arch flagstone
+no_magic 1
+x 12
+y 13
+end
+arch flagstone
+no_magic 1
+x 12
+y 14
+end
+arch flagstone
+no_magic 1
+x 12
+y 15
+end
+arch flagstone
+x 12
+y 16
+end
+arch awall_2_1_2
+x 12
+y 16
+end
+arch flagstone
+x 13
+end
+arch awall_2_1_2
+x 13
+end
+arch flagstone
+x 13
+y 1
+end
+arch swall_1_1
+x 13
+y 1
+end
+arch flagstone
+x 13
+y 2
+end
+arch swall_2_1_1
+x 13
+y 2
+end
+arch flagstone
+x 13
+y 3
+end
+arch swall_3_1
+x 13
+y 3
+end
+arch flagstone
+no_magic 1
+x 13
+y 4
+end
+arch flagstone
+x 13
+y 5
+end
+arch swall_2_2_2
+x 13
+y 5
+end
+arch flagstone
+x 13
+y 6
+end
+arch swall_1_2
+x 13
+y 6
+end
+arch flagstone
+no_magic 1
+x 13
+y 7
+end
+arch grate_closed_2
+connected 3
+no_magic 1
+x 13
+y 7
+end
+arch flagstone
+x 13
+y 8
+end
+arch swall_1_1
+x 13
+y 8
+end
+arch flagstone
+x 13
+y 9
+end
+arch swall_3_2
+x 13
+y 9
+end
+arch flagstone
+x 13
+y 10
+end
+arch swall_1_2
+x 13
+y 10
+end
+arch flagstone
+no_magic 1
+x 13
+y 11
+end
+arch grate_closed_2
+connected 3
+no_magic 1
+x 13
+y 11
+end
+arch flagstone
+x 13
+y 12
+end
+arch swall_1_1
+x 13
+y 12
+end
+arch flagstone
+x 13
+y 13
+end
+arch swall_3_2
+x 13
+y 13
+end
+arch flagstone
+x 13
+y 14
+end
+arch swall_1_2
+x 13
+y 14
+end
+arch flagstone
+no_magic 1
+x 13
+y 15
+end
+arch grate_closed_2
+connected 3
+no_magic 1
+x 13
+y 15
+end
+arch flagstone
+x 13
+y 16
+end
+arch awall_2_1_2
+x 13
+y 16
+end
+arch flagstone
+x 14
+end
+arch awall_2_1_2
+x 14
+end
+arch flagstone
+x 14
+y 1
+end
+arch cauldron
+no_pick 1
+x 14
+y 1
+end
+arch flagstone
+x 14
+y 2
+end
+arch flagstone
+no_magic 1
+x 14
+y 3
+end
+arch ggate_closed
+connected 3
+no_magic 1
+x 14
+y 3
+end
+arch flagstone
+no_magic 1
+x 14
+y 4
+end
+arch flagstone
+x 14
+y 5
+end
+arch swall_2_1_2
+x 14
+y 5
+end
+arch flagstone
+x 14
+y 6
+end
+arch flagstone
+x 14
+y 7
+end
+arch chair_1.4
+no_pick 1
+x 14
+y 7
+end
+arch flagstone
+x 14
+y 8
+end
+arch flagstone
+x 14
+y 9
+end
+arch swall_2_1_2
+x 14
+y 9
+end
+arch flagstone
+x 14
+y 10
+end
+arch flagstone
+x 14
+y 11
+end
+arch chair_1.4
+no_pick 1
+x 14
+y 11
+end
+arch flagstone
+x 14
+y 12
+end
+arch flagstone
+x 14
+y 13
+end
+arch swall_2_1_2
+x 14
+y 13
+end
+arch flagstone
+x 14
+y 14
+end
+arch table_2
+no_pick 1
+x 14
+y 14
+end
+arch flagstone
+x 14
+y 15
+end
+arch flagstone
+x 14
+y 16
+end
+arch awall_2_1_2
+x 14
+y 16
+end
+arch flagstone
+x 15
+end
+arch awall_2_1_2
+x 15
+end
+arch flagstone
+x 15
+y 1
+end
+arch chair_1.2
+no_pick 1
+x 15
+y 1
+end
+arch flagstone
+x 15
+y 2
+end
+arch table
+no_pick 1
+x 15
+y 2
+end
+arch flagstone
+x 15
+y 3
+end
+arch swall_1_3
+x 15
+y 3
+end
+arch flagstone
+no_magic 1
+x 15
+y 4
+end
+arch flagstone
+x 15
+y 5
+end
+arch swall_1_3
+x 15
+y 5
+end
+arch flagstone
+x 15
+y 6
+end
+arch table_2
+no_pick 1
+x 15
+y 6
+end
+arch flagstone
+x 15
+y 7
+end
+arch cauldron
+no_pick 1
+x 15
+y 7
+end
+arch flagstone
+x 15
+y 8
+end
+arch table_2
+no_pick 1
+x 15
+y 8
+end
+arch flagstone
+x 15
+y 9
+end
+arch swall_1_3
+x 15
+y 9
+end
+arch flagstone
+x 15
+y 10
+end
+arch table_2
+no_pick 1
+x 15
+y 10
+end
+arch flagstone
+x 15
+y 11
+end
+arch cauldron
+no_pick 1
+x 15
+y 11
+end
+arch flagstone
+x 15
+y 12
+end
+arch table_2
+no_pick 1
+x 15
+y 12
+end
+arch flagstone
+x 15
+y 13
+end
+arch swall_1_3
+x 15
+y 13
+end
+arch flagstone
+x 15
+y 14
+end
+arch chair_1.1
+no_pick 1
+x 15
+y 14
+end
+arch flagstone
+x 15
+y 15
+end
+arch cauldron
+no_pick 1
+x 15
+y 15
+end
+arch flagstone
+x 15
+y 16
+end
+arch awall_2_1_2
+x 15
+y 16
+end
+arch flagstone
+x 16
+end
+arch awall_2_2_3
+x 16
+end
+arch flagstone
+x 16
+y 1
+end
+arch awall_2_1_1
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch awall_2_1_1
+x 16
+y 2
+end
+arch flagstone
+x 16
+y 3
+end
+arch awall_2_1_1
+x 16
+y 3
+end
+arch flagstone
+x 16
+y 4
+end
+arch awall_2_1_1
+x 16
+y 4
+end
+arch flagstone
+x 16
+y 5
+end
+arch awall_2_1_1
+x 16
+y 5
+end
+arch flagstone
+x 16
+y 6
+end
+arch awall_2_1_1
+x 16
+y 6
+end
+arch flagstone
+x 16
+y 7
+end
+arch awall_2_1_1
+x 16
+y 7
+end
+arch flagstone
+x 16
+y 8
+end
+arch awall_2_1_1
+x 16
+y 8
+end
+arch flagstone
+x 16
+y 9
+end
+arch awall_2_1_1
+x 16
+y 9
+end
+arch flagstone
+x 16
+y 10
+end
+arch awall_2_1_1
+x 16
+y 10
+end
+arch flagstone
+x 16
+y 11
+end
+arch awall_2_1_1
+x 16
+y 11
+end
+arch flagstone
+x 16
+y 12
+end
+arch awall_2_1_1
+x 16
+y 12
+end
+arch flagstone
+x 16
+y 13
+end
+arch awall_2_1_1
+x 16
+y 13
+end
+arch flagstone
+x 16
+y 14
+end
+arch awall_2_1_1
+x 16
+y 14
+end
+arch flagstone
+x 16
+y 15
+end
+arch awall_2_1_1
+x 16
+y 15
+end
+arch flagstone
+x 16
+y 16
+end
+arch awall_2_2_4
+x 16
+y 16
+end
diff --git a/scorn/shops/potionshop b/scorn/shops/potionshop
index 10131bd4e..3d2991153 100644
--- a/scorn/shops/potionshop
+++ b/scorn/shops/potionshop
@@ -1,6 +1,6 @@
 arch map
-region scorn
 name potionshop
+region scorn
 msg
 Creator: bt foom
 Email: thomas@astro.psu.edu
@@ -978,6 +978,10 @@ arch woodfloor
 x 11
 y 10
 end
+arch woodfloor
+x 11
+y 10
+end
 arch wwall_2_1_1
 x 11
 y 10
@@ -1458,7 +1462,7 @@ arch woodfloor
 x 15
 y 8
 end
-arch wwall_2_1_1
+arch wwall_2_2_1
 x 15
 y 8
 end
@@ -1466,10 +1470,6 @@ arch woodfloor
 x 15
 y 9
 end
-arch wwall_2_2_1
-x 15
-y 9
-end
 arch woodfloor
 x 15
 y 10
@@ -1580,25 +1580,21 @@ arch grass
 x 16
 y 7
 end
-arch grass
-x 16
-y 8
-end
 arch tree4
 x 16
-y 8
+y 7
 end
 arch woodfloor
 x 16
-y 9
+y 8
 end
 arch wwall_2_1_2
 x 16
-y 9
+y 8
 end
 arch woodfloor
 x 16
-y 10
+y 9
 end
 arch trigger_marker
 msg
@@ -1609,7 +1605,7 @@ connected 10
 speed 1.0
 food 504
 x 16
-y 10
+y 9
 end
 arch altar_trigger
 name Drop 200 platinum for day pass
@@ -1617,13 +1613,24 @@ slaying platinacoin
 food 200
 connected 10
 x 16
+y 9
+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 wwall_1_4
+arch stair3_gstone_do
+slaying alclass
+hp 8
+sp 16
 x 16
 y 11
 end
@@ -1631,12 +1638,7 @@ arch woodfloor
 x 16
 y 12
 end
-arch diamond_converter
-name Mana Potion: 1400 pp
-slaying platinacoin
-food 1400
-other_arch potion_magic
-sp 1
+arch wwall_1_4
 x 16
 y 12
 end
@@ -1644,7 +1646,12 @@ arch woodfloor
 x 16
 y 13
 end
-arch wwall_1_4
+arch diamond_converter
+name Mana Potion: 1400 pp
+slaying platinacoin
+food 1400
+other_arch potion_magic
+sp 1
 x 16
 y 13
 end
@@ -1727,11 +1734,11 @@ arch grass
 x 17
 y 7
 end
-arch brush
+arch woodfloor
 x 17
-y 7
+y 8
 end
-arch grass
+arch wwall_2_2_3
 x 17
 y 8
 end
@@ -1739,7 +1746,7 @@ arch woodfloor
 x 17
 y 9
 end
-arch wwall_2_2_3
+arch wwall_2_1_1
 x 17
 y 9
 end
@@ -1747,7 +1754,7 @@ arch woodfloor
 x 17
 y 10
 end
-arch wwall_2_1_1
+arch wwall_3_4
 x 17
 y 10
 end
@@ -1755,7 +1762,7 @@ arch woodfloor
 x 17
 y 11
 end
-arch wwall_3_4
+arch wwall_2_1_1
 x 17
 y 11
 end
@@ -1763,7 +1770,7 @@ arch woodfloor
 x 17
 y 12
 end
-arch wwall_2_1_1
+arch wwall_3_4
 x 17
 y 12
 end
@@ -1771,7 +1778,7 @@ arch woodfloor
 x 17
 y 13
 end
-arch wwall_3_4
+arch wwall_2_1_1
 x 17
 y 13
 end