From e385958e6231862fcbea58019e896c48c10bf1f4 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 14 Apr 2011 04:17:20 +0000
Subject: [PATCH] Cosmetic overhaul to the Scorn General Store.  Expanded the
 map to include ground outside the shop walls. Door or entrance now opens when
 a player approaches. 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@14403 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/generalshop | 2768 ++++++++++++++++++++++++++++-----------
 world/world_105_116     |    6 +-
 2 files changed, 2007 insertions(+), 767 deletions(-)

diff --git a/scorn/shops/generalshop b/scorn/shops/generalshop
index fc1bb5303..17951797a 100644
--- a/scorn/shops/generalshop
+++ b/scorn/shops/generalshop
@@ -5,1360 +5,2600 @@ difficulty 1
 region scorn
 shopitems *:0
 shopmax 2000
-width 16
-height 16
+width 23
+height 22
 enter_x 14
 enter_y 14
 msg
 Created:  1993-10-16
-Modified: 2010-11-05 Andreas Kirschbaum
+Modified: 2011-04-13 Rick Tanner
 endmsg
+outdoor 1
+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 grass_only
+y 20
+end
+arch grass_only
+y 21
+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 grass_only
+x 1
+y 20
+end
+arch grass_only
+x 1
+y 21
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch grass_only
+x 2
+y 2
+end
+arch grass_only
+x 2
+y 3
+end
+arch grass_only
+x 2
+y 4
+end
+arch grass_only
+x 2
+y 5
+end
+arch grass_only
+x 2
+y 6
+end
+arch grass_only
+x 2
+y 7
+end
+arch grass_only
+x 2
+y 8
+end
+arch grass_only
+x 2
+y 9
+end
+arch grass_only
+x 2
+y 10
+end
+arch grass_only
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch grass_only
+x 2
+y 13
+end
+arch grass_only
+x 2
+y 14
+end
+arch grass_only
+x 2
+y 15
+end
+arch grass_only
+x 2
+y 16
+end
+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 grass_only
+x 3
+y 1
+end
+arch grass_only
+x 3
+y 2
 end
 arch shop_empty
+x 3
+y 3
 end
 arch wall_2_2_2
-end
-arch shop_empty
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch shop_empty
-y 2
-end
-arch wall_2_1_1
-y 2
-end
-arch shop_empty
-y 3
-end
-arch wall_2_1_1
+x 3
 y 3
 end
 arch shop_empty
+x 3
 y 4
 end
 arch wall_2_1_1
+x 3
 y 4
 end
-arch shop_empty
-y 5
-end
-arch wall_2_1_1
+arch light3
+x 3
 y 5
 end
 arch shop_empty
+x 3
+y 5
+end
+arch window_win1
+x 3
+y 5
+end
+arch shop_empty
+x 3
 y 6
 end
 arch wall_2_1_1
+x 3
 y 6
 end
 arch shop_empty
-y 7
-end
-arch swall_1_4_half
+x 3
 y 7
 end
 arch wall_2_1_1
+x 3
 y 7
 end
 arch shop_empty
+x 3
 y 8
 end
 arch wall_2_1_1
+x 3
 y 8
 end
 arch shop_empty
+x 3
 y 9
 end
 arch wall_2_1_1
+x 3
 y 9
 end
 arch shop_empty
+x 3
 y 10
 end
-arch wall_2_1_1
-y 10
-end
-arch shop_empty
-y 11
-end
 arch swall_1_4_half
-y 11
+x 3
+y 10
 end
 arch wall_2_1_1
+x 3
+y 10
+end
+arch light3
+x 3
 y 11
 end
 arch shop_empty
+x 3
+y 11
+end
+arch window_win1
+x 3
+y 11
+end
+arch shop_empty
+x 3
 y 12
 end
 arch wall_2_1_1
+x 3
 y 12
 end
 arch shop_empty
+x 3
 y 13
 end
 arch wall_2_1_1
+x 3
 y 13
 end
 arch shop_empty
+x 3
+y 14
+end
+arch swall_1_4_half
+x 3
 y 14
 end
 arch wall_2_1_1
+x 3
 y 14
 end
 arch shop_empty
+x 3
 y 15
 end
+arch wall_2_1_1
+x 3
+y 15
+end
+arch light3
+x 3
+y 16
+end
+arch shop_empty
+x 3
+y 16
+end
+arch window_win1
+x 3
+y 16
+end
+arch shop_empty
+x 3
+y 17
+end
+arch wall_2_1_1
+x 3
+y 17
+end
+arch shop_empty
+x 3
+y 18
+end
 arch wall_2_2_1
-y 15
+x 3
+y 18
 end
-arch shop_empty
-x 1
+arch grass_only
+x 3
+y 19
 end
-arch wall_2_1_2
-x 1
+arch grass_only
+x 3
+y 20
 end
