From ce11c75d70c5e6899c0781392eca89d1e2ac9144 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 16 Apr 2011 21:45:07 +0000
Subject: [PATCH] Cosmetic changes to Mosley's Magic Books in Scorn.  Door or
 entrance now opens when a player approaches. Shop item layout changes. Map
 considered an outdoor map so darkness or time of day is visible when inside;
 added light sources.  Updated world map for new map entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14406 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/BasicSpells | 1919 +++++++++++++++++++++++----------------
 world/world_104_115     |    6 +-
 2 files changed, 1156 insertions(+), 769 deletions(-)

diff --git a/scorn/shops/BasicSpells b/scorn/shops/BasicSpells
index a4a50ce67..9b53c147f 100644
--- a/scorn/shops/BasicSpells
+++ b/scorn/shops/BasicSpells
@@ -5,18 +5,19 @@ region scorn
 shopitems spellbook:80
 shopgreed 2.00000
 shopmax 2000
-width 13
-height 13
+width 15
+height 15
 enter_x 2
 enter_y 2
 msg
 Created:  2000-10-18
-Modified: 2008-12-02 Rick Tanner
+Modified: 2011-04-16 Rick Tanner
 endmsg
+outdoor 1
 end
 arch cobblestones2
 end
-arch grass
+arch cobblestones2
 y 1
 end
 arch grass
@@ -52,366 +53,391 @@ end
 arch grass
 y 12
 end
-arch dungeon_magic
+arch grass
+y 13
+end
+arch grass
+y 14
+end
+arch cobblestones2
 x 1
 end
 arch cobblestones2
 x 1
+y 1
+end
+arch grass
+x 1
+y 2
+end
+arch grass
+x 1
+y 3
+end
+arch grass
+x 1
+y 4
+end
+arch grass
+x 1
+y 5
+end
+arch grass
+x 1
+y 6
+end
+arch grass
+x 1
+y 7
+end
+arch grass
+x 1
+y 8
+end
+arch grass
+x 1
+y 9
+end
+arch grass
+x 1
+y 10
+end
+arch grass
+x 1
+y 11
+end
+arch grass
+x 1
+y 12
+end
+arch grass
+x 1
+y 13
+end
+arch grass
+x 1
+y 14
+end
+arch dungeon_magic
+x 2
+end
+arch cobblestones2
+x 2
+move_block all
+end
+arch dungeon_magic
+x 2
+y 1
+end
+arch cobblestones2
+x 2
+y 1
 move_block all
 end
 arch woodfloor
-x 1
-y 1
-end
-arch wwall_1_1
-x 1
-y 1
-end
-arch woodfloor
-x 1
+x 2
 y 2
 end
-arch wwall_win1
-x 1
+arch wwall_2_2_2
+x 2
 y 2
 end
-arch woodfloor
-x 1
-y 3
-end
-arch wwall_2_1_1
-x 1
+arch light2
+x 2
 y 3
 end
 arch woodfloor
-x 1
-y 4
+x 2
+y 3
 end
-arch swall_1_4_half
-x 1
+arch wwall_win1
+x 2
+y 3
+end
+arch woodfloor
+x 2
 y 4
 end
 arch wwall_2_1_1
-x 1
+x 2
 y 4
 end
 arch woodfloor
-x 1
+x 2
 y 5
 end
 arch wwall_2_1_1
-x 1
+x 2
 y 5
 end
 arch woodfloor
-x 1
+x 2
 y 6
 end
-arch wwall_win1
-x 1
+arch wwall_2_1_1
+x 2
 y 6
 end
-arch woodfloor
-x 1
-y 7
-end
-arch wwall_win1
-x 1
+arch light2
+x 2
 y 7
 end
 arch woodfloor
-x 1
-y 8
-end
-arch wwall_2_1_1
-x 1
-y 8
-end
-arch woodfloor
-x 1
-y 9
+x 2
+y 7
 end
 arch wwall_win1
-x 1
+x 2
+y 7
+end
+arch light2
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 8
+end
+arch wwall_win1
+x 2
+y 8
+end
+arch woodfloor
+x 2
 y 9
 end
-arch woodfloor
-x 1
-y 10
-end
 arch wwall_2_1_1
-x 1
+x 2
+y 9
+end
+arch light2
+x 2
 y 10
 end
 arch woodfloor
-x 1
+x 2
+y 10
+end
+arch wwall_win1
+x 2
+y 10
+end
+arch woodfloor
+x 2
 y 11
 end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch woodfloor
+x 2
+y 12
+end
 arch wwall_2_2_1
-x 1
-y 11
-end
-arch grass
-x 1
+x 2
 y 12
 end
-arch dungeon_magic
+arch grass
 x 2
+y 13
+end
+arch grass
+x 2
+y 14
+end
+arch dungeon_magic
+x 3
 end
 arch cobblestones2
-x 2
+x 3
+move_block all
+end
+arch dungeon_magic
+x 3
+y 1
+end
+arch cobblestones2
+x 3
+y 1
 move_block all
 end
 arch woodfloor
-x 2
-y 1
-end
-arch oakdoor_2
-slaying /world/world_104_115
-hp 49
-sp 34
-x 2
-y 1
-end
-arch woodfloor
-x 2
+x 3
 y 2
 end
-arch woodfloor
-x 2
-y 3
-end
-arch woodfloor
-x 2
-y 4
-end
-arch swall_2_1_2
-x 2
-y 4
-end
-arch shop_empty
-x 2
-y 5
-end
-arch bookshelf
-name Books on causing harm
-x 2
-y 5
-carrying 95000
-no_pick 1
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_medium_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_heavy_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_light_wounds
-end
-end
-end
-arch shop_empty
-x 2
-y 6
-end
-arch bookshelf
-name Books on causing harm
-x 2
-y 6
-carrying 95000
-no_pick 1
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_medium_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_heavy_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_light_wounds
-end
-end
-end
-arch shop_empty
-x 2
-y 7
-end
-arch bookshelf
-name Books on causing harm
-x 2
-y 7
-carrying 95000
-no_pick 1
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_medium_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_heavy_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_light_wounds
-end
-end
-end
-arch shop_empty
-x 2
-y 8
-end
-arch bookshelf
-name Books on causing harm
-x 2
-y 8
-carrying 95000
-no_pick 1
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_medium_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_heavy_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_light_wounds
-end
-end
-end
-arch shop_empty
-x 2
-y 9
-end
-arch bookshelf
-name Books on causing harm
-x 2
-y 9
-carrying 95000
-no_pick 1
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_medium_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_heavy_wounds
-end
-end
-arch cleric_book
-randomitems none
-unpaid 1
-identified 1
-arch spell_cause_light_wounds
-end
-end
-end
-arch shop_empty
-x 2
-y 10
-end
-arch woodfloor
-x 2
-y 11
-end
 arch wwall_2_1_2
-x 2
-y 11
-end
-arch grass
-x 2
-y 12
-end
-arch dungeon_magic
-x 3
-end
-arch cobblestones2
-x 3
-move_block all
-end
-arch woodfloor
-x 3
-y 1
-end
-arch wwall_1_4
-x 3
-y 1
-end
-arch woodfloor
 x 3
 y 2
 end
-arch woodfloor
+arch light4
 x 3
 y 3
 end
-arch shop_mat
+arch shop_empty
 x 3
 y 3
 end
-arch woodfloor
+arch bookshelf
+name Books on causing harm
+x 3
+y 3
+carrying 95000
+no_pick 1
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_medium_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_heavy_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_light_wounds
+end
+end
+end
+arch shop_empty
 x 3
 y 4
 end
-arch swall_2_1_2
+arch bookshelf
+name Books on causing harm
 x 3
 y 4