-arch shop_food
-x 1
+arch grass_only
+x 3
+y 21
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch shop_food
-x 1
+arch grass_only
+x 4
 y 2
 end
-arch shop_food
-x 1
+arch shop_empty
+x 4
+y 3
+end
+arch wall_2_1_2
+x 4
 y 3
 end
 arch shop_food
-x 1
+x 4
 y 4
 end
 arch shop_food
-x 1
+x 4
 y 5
 end
 arch shop_food
-x 1
+x 4
 y 6
 end
-arch shop_empty
-x 1
+arch shop_food
+x 4
 y 7
 end
-arch swall_2_1_2
-x 1
-y 7
-end
-arch shop_gems
-x 1
+arch shop_food
+x 4
 y 8
 end
-arch shop_gems
-x 1
+arch shop_food
+x 4
 y 9
 end
-arch shop_gems
-x 1
+arch shop_empty
+x 4
 y 10
 end
-arch shop_empty
-x 1
-y 11
-end
 arch swall_2_1_2
-x 1
+x 4
+y 10
+end
+arch shop_gems
+x 4
 y 11
 end
-arch shop_special
-x 1
+arch shop_gems
+x 4
 y 12
 end
-arch shop_special
-x 1
+arch shop_gems
+x 4
 y 13
 end
-arch shop_special
-x 1
+arch shop_empty
+x 4
 y 14
 end
-arch shop_empty
-x 1
+arch swall_2_1_2
+x 4
+y 14
+end
+arch shop_special
+x 4
 y 15
 end
-arch wall_2_1_2
-x 1
-y 15
+arch shop_special
+x 4
+y 16
+end
+arch shop_special
+x 4
+y 17
 end
 arch shop_empty
-x 2
+x 4
+y 18
 end
 arch wall_2_1_2
-x 2
+x 4
+y 18
 end
-arch shop_food
-x 2
+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 shop_empty
-x 2
+arch grass_only
+x 5
 y 2
 end
 arch shop_empty
-x 2
+x 5
 y 3
 end
-arch shop_empty
-x 2
+arch wall_2_1_2
+x 5
+y 3
+end
+arch shop_food
+x 5
 y 4
 end
-arch shop_empty
-x 2
+arch light4
+x 5
 y 5
 end
 arch shop_empty
-x 2
+x 5
+y 5
+end
+arch shop_empty
+x 5
 y 6
 end
 arch shop_empty
-x 2
+x 5
 y 7
 end
-arch swall_2_1_2
-x 2
-y 7
-end
-arch shop_gems
-x 2
+arch light4
+x 5
 y 8
 end
 arch shop_empty
-x 2
+x 5
+y 8
+end
+arch shop_empty
+x 5
 y 9
 end
-arch shop_gems
-x 2
+arch shop_empty
+x 5
 y 10
 end
-arch shop_empty
-x 2
-y 11
-end
 arch swall_2_1_2
-x 2
+x 5
+y 10
+end
+arch light4
+x 5
 y 11
 end
-arch shop_special
-x 2
+arch shop_gems
+x 5
+y 11
+end
+arch shop_empty
+x 5
 y 12
 end
-arch shop_empty
-x 2
+arch light4
+x 5
 y 13
 end
-arch shop_special
-x 2
+arch shop_gems
+x 5
+y 13
+end
+arch shop_empty
+x 5
 y 14
 end
-arch shop_empty
-x 2
+arch swall_2_1_2
+x 5
+y 14
+end
+arch light4
+x 5
 y 15
 end
-arch wall_2_1_2
-x 2
+arch shop_special
+x 5
 y 15
 end
 arch shop_empty
-x 3
+x 5
+y 16
+end
+arch light4
+x 5
+y 17
+end
+arch shop_special
+x 5
+y 17
+end
+arch shop_empty
+x 5
+y 18
 end
 arch wall_2_1_2
-x 3
+x 5
+y 18
 end
-arch shop_food
-x 3
+arch grass_only
+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 shop_empty
-x 3
+arch grass_only
+x 6
 y 2
 end
-arch shop_food
-x 3
+arch shop_empty
+x 6
+y 3
+end
+arch wall_2_1_2
+x 6
 y 3
 end
 arch shop_food
-x 3
+x 6
 y 4
 end
-arch shop_food
-x 3
+arch shop_empty
+x 6
 y 5
 end
 arch shop_food
-x 3
+x 6
 y 6
 end
-arch shop_empty
-x 3
+arch shop_food
+x 6
 y 7
 end
+arch shop_food
+x 6
+y 8
+end
+arch shop_food
+x 6
+y 9
+end
+arch shop_empty
+x 6
+y 10
+end
 arch swall_1_3
-x 3
-y 7
-end
-arch shop_gems
-x 3
-y 8
-end
-arch shop_empty
-x 3
-y 9
-end
-arch shop_gems
-x 3
+x 6
 y 10
 end
-arch shop_empty
-x 3
+arch wall_0
+x 6
+y 10
+blocksview 0
+end
+arch shop_gems
+x 6
 y 11
 end
+arch shop_empty
+x 6
+y 12
+end
+arch shop_gems
+x 6
+y 13
+end
+arch shop_empty
+x 6
+y 14
+end
 arch swall_1_3
-x 3
-y 11
-end
-arch shop_special
-x 3
-y 12
-end
-arch shop_empty
-x 3
-y 13
-end
-arch shop_special
-x 3
+x 6
 y 14
 end
-arch shop_empty
-x 3
-y 15
-end
-arch wall_2_1_2
-x 3
-y 15
-end
-arch shop_empty
-x 4
-end
-arch wall_2_1_2
-x 4
-end
-arch shop_food
-x 4
-y 1
-end
-arch shop_empty
-x 4
-y 2
-end
-arch shop_food
-x 4
-y 3
-end
-arch shop_food
-x 4
-y 4
-end
-arch shop_food
-x 4
-y 5
-end
-arch shop_food
-x 4
-y 6
-end
-arch shop_empty
-x 4
-y 7
-end
-arch shop_empty
-x 4
-y 8
-end
-arch shop_empty
-x 4
-y 9
-end
-arch shop_empty
-x 4
-y 10
-end
-arch shop_empty
-x 4
-y 11
-end
-arch shop_empty
-x 4
-y 12
-end
-arch shop_empty
-x 4
-y 13
-end
-arch shop_empty
-x 4
+arch wall_0
+x 6
 y 14
+blocksview 0
 end
-arch shop_empty
-x 4
-y 15
-end
-arch wall_2_1_2
-x 4
+arch shop_special
+x 6
 y 15
 end
 arch shop_empty
-x 5
+x 6
+y 16
 end
-arch wall_2_1_2
-x 5
+arch shop_special
+x 6
+y 17
 end
-arch shop_food
-x 5
+arch light3
+x 6
+y 18
+end
+arch shop_empty
+x 6
+y 18
+end
+arch window_win2
+x 6
+y 18
+end
+arch grass_only
+x 6
+y 19
+end
+arch grass_only
+x 6
+y 20
+end
+arch grass_only
+x 6
+y 21
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
-arch shop_empty
-x 5
+arch grass_only
+x 7
 y 2
 end
-arch shop_empty
-x 5
+arch light3
+x 7
 y 3
 end
 arch shop_empty
-x 5
+x 7
+y 3
+end
+arch window_win2
+x 7
+y 3
+end
+arch shop_food
+x 7
 y 4
 end
 arch shop_empty
-x 5
+x 7
 y 5
 end
-arch shop_empty
-x 5
+arch shop_food
+x 7
 y 6
 end
-arch shop_empty
-x 5
+arch shop_food
+x 7
 y 7
 end
-arch shop_empty
-x 5
+arch shop_food
+x 7
 y 8
 end
-arch shop_empty
-x 5
+arch shop_food
+x 7
 y 9
 end
 arch shop_empty
-x 5
+x 7
 y 10
 end
 arch shop_empty
-x 5
+x 7
 y 11
 end
 arch shop_empty
-x 5
+x 7
 y 12
 end
 arch shop_empty
-x 5
+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 shop_empty
+x 7
+y 18
+end
+arch wall_2_1_2
+x 7
+y 18
+end
+arch grass_only
+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 shop_empty
+x 8
+y 3
+end
+arch wall_2_1_2
+x 8
+y 3
+end
+arch shop_food
+x 8
+y 4
+end
+arch shop_empty
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch shop_empty
+x 8
+y 7
+end
+arch light4
+x 8
+y 8
+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 light4
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 12
+end
+arch light4
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 14
+end
+arch light4
+x 8
+y 15
+end
+arch shop_empty
+x 8
+y 15
+end
+arch shop_empty
+x 8
+y 16
+end
+arch light4
+x 8
+y 17
+end
 arch shop_scrolls
-x 5
-y 14
+x 8
+y 17
 end
 arch shop_empty
-x 5
-y 15
+x 8
+y 18
 end
 arch wall_2_1_2
-x 5
-y 15
+x 8
+y 18
 end
-arch shop_empty
-x 6
+arch grass_only
+x 8
+y 19
 end
-arch wall_2_1_2
-x 6
+arch grass_only
+x 8
+y 20
 end
-arch shop_food
-x 6
+arch grass_only
+x 8
+y 21
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
-arch shop_empty
-x 6
+arch grass_only
+x 9
 y 2
 end
-arch shop_food
-x 6
+arch shop_empty
+x 9
+y 3
+end
+arch wall_2_1_2
+x 9
 y 3
 end
 arch shop_food
-x 6
+x 9
 y 4
 end
-arch shop_food
-x 6
+arch light4
+x 9
+y 5
+end
+arch shop_empty
+x 9
 y 5
 end
 arch shop_food