+carrying 95000
+no_pick 1
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_medium_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_heavy_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_light_wounds
+end
+end
 end
 arch shop_empty
 x 3
 y 5
 end
-arch shop_empty
+arch bookshelf
+name Books on causing harm
+x 3
+y 5
+carrying 95000
+no_pick 1
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_medium_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_heavy_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_light_wounds
+end
+end
+end
+arch light4
 x 3
 y 6
 end
 arch shop_empty
 x 3
+y 6
+end
+arch bookshelf
+name Books on causing harm
+x 3
+y 6
+carrying 95000
+no_pick 1
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_medium_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_heavy_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_light_wounds
+end
+end
+end
+arch shop_empty
+x 3
 y 7
 end
+arch bookshelf
+name Books on causing harm
+x 3
+y 7
+carrying 95000
+no_pick 1
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_medium_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_heavy_wounds
+end
+end
+arch cleric_book
+randomitems none
+unpaid 1
+identified 1
+arch spell_cause_light_wounds
+end
+end
+end
 arch shop_empty
 x 3
 y 8
@@ -424,54 +450,83 @@ arch shop_empty
 x 3
 y 10
 end
-arch woodfloor
+arch cleric_book
+slaying holy word
+msg
+holy word
+endmsg
+x 3
+y 10
+unpaid 1
+identified 1
+end
+arch light4
 x 3
 y 11
 end
+arch shop_empty
+x 3
+y 11
+end
+arch cleric_book
+slaying holy word
+msg
+holy word
+endmsg
+x 3
+y 11
+unpaid 1
+identified 1
+end
+arch woodfloor
+x 3
+y 12
+end
+arch wwall_2_1_2
+x 3
+y 12
+end
+arch grass
+x 3
+y 13
+end
+arch grass
+x 3
+y 14
+end
+arch dungeon_magic
+x 4
+end
+arch cobblestones2
+x 4
+move_block all
+end
+arch dungeon_magic
+x 4
+y 1
+end
+arch cobblestones2
+x 4
+y 1
+move_block all
+end
+arch light2
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 2
+end
 arch wwall_win2
-x 3
-y 11
-end
-arch grass
-x 3
-y 12
-end
-arch cobblestones2
-x 4
-end
-arch woodfloor
-x 4
-y 1
-end
-arch wwall_2_1_2
-x 4
-y 1
-end
-arch swall_1_1_half
-x 4
-y 1
-end
-arch woodfloor
 x 4
 y 2
 end
-arch swall_2_1_1
-x 4
-y 2
-end
-arch woodfloor
+arch shop_empty
 x 4
 y 3
 end
-arch swall_2_1_1
-x 4
-y 3
-end
-arch woodfloor
-x 4
-y 4
-end
-arch swall_2_2_4
+arch shop_empty
 x 4
 y 4
 end
@@ -479,10 +534,83 @@ 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 cleric_book
+slaying holy word
+msg
+holy word
+endmsg
+x 4
+y 11
+unpaid 1
+identified 1
+end
+arch light2
+x 4
+y 12
+end
+arch woodfloor
+x 4
+y 12
+end
+arch wwall_win2
+x 4
+y 12
+end
+arch grass
+x 4
+y 13
+end
+arch grass
+x 4
+y 14
+end
+arch cobblestones2
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
+end
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch shop_empty
+x 5
+y 3
+end
 arch bookshelf
 name Books for Evokers
-x 4
-y 5
+x 5
+y 3
 carrying 20000
 no_pick 1
 arch evoker_book
@@ -515,13 +643,13 @@ end
 end
 end
 arch shop_empty
-x 4
-y 6
+x 5
+y 4
 end
 arch bookshelf
 name Books for Evokers
-x 4
-y 6
+x 5
+y 4
 carrying 20000
 no_pick 1
 arch evoker_book
@@ -554,13 +682,13 @@ end
 end
 end
 arch shop_empty
-x 4
-y 7
+x 5
+y 5
 end
 arch bookshelf
 name Books for Evokers
-x 4
-y 7
+x 5
+y 5
 carrying 20000
 no_pick 1
 arch evoker_book
@@ -593,13 +721,13 @@ end
 end
 end
 arch shop_empty
-x 4
-y 8
+x 5
+y 6
 end
 arch bookshelf
 name Books for Evokers
-x 4
-y 8
+x 5
+y 6
 carrying 20000
 no_pick 1
 arch evoker_book
@@ -632,13 +760,13 @@ end
 end
 end
 arch shop_empty
-x 4
-y 9
+x 5
+y 7
 end
 arch bookshelf
 name Books for Evokers
-x 4
-y 9
+x 5
+y 7
 carrying 20000
 no_pick 1
 arch evoker_book
@@ -671,95 +799,26 @@ end
 end
 end
 arch shop_empty
-x 4
+x 5
+y 8
+end
+arch light4
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 9
+end
+arch swall_2_2_2
+x 5
+y 9
+end
+arch woodfloor
+x 5
 y 10
 end
-arch woodfloor
-x 4
-y 11
-end
-arch wwall_win2
-x 4
-y 11
-end
-arch grass
-x 4
-y 12
-end
-arch cobblestones2
-x 5
-end
-arch woodfloor
-x 5
-y 1
-end
-arch wwall_2_1_2
-x 5
-y 1
-end
-arch shop_empty
-x 5
-y 2
-end
-arch cleric_book
-slaying holy word
-msg
-holy word
-endmsg
-x 5
-y 2
-unpaid 1
-identified 1
-end
-arch shop_empty
-x 5
-y 3
-end
-arch shop_empty
-x 5
-y 4
-end
-arch shop_mat
-x 5
-y 4
-end
-arch shop_empty
-x 5
-y 5
-end
-arch woodfloor
-x 5
-y 6
-end
-arch shop_empty
-x 5
-y 6
-end
-arch woodfloor
-x 5
-y 7
-end
-arch shop_empty
-x 5
-y 7
-end
-arch woodfloor
-x 5
-y 8
-end
-arch shop_empty
-x 5
-y 8
-end
-arch woodfloor
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 9
-end
-arch shop_empty
+arch swall_2_1_1
 x 5
 y 10
 end
@@ -767,55 +826,164 @@ arch woodfloor
 x 5
 y 11
 end
-arch wwall_2_1_2
+arch swall_2_1_1
 x 5
 y 11
 end
-arch grass
+arch woodfloor
 x 5
 y 12
 end
+arch swall_1_2_half
+x 5
+y 12
+end
+arch wwall_2_1_2
+x 5
+y 12
+end
+arch grass
+x 5
+y 13
+end
+arch grass
+x 5
+y 14
+end
 arch cobblestones2
 x 6
 end
+arch cobblestones2
+x 6
+y 1
+end
 arch woodfloor
 x 6
-y 1
-end
-arch wwall_win2
-x 6
-y 1
-end
-arch shop_empty
-x 6
 y 2
 end
-arch cleric_book
-slaying holy word
-msg
-holy word
-endmsg
+arch wwall_2_1_2
 x 6
 y 2
-unpaid 1
-identified 1
 end
 arch shop_empty
 x 6
 y 3
 end
-arch shop_empty
+arch woodfloor
 x 6
 y 4
 end
 arch shop_empty
 x 6
+y 4
+end
+arch woodfloor
+x 6
 y 5
 end