-x 6
+x 9
 y 6
 end
 arch shop_food
-x 6
+x 9
 y 7
 end
 arch shop_food
-x 6
+x 9
 y 8
 end
 arch shop_food
-x 6
+x 9
 y 9
 end
 arch shop_food
-x 6
+x 9
 y 10
 end
 arch shop_food
-x 6
+x 9
 y 11
 end
-arch shop_empty
-x 6
+arch shop_food
+x 9
 y 12
 end
-arch shop_empty
-x 6
+arch shop_food
+x 9
 y 13
 end
+arch shop_food
+x 9
+y 14
+end
+arch shop_empty
+x 9
+y 15
+end
+arch shop_empty
+x 9
+y 16
+end
 arch shop_special
-x 6
-y 14
+x 9
+y 17
 end
 arch shop_empty
-x 6
-y 15
+x 9
+y 18
 end
 arch wall_2_1_2
-x 6
-y 15
+x 9
+y 18
 end
-arch shop_empty
-x 7
+arch grass_only
+x 9
+y 19
 end
-arch wall_2_1_2
-x 7
+arch grass_only
+x 9
+y 20
 end
-arch shop_food
-x 7
+arch grass_only
+x 9
+y 21
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
-arch shop_empty
-x 7
+arch grass_only
+x 10
 y 2
 end
 arch shop_empty
-x 7
+x 10
 y 3
 end
-arch shop_empty
-x 7
+arch wall_2_1_2
+x 10
+y 3
+end
+arch shop_food
+x 10
 y 4
 end
 arch shop_empty
-x 7
+x 10
 y 5
 end
 arch shop_empty
-x 7
+x 10
 y 6
 end
 arch shop_empty
-x 7
+x 10
 y 7
 end
-arch shop_empty
-x 7
+arch light4
+x 10
 y 8
 end
 arch shop_empty
-x 7
+x 10
+y 8
+end
+arch shop_empty
+x 10
 y 9
 end
 arch shop_empty
-x 7
+x 10
 y 10
 end
-arch shop_empty
-x 7
+arch light4
+x 10
 y 11
 end
 arch shop_empty
-x 7
-y 12
+x 10
+y 11
 end
 arch shop_empty
-x 7
+x 10
+y 12
+end
+arch light4
+x 10
 y 13
 end
+arch shop_empty
+x 10
+y 13
+end
+arch shop_empty
+x 10
+y 14
+end
+arch light4
+x 10
+y 15
+end
+arch shop_empty
+x 10
+y 15
+end
+arch shop_empty
+x 10
+y 16
+end
 arch shop_scrolls
-x 7
-y 14
+x 10
+y 17
 end
 arch shop_empty
-x 7
-y 15
+x 10
+y 18
 end
 arch wall_2_1_2
-x 7
-y 15
+x 10
+y 18
 end
-arch shop_empty
-x 8
+arch grass_only
+x 10
+y 19
 end
-arch wall_2_1_2
-x 8
+arch grass_only
+x 10
+y 20
 end
-arch shop_food
-x 8
+arch grass_only
+x 10
+y 21
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
-arch shop_empty
-x 8
+arch grass_only
+x 11
 y 2
 end
-arch shop_food
-x 8
+arch shop_empty
+x 11
+y 3
+end
+arch wall_2_1_2
+x 11
 y 3
 end
 arch shop_food
-x 8
+x 11
 y 4
 end
-arch shop_food
-x 8
+arch shop_empty
+x 11
 y 5
 end
 arch shop_food
-x 8
+x 11
 y 6
 end
 arch shop_food
-x 8
+x 11
 y 7
 end
 arch shop_food
-x 8
+x 11
 y 8
 end
 arch shop_food
-x 8
+x 11
 y 9
 end
 arch shop_food
-x 8
+x 11
 y 10
 end
 arch shop_food
-x 8
+x 11
 y 11
 end
-arch shop_empty
-x 8
+arch shop_food
+x 11
 y 12
 end
-arch shop_empty
-x 8
+arch light4
+x 11
 y 13
 end
+arch shop_food
+x 11
+y 13
+end
+arch shop_food
+x 11
+y 14
+end
+arch shop_empty
+x 11
+y 15
+end
+arch shop_empty
+x 11
+y 16
+end
 arch shop_potions
-x 8
-y 14
+x 11
+y 17
 end
 arch shop_empty
-x 8
-y 15
+x 11
+y 18
 end
 arch wall_2_1_2
-x 8
-y 15
+x 11
+y 18
 end
-arch shop_empty
-x 9
+arch grass_only
+x 11
+y 19
 end
-arch wall_2_1_2
-x 9
+arch grass_only
+x 11
+y 20
 end
-arch shop_empty
-x 9
+arch grass_only
+x 11
+y 21
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
 y 1
 end
-arch shop_empty
-x 9
+arch grass_only
+x 12
 y 2
 end
 arch shop_empty
-x 9
+x 12
+y 3
+end
+arch wall_2_1_2
+x 12
 y 3
 end
 arch shop_empty
-x 9
+x 12
 y 4
 end
-arch shop_empty
-x 9
+arch light4
+x 12
 y 5
 end
 arch shop_empty
-x 9
+x 12
+y 5
+end
+arch shop_empty
+x 12
 y 6
 end
 arch shop_empty
-x 9
+x 12
 y 7
 end
-arch shop_empty
-x 9
+arch light4
+x 12
 y 8
 end
 arch shop_empty
-x 9
+x 12
+y 8
+end
+arch shop_empty
+x 12
 y 9
 end
 arch shop_empty
-x 9
+x 12
 y 10
 end
 arch shop_empty
-x 9
+x 12
 y 11
 end
 arch shop_empty
-x 9
+x 12
 y 12
 end
 arch shop_empty
-x 9
+x 12
 y 13
 end
+arch shop_empty
+x 12
+y 14
+end
+arch light4
+x 12
+y 15
+end
+arch shop_empty
+x 12
+y 15
+end
+arch shop_empty
+x 12
+y 16
+end
+arch light4
+x 12
+y 17
+end
 arch shop_special
-x 9
-y 14
+x 12
+y 17
+end
+arch light3
+x 12
+y 18
 end
 arch shop_empty
-x 9
-y 15
+x 12
+y 18
 end
-arch wall_2_1_2
-x 9
-y 15
+arch window_win2
+x 12
+y 18
 end
-arch shop_empty
-x 10
+arch grass_only
+x 12
+y 19
 end
-arch wall_2_1_2
-x 10
+arch grass_only
+x 12
+y 20
 end
-arch shop_empty
-x 10
+arch grass_only
+x 12
+y 21
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
-arch shop_empty
-x 10
+arch grass_only
+x 13
 y 2
 end
 arch shop_empty
-x 10
+x 13
+y 3
+end
+arch wall_2_1_2
+x 13
 y 3
 end
 arch shop_empty
-x 10
+x 13
 y 4
 end
 arch shop_empty
-x 10
+x 13
 y 5
 end
 arch shop_empty
-x 10
+x 13
 y 6
 end
 arch shop_empty
-x 10
+x 13
 y 7
 end
 arch shop_empty
-x 10
+x 13
 y 8
 end
 arch shop_empty
-x 10
+x 13
 y 9
 end
 arch shop_empty
-x 10
+x 13
 y 10
 end
-arch shop_empty
-x 10
+arch light4
+x 13
 y 11
 end
 arch shop_empty
-x 10
+x 13
+y 11
+end
+arch shop_empty
+x 13
 y 12
 end
 arch shop_empty
-x 10
+x 13
 y 13
 end
-arch shop_potions
-x 10
+arch shop_empty
+x 13
 y 14
 end
 arch shop_empty
-x 10
+x 13
 y 15
 end
+arch shop_empty
+x 13
+y 16
+end
+arch shop_potions
+x 13
+y 17
+end
+arch shop_empty
+x 13
+y 18
+end
 arch swall_1_4
-x 10
-y 15
+x 13
+y 18
 end
 arch wall_2_1_2
-x 10
-y 15
+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 light3
+x 14
+y 3
 end
 arch shop_empty
-x 11
+x 14
+y 3
 end
-arch wall_2_1_2
-x 11
+arch window_win2
+x 14
+y 3
 end
 arch shop_weapon
-x 11
-y 1
-end
-arch shop_empty
-x 11
-y 2
-end
-arch shop_throw
-x 11
-y 3
-end
-arch shop_empty
-x 11
+x 14
 y 4
 end
-arch swall_1_4
-x 11
-y 4
-end
-arch shop_general
-x 11
+arch shop_empty
+x 14
 y 5
 end
-arch shop_empty
-x 11
+arch shop_throw
+x 14
 y 6
 end
-arch shop_general
-x 11
+arch shop_empty
+x 14
 y 7
 end
-arch shop_empty
-x 11
-y 8
-end
 arch swall_1_4
-x 11
+x 14
+y 7
+end
+arch wall_0
+x 14
+y 7
+blocksview 0
+end
+arch shop_general
+x 14
 y 8
 end
 arch shop_empty
-x 11
+x 14
 y 9
 end
-arch shop_empty
-x 11
+arch shop_general
+x 14
 y 10
 end
 arch shop_empty
-x 11
+x 14
 y 11
 end
+arch swall_1_4
+x 14
+y 11
+end
+arch wall_0
+x 14
+y 11
+blocksview 0
+end
+arch shop_empty
+x 14
+y 12
+end
+arch light4
+x 14
+y 13
+end
+arch shop_empty
+x 14
+y 13
+end
+arch shop_empty
+x 14
+y 14
+end
 arch swall_2_2_2