+arch shop_empty
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch shop_empty
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch shop_empty
+x 6
+y 7
+end
+arch shop_empty
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch swall_2_1_2
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch button_small
+x 6
+y 11
+connected 1
+end
+arch woodfloor
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 12
+end
+arch wwall_1_3
+x 6
+y 12
+end
+arch dungeon_magic
+x 6
+y 13
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 49
+sp 34
+x 6
+y 13
+end
+arch grass
+x 6
+y 13
+end
+arch grass
+x 6
+y 14
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch light2
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 2
+end
+arch wwall_win2
+x 7
+y 2
+end
+arch light4
+x 7
+y 3
+end
+arch shop_empty
+x 7
+y 3
+end
 arch bookshelf
 name Books for Pyromancers
-x 6
-y 5
+x 7
+y 3
 carrying 20000
 no_pick 1
 arch pyro_book
@@ -848,13 +1016,13 @@ end
 end
 end
 arch shop_empty
-x 6
-y 6
+x 7
+y 4
 end
 arch bookshelf
 name Books for Pyromancers
-x 6
-y 6
+x 7
+y 4
 carrying 20000
 no_pick 1
 arch pyro_book
@@ -887,13 +1055,13 @@ end
 end
 end
 arch shop_empty
-x 6
-y 7
+x 7
+y 5
 end
 arch bookshelf
 name Books for Pyromancers
-x 6
-y 7
+x 7
+y 5
 carrying 20000
 no_pick 1
 arch pyro_book
@@ -925,14 +1093,18 @@ arch spell_rune_of_fire
 end
 end
 end
+arch light4
+x 7
+y 6
+end
 arch shop_empty
-x 6
-y 8
+x 7
+y 6
 end
 arch bookshelf
 name Books for Pyromancers
-x 6
-y 8
+x 7
+y 6
 carrying 20000
 no_pick 1
 arch pyro_book
@@ -965,13 +1137,13 @@ end
 end
 end
 arch shop_empty
-x 6
-y 9
+x 7
+y 7
 end
 arch bookshelf
 name Books for Pyromancers
-x 6
-y 9
+x 7
+y 7
 carrying 20000
 no_pick 1
 arch pyro_book
@@ -1004,75 +1176,6 @@ end
 end
 end
 arch shop_empty
-x 6
-y 10
-end
-arch woodfloor
-x 6
-y 11
-end
-arch wwall_2_1_2
-x 6
-y 11
-end
-arch grass
-x 6
-y 12
-end
-arch cobblestones2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch wwall_2_1_2
-x 7
-y 1
-end
-arch shop_empty
-x 7
-y 2
-end
-arch cleric_book
-slaying holy word
-msg
-holy word
-endmsg
-x 7
-y 2
-unpaid 1
-identified 1
-end
-arch shop_empty
-x 7
-y 3
-end
-arch shop_empty
-x 7
-y 4
-end
-arch shop_empty
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch shop_empty
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 7
-end
-arch shop_empty
 x 7
 y 8
 end
@@ -1080,67 +1183,186 @@ arch woodfloor
 x 7
 y 9
 end
-arch shop_empty
+arch swall_2_1_2
 x 7
 y 9
 end
-arch shop_empty
+arch woodfloor
 x 7
 y 10
 end
+arch button_small
+x 7
+y 11
+connected 1
+end
 arch woodfloor
 x 7
 y 11
 end
-arch wwall_2_1_2
+arch button_small
 x 7
-y 11
+y 12
+connected 1
+end
+arch woodfloor
+x 7
+y 12
+end
+arch odoorn2_closed_1
+x 7
+y 12
+connected 1
+end
+arch dungeon_magic
+x 7
+y 13
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 49
+sp 34
+x 7
+y 13
 end
 arch grass
 x 7
-y 12
+y 13
+end
+arch grass
+x 7
+y 14
 end
 arch cobblestones2
 x 8
 end
-arch woodfloor
+arch cobblestones2
 x 8
 y 1
 end
+arch woodfloor
+x 8
+y 2
+end
 arch wwall_2_1_2
 x 8
-y 1
-end
-arch shop_empty
-x 8
 y 2
 end