-x 11
-y 11
-end
-arch shop_empty
-x 11
-y 12
-end
-arch swall_2_1_1
-x 11
-y 12
-end
-arch shop_empty
-x 11
-y 13
-end
-arch swall_2_1_1
-x 11
-y 13
-end
-arch shop_empty
-x 11
+x 14
 y 14
 end
-arch swall_2_1_1
-x 11
+arch wall_0
+x 14
 y 14
+blocksview 0
 end
 arch shop_empty
-x 11
+x 14
 y 15
 end
+arch swall_2_1_1
+x 14
+y 15
+end
+arch light4
+x 14
+y 16
+end
+arch shop_empty
+x 14
+y 16
+end
+arch swall_2_1_1
+x 14
+y 16
+end
+arch shop_empty
+x 14
+y 17
+end
+arch swall_2_1_1
+x 14
+y 17
+end
+arch shop_empty
+x 14
+y 18
+end
 arch swall_2_2_4
-x 11
-y 15
+x 14
+y 18
 end
 arch wall_2_1_2
-x 11
-y 15
+x 14
+y 18
 end
-arch shop_empty
-x 12
+arch grass_only
+x 14
+y 19
 end
-arch wall_2_1_2
-x 12
+arch grass_only
+x 14
+y 20
 end
-arch shop_weapon
-x 12
+arch grass_only
+x 14
+y 21
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
 y 1
 end
-arch shop_empty
-x 12
+arch grass_only
+x 15
 y 2
 end
-arch shop_throw
-x 12
+arch shop_empty
+x 15
 y 3
 end
-arch shop_empty
-x 12
+arch wall_2_1_2
+x 15
+y 3
+end
+arch shop_weapon
+x 15
 y 4
 end
-arch swall_2_1_2
-x 12
-y 4
-end
-arch shop_general
-x 12
+arch light4
+x 15
 y 5
 end
 arch shop_empty
-x 12
+x 15
+y 5
+end
+arch shop_throw
+x 15
 y 6
 end
-arch shop_general
-x 12
+arch shop_empty
+x 15
 y 7
 end
-arch shop_empty
-x 12
-y 8
-end
 arch swall_2_1_2
-x 12
+x 15
+y 7
+end
+arch light4
+x 15
+y 8
+end
+arch shop_general
+x 15
 y 8
 end
 arch shop_empty
-x 12
+x 15
 y 9
 end
-arch shop_empty
-x 12
+arch shop_general
+x 15
 y 10
 end
 arch shop_empty
-x 12
+x 15
 y 11
 end
 arch swall_2_1_2
-x 12
+x 15
 y 11
 end
-arch woodfloor
-x 12
+arch shop_empty
+x 15
 y 12
 end
+arch shop_empty
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 14
+end
+arch swall_2_1_2
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 15
+end
 arch altar
 name altar of detect curse (25 sp)
 slaying money
 food 25
-x 12
-y 12
+x 15
+y 15
 arch spell_detect_curse
 end
 end
 arch woodfloor
-x 12
-y 13
-end
-arch woodfloor
-x 12
-y 14
+x 15
+y 16
 end
 arch menu
-x 12
-y 14
+x 15
+y 16
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 12
-y 15
-end
-arch wall_2_1_2
-x 12
-y 15
-end
-arch shop_empty
-x 13
-end
-arch wall_2_1_2
-x 13
-end
-arch shop_weapon
-x 13
-y 1
-end
-arch shop_empty
-x 13
-y 2
-end
-arch shop_throw
-x 13
-y 3
-end
-arch shop_empty
-x 13
-y 4
-end
-arch swall_2_1_2
-x 13
-y 4
-end
-arch shop_general
-x 13
-y 5
-end
-arch shop_empty
-x 13
-y 6
-end
-arch shop_general
-x 13
-y 7
-end
-arch shop_empty
-x 13
-y 8
-end
-arch swall_2_1_2
-x 13
-y 8
-end
-arch shop_empty
-x 13
-y 9
-end
-arch shop_empty
-x 13
-y 10
-end
-arch shop_empty
-x 13
-y 11
-end
-arch swall_2_1_2
-x 13
-y 11
+arch button_small
+x 15
+y 17
+connected 1
 end
 arch woodfloor
-x 13
-y 12
+x 15
+y 17
+end
+arch light2
+x 15
+y 18
 end
 arch woodfloor
-x 13
-y 13
-end
-arch woodfloor
-x 13
-y 14
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 13
-y 15
+x 15
+y 18
 end
 arch wall_1_3
-x 13
-y 15
+x 15
+y 18
 end