-arch cleric_book
-slaying holy word
-msg
-holy word
-endmsg
-x 8
-y 2
-unpaid 1
-identified 1
-end
 arch shop_empty
 x 8
 y 3
 end
-arch shop_empty
+arch woodfloor
 x 8
 y 4
 end
 arch shop_empty
 x 8
+y 4
+end
+arch woodfloor
+x 8
 y 5
 end
+arch shop_empty
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 8
+end
+arch shop_mat
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch swall_2_1_2
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch shop_mat
+x 8
+y 10
+end
+arch button_small
+x 8
+y 11
+connected 1
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
+arch wwall_1_4
+x 8
+y 12
+end
+arch dungeon_magic
+x 8
+y 13
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 49
+sp 34
+x 8
+y 13
+end
+arch grass
+x 8
+y 13
+end
+arch grass
+x 8
+y 14
+end
+arch cobblestones2
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch shop_empty
+x 9
+y 3
+end
 arch bookshelf
 name Books for Sorcerers
-x 8
-y 5
+x 9
+y 3
 carrying 20000
 no_pick 1
 arch sorcerer_book
@@ -1173,13 +1395,13 @@ end
 end
 end
 arch shop_empty
-x 8
-y 6
+x 9
+y 4
 end
 arch bookshelf
 name Books for Sorcerers
-x 8
-y 6
+x 9
+y 4
 carrying 20000
 no_pick 1
 arch sorcerer_book
@@ -1212,13 +1434,13 @@ end
 end
 end
 arch shop_empty
-x 8
-y 7
+x 9
+y 5
 end
 arch bookshelf
 name Books for Sorcerers
-x 8
-y 7
+x 9
+y 5
 carrying 20000
 no_pick 1
 arch sorcerer_book
@@ -1251,13 +1473,13 @@ end
 end
 end
 arch shop_empty
-x 8
-y 8
+x 9
+y 6
 end
 arch bookshelf
 name Books for Sorcerers
-x 8
-y 8
+x 9
+y 6
 carrying 20000
 no_pick 1
 arch sorcerer_book
@@ -1290,13 +1512,13 @@ end
 end
 end
 arch shop_empty
-x 8
-y 9
+x 9
+y 7
 end
 arch bookshelf
 name Books for Sorcerers
-x 8
-y 9
+x 9
+y 7
 carrying 20000
 no_pick 1
 arch sorcerer_book
@@ -1329,91 +1551,26 @@ end
 end
 end
 arch shop_empty
-x 8
+x 9
+y 8
+end
+arch light4
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 9
+end
+arch swall_2_2_3
+x 9
+y 9
+end
+arch woodfloor
+x 9
 y 10
 end
-arch woodfloor
-x 8
-y 11
-end
-arch wwall_win2
-x 8
-y 11
-end
-arch grass
-x 8
-y 12
-end
-arch cobblestones2
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch wwall_win2
-x 9
-y 1
-end
-arch shop_empty
-x 9
-y 2
-end
-arch cleric_book
-slaying holy word
-msg
-holy word
-endmsg
-x 9
-y 2
-unpaid 1
-identified 1
-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 woodfloor
-x 9
-y 6
-end
-arch shop_empty
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch shop_empty
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch shop_empty
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 9
-end
-arch shop_empty
+arch swall_2_1_1
 x 9
 y 10
 end
@@ -1421,55 +1578,158 @@ arch woodfloor
 x 9
 y 11
 end
-arch wwall_win2
+arch swall_2_1_1
 x 9
 y 11
 end
-arch grass
+arch woodfloor
 x 9
 y 12
 end
-arch cobblestones2
-x 10
-end
-arch woodfloor
-x 10
-y 1
+arch swall_1_2_half
+x 9
+y 12
 end
 arch wwall_2_1_2
+x 9
+y 12
+end
+arch grass
+x 9
+y 13
+end
+arch grass
+x 9
+y 14
+end
+arch cobblestones2
+x 10
+end
+arch cobblestones2
 x 10
 y 1
 end