-arch shop_empty
-x 14
-end
-arch wall_2_1_2
-x 14
-end
-arch shop_armour
-x 14
-y 1
-end
-arch shop_armour
-x 14
-y 2
-end
-arch shop_armour
-x 14
-y 3
-end
-arch shop_empty
-x 14
-y 4
-end
-arch swall_2_1_2
-x 14
-y 4
-end
-arch shop_general
-x 14
-y 5
-end
-arch shop_light
-x 14
-y 6
-end
-arch shop_general
-x 14
-y 7
-end
-arch shop_empty
-x 14
-y 8
-end
-arch swall_2_1_2
-x 14
-y 8
-end
-arch shop_empty
-x 14
-y 9
-end
-arch shop_empty
-x 14
-y 10
-end
-arch shop_mat
-x 14
-y 10
-end
-arch shop_empty
-x 14
-y 11
-end
-arch swall_2_1_2
-x 14
-y 11
-end
-arch woodfloor
-x 14
-y 12
-end
-arch shop_mat
-x 14
-y 12
-end
-arch woodfloor
-x 14
-y 13
-end
-arch woodfloor
-x 14
-y 14
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 14
-y 15
-end
-arch oakdoor_2
+arch invis_exit
 slaying /world/world_105_116
 hp 12
 sp 2
-x 14
-y 15
+x 15
+y 19
+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 shop_empty
-x 15
+x 16
+y 3
+end
+arch wall_2_1_2
+x 16
+y 3
+end
+arch shop_weapon
+x 16
+y 4
+end
+arch shop_empty
+x 16
+y 5
+end
+arch shop_throw
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+end
+arch swall_2_1_2
+x 16
+y 7
+end
+arch shop_general
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 9
+end
+arch shop_general
+x 16
+y 10
+end
+arch light4
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 11
+end
+arch swall_2_1_2
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 12
+end
+arch light4
+x 16
+y 13
+end
+arch shop_empty
+x 16
+y 13
+end
+arch light4
+x 16
+y 14
+end
+arch shop_empty
+x 16
+y 14
+end
+arch swall_2_1_2
+x 16
+y 14
+end
+arch woodfloor
+x 16
+y 15
+end
+arch woodfloor
+x 16
+y 16
+end
+arch button_small
+x 16
+y 17
+connected 1
+end
+arch woodfloor
+x 16
+y 17
+end
+arch button_small
+x 16
+y 18
+connected 1
+end
+arch woodfloor
+x 16
+y 18
+end
+arch odoorn2_closed_1
+x 16
+y 18
+connected 1
+end
+arch invis_exit
+slaying /world/world_105_116
+hp 12
+sp 2
+x 16
+y 19
+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 shop_empty
+x 17
+y 3
+end
+arch wall_2_1_2
+x 17
+y 3
+end
+arch shop_armour
+x 17
+y 4
+end
+arch shop_armour
+x 17
+y 5
+end
+arch shop_armour
+x 17
+y 6
+end
+arch shop_empty
+x 17
+y 7
+end
+arch swall_2_1_2
+x 17
+y 7
+end
+arch shop_general
+x 17
+y 8
+end
+arch shop_light
+x 17
+y 9
+end
+arch shop_general
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch swall_2_1_2
+x 17
+y 11
+end
+arch shop_empty
+x 17
+y 12
+end
+arch shop_empty
+x 17
+y 13
+end
+arch shop_mat
+x 17
+y 13
+end
+arch shop_empty
+x 17
+y 14
+end
+arch swall_2_1_2
+x 17
+y 14
+end
+arch woodfloor
+x 17
+y 15
+end
+arch shop_mat
+x 17
+y 15
+end
+arch light4
+x 17
+y 16
+end
+arch woodfloor
+x 17
+y 16
+end
+arch button_small
+x 17
+y 17
+connected 1
+end
+arch woodfloor
+x 17
+y 17
+end
+arch light2
+x 17
+y 18
+end
+arch woodfloor
+x 17
+y 18
+end
+arch wall_1_4
+x 17
+y 18
+end
+arch invis_exit
+slaying /world/world_105_116
+hp 12
+sp 2
+x 17
+y 19
+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 shop_empty
+x 18
+y 3
 end
 arch wall_2_2_3
-x 15
-end
-arch shop_empty
-x 15
-y 1
-end
-arch wall_2_1_1
-x 15
-y 1
-end
-arch shop_empty
-x 15
-y 2
-end
-arch wall_2_1_1
-x 15
-y 2
-end
-arch shop_empty
-x 15
-y 3
-end
-arch wall_2_1_1
-x 15
+x 18
 y 3
 end
 arch shop_empty
-x 15
+x 18
 y 4
 end
 arch wall_2_1_1
-x 15
+x 18
 y 4
 end
-arch swall_1_3_half
-x 15
-y 4
-end
-arch shop_empty
-x 15
-y 5
-end
-arch wall_2_1_1
-x 15
+arch light3
+x 18
 y 5
 end
 arch shop_empty
-x 15
+x 18
+y 5
+end
+arch window_win1
+x 18
+y 5
+end
+arch shop_empty
+x 18
 y 6
 end
 arch wall_2_1_1
-x 15
+x 18
 y 6
 end
 arch shop_empty
-x 15
+x 18
 y 7
 end
 arch wall_2_1_1
-x 15
+x 18
+y 7
+end
+arch swall_1_3_half
+x 18
 y 7
 end
 arch shop_empty
-x 15
-y 8
-end
-arch swall_1_3_half
-x 15
+x 18
 y 8
 end
 arch wall_2_1_1
-x 15
+x 18
 y 8
 end
-arch shop_empty
-x 15
-y 9
-end
-arch wall_2_1_1
-x 15
+arch light3
+x 18
 y 9
 end
 arch shop_empty
-x 15
+x 18
+y 9
+end
+arch window_win1
+x 18
+y 9
+end
+arch shop_empty
+x 18
 y 10
 end
 arch wall_2_1_1
-x 15
+x 18
 y 10
 end
 arch shop_empty
-x 15
+x 18
 y 11
 end
 arch swall_1_3_half
-x 15
+x 18
 y 11
 end
 arch wall_2_1_1
-x 15
+x 18
 y 11
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 15
+arch shop_empty
+x 18
 y 12
 end
 arch wall_2_1_1
-x 15
+x 18
 y 12
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 15
+arch light3
+x 18
 y 13
 end
-arch wall_2_1_1
-x 15
+arch shop_empty
+x 18
 y 13
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 15
+arch window_win1
+x 18
+y 13
+end
+arch shop_empty
+x 18
 y 14
 end
 arch wall_2_1_1
-x 15
+x 18
 y 14
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 15
+arch swall_1_3_half
+x 18
+y 14
+end
+arch woodfloor
+x 18
 y 15
 end
-arch wall_1_2
-x 15
+arch wall_2_1_1
+x 18
 y 15
 end
+arch woodfloor
+x 18
+y 16
+end
+arch wall_2_1_1
+x 18
+y 16
+end
+arch woodfloor
+x 18
+y 17
+end
+arch wall_2_1_1
+x 18
+y 17
+end
+arch woodfloor
+x 18
+y 18
+end
+arch wall_2_2_4
+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 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 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 grass_only
+x 20
+y 3
+end
+arch grass_only
+x 20
+y 4
+end
+arch grass_only
+x 20
+y 5
+end
+arch grass_only
+x 20
+y 6
+end
+arch grass_only
+x 20
+y 7
+end
+arch grass_only
+x 20
+y 8
+end
+arch grass_only
+x 20
+y 9
+end
+arch grass_only
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch grass_only
+x 20
+y 12
+end
+arch grass_only
+x 20
+y 13
+end
+arch grass_only
+x 20
+y 14
+end
+arch grass_only
+x 20
+y 15
+end
+arch grass_only
+x 20
+y 16
+end
+arch grass_only
+x 20
+y 17
+end
+arch grass_only
+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 grass_only
+x 21
+y 3
+end
+arch grass_only
+x 21
+y 4
+end
+arch grass_only
+x 21
+y 5
+end
+arch grass_only
+x 21
+y 6
+end
+arch grass_only
+x 21
+y 7
+end
+arch grass_only
+x 21
+y 8
+end
+arch grass_only
+x 21
+y 9
+end
+arch grass_only
+x 21
+y 10
+end
+arch grass_only
+x 21
+y 11
+end
+arch grass_only
+x 21
+y 12
+end
+arch grass_only
+x 21
+y 13
+end
+arch grass_only
+x 21
+y 14
+end
+arch grass_only
+x 21
+y 15
+end
+arch grass_only
+x 21
+y 16
+end
+arch grass_only
+x 21
+y 17
+end
+arch grass_only
+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 grass_only
+x 22
+y 3
+end
+arch grass_only
+x 22
+y 4
+end
+arch grass_only
+x 22
+y 5
+end
+arch grass_only
+x 22
+y 6
+end
+arch grass_only
+x 22
+y 7
+end
+arch grass_only
+x 22
+y 8
+end
+arch grass_only
+x 22
+y 9
+end
+arch grass_only
+x 22
+y 10
+end
+arch grass_only
+x 22
+y 11
+end
+arch grass_only
+x 22
+y 12
+end
+arch grass_only
+x 22
+y 13
+end
+arch grass_only
+x 22
+y 14
+end
+arch grass_only
+x 22
+y 15
+end
+arch grass_only
+x 22
+y 16
+end
+arch grass_only
+x 22
+y 17
+end
+arch grass_only
+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
diff --git a/world/world_105_116 b/world/world_105_116
index f73d3e43d..1cc14c197 100644
--- a/world/world_105_116
+++ b/world/world_105_116
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2011-03-26 Rick Tanner
+Modified: 2011-04-13 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_115
@@ -3616,8 +3616,8 @@ end
 arch store_general
 name Scorn General store
 slaying /scorn/shops/generalshop
-hp 14
-sp 15
+hp 16
+sp 16
 x 11
 y 1
 end