-arch shop_empty
+arch light2
 x 10
 y 2
 end
+arch woodfloor
+x 10
+y 2
+end
+arch wwall_win2
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch shop_empty
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch shop_empty
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+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 cleric_book
 slaying holy word
 msg
 holy word
 endmsg
 x 10
-y 2
+y 11
 unpaid 1
 identified 1
 end
-arch shop_empty
+arch light2
 x 10
+y 12
+end
+arch woodfloor
+x 10
+y 12
+end
+arch wwall_win2
+x 10
+y 12
+end
+arch grass
+x 10
+y 13
+end
+arch grass
+x 10
+y 14
+end
+arch cobblestones2
+x 11
+end
+arch cobblestones2
+x 11
+y 1
+end
+arch woodfloor
+x 11
+y 2
+end
+arch wwall_2_1_2
+x 11
+y 2
+end
+arch light4
+x 11
 y 3
 end
 arch shop_empty
-x 10
-y 4
-end
-arch shop_empty
-x 10
-y 5
+x 11
+y 3
 end
 arch bookshelf
 name Books for Summoners
-x 10
-y 5
+x 11
+y 3
 carrying 20000
 no_pick 1
 arch summoner_book
@@ -1502,13 +1762,13 @@ end
 end
 end
 arch shop_empty
-x 10
-y 6
+x 11
+y 4
 end
 arch bookshelf
 name Books for Summoners
-x 10
-y 6
+x 11
+y 4
 carrying 20000
 no_pick 1
 arch summoner_book
@@ -1541,13 +1801,13 @@ end
 end
 end
 arch shop_empty
-x 10
-y 7
+x 11
+y 5
 end
 arch bookshelf
 name Books for Summoners
-x 10
-y 7
+x 11
+y 5
 carrying 20000
 no_pick 1
 arch summoner_book
@@ -1579,14 +1839,18 @@ arch spell_counterspell
 end
 end
 end
+arch light4
+x 11
+y 6
+end
 arch shop_empty
-x 10
-y 8
+x 11
+y 6
 end
 arch bookshelf
 name Books for Summoners
-x 10
-y 8
+x 11
+y 6
 carrying 20000
 no_pick 1
 arch summoner_book
@@ -1619,13 +1883,13 @@ end
 end
 end
 arch shop_empty
-x 10
-y 9
+x 11
+y 7
 end
 arch bookshelf
 name Books for Summoners
-x 10
-y 9
+x 11
+y 7
 carrying 20000
 no_pick 1
 arch summoner_book
@@ -1658,172 +1922,295 @@ end
 end
 end
 arch shop_empty
-x 10
+x 11
+y 8
+end
+arch shop_empty
+x 11
+y 9
+end
+arch shop_empty
+x 11
 y 10
 end
-arch woodfloor
-x 10
+arch cleric_book
+slaying holy word
+msg
+holy word
+endmsg
+x 11
+y 10
+unpaid 1
+identified 1
+end
+arch light4
+x 11
 y 11
 end
+arch shop_empty
+x 11
+y 11
+end
+arch cleric_book
+slaying holy word
+msg
+holy word
+endmsg
+x 11
+y 11
+unpaid 1
+identified 1
+end
+arch woodfloor
+x 11
+y 12
+end
 arch wwall_2_1_2
-x 10
-y 11
-end
-arch grass
-x 10
+x 11
 y 12
 end
+arch grass
+x 11
+y 13
+end
+arch grass
+x 11
+y 14
+end
 arch cobblestones2
-x 11
+x 12
 end
-arch swall_2_2_4
-x 11
+arch cobblestones2
+x 12
 y 1
 end
 arch woodfloor
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 1
+x 12
+y 2
 end
 arch wwall_2_2_3
-x 11
-y 1
-end
-arch woodfloor
-x 11
+x 12
 y 2
 end
-arch wwall_win1
-x 11
-y 2
-end
-arch woodfloor
-x 11
-y 3
-end
-arch wwall_2_1_1
-x 11
+arch light2
+x 12
 y 3
 end
 arch woodfloor
-x 11
+x 12
+y 3
+end
+arch wwall_win1
+x 12
+y 3
+end
+arch woodfloor
+x 12
 y 4
 end
 arch wwall_2_1_1
-x 11
+x 12
 y 4
 end
 arch woodfloor
-x 11
+x 12
 y 5
 end
 arch wwall_2_1_1
-x 11
+x 12
 y 5
 end
 arch woodfloor
-x 11
+x 12
 y 6
 end
-arch wwall_win1
-x 11
+arch wwall_2_1_1
+x 12
 y 6
 end
-arch woodfloor
-x 11
-y 7
-end
-arch wwall_win1
-x 11
+arch light2
+x 12
 y 7
 end
 arch woodfloor
-x 11
-y 8
-end
-arch wwall_2_1_1
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
+x 12
+y 7
 end
 arch wwall_win1
-x 11
+x 12
+y 7
+end
+arch light2
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 8
+end
+arch wwall_win1
+x 12
+y 8
+end
+arch woodfloor
+x 12
 y 9
 end
-arch woodfloor
-x 11
-y 10
-end
 arch wwall_2_1_1
-x 11
+x 12
+y 9
+end
+arch light2
+x 12
 y 10
 end
 arch woodfloor
-x 11
+x 12
+y 10
+end
+arch wwall_win1
+x 12
+y 10
+end
+arch woodfloor
+x 12
 y 11
 end
+arch wwall_2_1_1
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
 arch wwall_2_2_4
-x 11
-y 11
-end
-arch grass
-x 11
+x 12
 y 12
 end
-arch cobblestones2
+arch grass
 x 12
+y 13
 end
 arch grass
 x 12
+y 14
+end
+arch cobblestones2
+x 13
+end
+arch cobblestones2
+x 13
 y 1
 end
 arch grass
-x 12
+x 13
 y 2
 end
 arch grass
-x 12
+x 13
 y 3
 end
 arch grass
-x 12
+x 13
 y 4
 end
 arch grass
-x 12
+x 13
 y 5
 end
 arch grass
-x 12
+x 13
 y 6
 end
 arch grass
-x 12
+x 13
 y 7
 end
 arch grass
-x 12
+x 13
 y 8
 end
 arch grass
-x 12
+x 13
 y 9
 end
 arch grass
-x 12
+x 13
 y 10
 end
 arch grass
-x 12
+x 13
 y 11
 end
 arch grass
-x 12
+x 13
 y 12
 end
+arch grass
+x 13
+y 13
+end
+arch grass
+x 13
+y 14
+end
+arch cobblestones2
+x 14
+end
+arch cobblestones2
+x 14
+y 1
+end
+arch grass
+x 14
+y 2
+end
+arch grass
+x 14
+y 3
+end
+arch grass
+x 14
+y 4
+end
+arch grass
+x 14
+y 5
+end
+arch grass
+x 14
+y 6
+end
+arch grass
+x 14
+y 7
+end
+arch grass
+x 14
+y 8
+end
+arch grass
+x 14
+y 9
+end
+arch grass
+x 14
+y 10
+end
+arch grass
+x 14
+y 11
+end
+arch grass
+x 14
+y 12
+end
+arch grass
+x 14
+y 13
+end
+arch grass
+x 14
+y 14
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 51a84ae6d..5aae5a1cc 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-12 Rick Tanner
+Modified: 2011-04-16 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -14887,8 +14887,8 @@ end
 arch shrine
 name Mosely's Magic Books
 slaying /scorn/shops/BasicSpells
-hp 2
-sp 1
+hp 7
+sp 10
 x 49
 y 34
 end