From 6654ab227b24a1792a7e90e9efbe7b6735bedadc Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 3 Apr 2011 00:27:22 +0000
Subject: [PATCH] Major cosmetic overhaul to the Weapon Shop in Scorn. 
 Exapnded the map to include ground outside the shop walls. Floor plan matches
 the physical building shape.  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@14366 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/weaponshop | 3988 +++++++++++++++++++++++++++++-----------
 world/world_104_115    |    6 +-
 2 files changed, 2954 insertions(+), 1040 deletions(-)

diff --git a/scorn/shops/weaponshop b/scorn/shops/weaponshop
index 3aa57bf3c..d1d22d036 100644
--- a/scorn/shops/weaponshop
+++ b/scorn/shops/weaponshop
@@ -5,517 +5,2011 @@ difficulty 3
 region scorn
 shopitems weapon:80;*:-50
 shopmax 3000
-width 16
-height 16
+width 25
+height 25
 enter_x 2
 enter_y 14
 msg
 Created:  1993-10-15
-Modified: 2010-11-05 Andreas Kirschbaum
+Modified: 2011-04-02 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
+y 22
+end
+arch grass_only
+y 23
+end
+arch grass_only
+y 24
+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 1
+y 22
+end
+arch grass_only
+x 1
+y 23
+end
+arch grass_only
+x 1
+y 24
+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 2
+y 22
+end
+arch grass_only
+x 2
+y 23
+end
+arch grass_only
+x 2
+y 24
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch grass_only
+x 3
+y 2
+end
+arch light3
+x 3
+y 3
 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
+x 3
 y 3
 end
-arch wall_2_1_1
+arch wall_0
+x 3
 y 3
+blocksview 0
 end
 arch shop_empty
-y 4
-end
-arch swall_1_4_half
+x 3
 y 4
 end
 arch wall_2_1_1
+x 3
 y 4
 end
 arch shop_empty
+x 3
 y 5
 end
 arch wall_2_1_1
+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
+x 3
 y 7
 end
 arch wall_2_1_1
+x 3
 y 7
 end
-arch shop_empty
-y 8
-end
-arch swall_1_4_half
-y 8
-end
-arch wall_2_1_1
+arch light4
+x 3
 y 8
 end
 arch shop_empty
+x 3
+y 8
+end
+arch window_win1
+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
+x 3
 y 10
 end
 arch shop_empty
+x 3
 y 11
 end
 arch wall_2_1_1
+x 3
 y 11
 end
 arch shop_empty
-y 12
-end
-arch swall_1_4_half
+x 3
 y 12
 end
 arch wall_2_1_1
+x 3
 y 12
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch shop_empty
+x 3
 y 13
 end
 arch wall_2_1_1
+x 3
 y 13
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch shop_empty
+x 3
 y 14
 end
 arch wall_2_1_1
+x 3
 y 14
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch shop_empty
+x 3
 y 15
 end
+arch wall_2_1_1
+x 3
+y 15
+end
+arch light4
+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_1_1
+x 3
+y 18
+end
+arch shop_empty
+x 3
+y 19
+end
+arch wall_2_1_1
+x 3
+y 19
+end
+arch shop_empty
+x 3
+y 20
+end
+arch wall_2_1_1
+x 3
+y 20
+end
+arch shop_empty
+x 3
+y 21
+end
 arch wall_2_2_1
-y 15
+x 3
+y 21
 end
-arch shop_empty
-x 1
+arch wall_0
+x 3
+y 21
+blocksview 0
 end
-arch wall_2_1_2
-x 1
+arch grass_only
+x 3
+y 22
 end
-arch shop_gems
-x 1
+arch grass_only
+x 3
+y 23
+end
+arch grass_only
+x 3
+y 24
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch shop_gems
-x 1
+arch grass_only
+x 4
 y 2
 end
-arch shop_gems
-x 1
+arch shop_empty
+x 4
 y 3
 end
-arch shop_empty
-x 1
+arch wall_2_1_2
+x 4
+y 3
+end
+arch shop_weapon
+x 4
 y 4
 end
-arch swall_2_1_2
-x 1
-y 4
-end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 5
 end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 6
 end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 7
 end
-arch shop_empty
-x 1
+arch shop_weapon
+x 4
 y 8
 end
-arch swall_2_1_2
-x 1
-y 8
-end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 9
 end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 10
 end
-arch shop_special
-x 1
+arch shop_weapon
+x 4
 y 11
 end
-arch shop_empty
-x 1
+arch shop_weapon
+x 4
 y 12
 end
-arch swall_2_1_2
-x 1
-y 12
-end
-arch woodfloor
-x 1
+arch shop_weapon
+x 4
 y 13
 end
-arch menu
-x 1
-y 13
-end
-arch woodfloor
-x 1
+arch shop_weapon
+x 4
 y 14
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch shop_weapon
+x 4
 y 15
 end
-arch wall_1_3
-x 1
-y 15
+arch shop_weapon
+x 4
+y 16
+end
+arch shop_weapon
+x 4
+y 17
+end
+arch shop_weapon
+x 4
+y 18
+end
+arch shop_weapon
+x 4
+y 19
+end
+arch shop_weapon
+x 4
+y 20
 end
 arch shop_empty
-x 2
+x 4
+y 21
 end
 arch wall_2_1_2
-x 2
+x 4
+y 21
 end
-arch shop_gems
-x 2
+arch grass_only
+x 4
+y 22
+end
+arch grass_only
+x 4
+y 23
+end
+arch grass_only
+x 4
+y 24
+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_gems
-x 2
+arch shop_empty
+x 5
 y 3
 end
+arch wall_2_1_2
+x 5
+y 3
+end
+arch shop_weapon
+x 5
+y 4
+end
 arch shop_empty
-x 2
-y 4
-end
-arch swall_2_1_2
-x 2
-y 4
-end
-arch shop_special
-x 2
+x 5
 y 5
 end
 arch shop_empty
-x 2
+x 5
 y 6
 end
-arch shop_special
-x 2
+arch shop_empty
+x 5
 y 7
 end
 arch shop_empty
-x 2
+x 5
 y 8
 end
-arch swall_2_1_2
-x 2
-y 8
-end
-arch shop_special
-x 2
+arch shop_empty
+x 5
 y 9
 end
 arch shop_empty
-x 2
+x 5
 y 10
 end
-arch shop_special
-x 2
+arch shop_empty
+x 5
 y 11
 end
 arch shop_empty
-x 2
+x 5
 y 12
 end
-arch swall_2_1_2
-x 2
-y 12
-end
-arch woodfloor
-x 2
+arch shop_empty
+x 5
 y 13
 end
-arch shop_mat
-x 2
-y 13
-end
-arch woodfloor
-x 2
+arch shop_empty
+x 5
 y 14
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 15
-end
-arch oakdoor_2
-slaying /world/world_104_115
-hp 45
-sp 32
-x 2
+arch shop_empty
+x 5
 y 15
 end
 arch shop_empty
-x 3
+x 5
+y 16
+end
+arch shop_empty
+x 5
+y 17
+end
+arch shop_empty
+x 5
+y 18
+end
+arch shop_empty
+x 5
+y 19
+end
+arch shop_weapon
+x 5
+y 20
+end
+arch shop_empty
+x 5
+y 21
 end
 arch wall_2_1_2
-x 3
+x 5
+y 21
 end
-arch shop_gems
-x 3
+arch grass_only
+x 5
+y 22
+end
+arch grass_only
+x 5
+y 23
+end
+arch grass_only
+x 5
+y 24
+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_gems
-x 3
+arch shop_empty
+x 6
 y 3
 end
+arch wall_2_1_2
+x 6
+y 3
+end
+arch shop_weapon
+x 6
+y 4
+end
 arch shop_empty
-x 3
-y 4
-end
-arch swall_2_1_2
-x 3
-y 4
-end
-arch shop_special
-x 3
+x 6
 y 5
 end
 arch shop_empty
-x 3
+x 6
 y 6
 end
-arch shop_special
-x 3
+arch swall_2_2_2
+x 6
+y 6
+end
+arch wall_0
+x 6
+y 6
+blocksview 0
+end
+arch light4
+x 6
 y 7
 end
 arch shop_empty
-x 3
-y 8
+x 6
+y 7
 end
-arch swall_2_1_2
-x 3
-y 8
-end
-arch shop_special
-x 3
-y 9
+arch swall_2_1_1
+x 6
+y 7
 end
 arch shop_empty
-x 3
+x 6
+y 8
+end
+arch swall_2_1_1
+x 6
+y 8
+end
+arch shop_empty
+x 6
+y 9
+end
+arch swall_2_1_1
+x 6
+y 9
+end
+arch wall_1_short
+x 6
+y 9
+blocksview 0
+end
+arch shop_empty
+x 6
 y 10
 end
-arch shop_special
-x 3
+arch swall_2_1_1
+x 6
+y 10
+end
+arch light4
+x 6
 y 11
 end
 arch shop_empty
-x 3
-y 12
+x 6
+y 11
 end
-arch swall_3_3
-x 3
-y 12
+arch swall_2_1_1
+x 6
+y 11
 end
 arch shop_empty
-x 3
+x 6
+y 12
+end
+arch swall_2_1_1
+x 6
+y 12
+end
+arch wall_1_short
+x 6
+y 12
+blocksview 0
+end
+arch shop_empty
+x 6
 y 13
 end
 arch swall_2_1_1
-x 3
+x 6
 y 13
 end
 arch shop_empty
-x 3
+x 6
 y 14
 end
 arch swall_2_1_1
-x 3
+x 6
+y 14
+end
+arch light4
+x 6
+y 15
+end
+arch shop_empty
+x 6
+y 15
+end
+arch swall_2_2_1
+x 6
+y 15
+end
+arch wall_0
+x 6
+y 15
+blocksview 0
+end
+arch shop_empty
+x 6
+y 16
+end
+arch shop_empty
+x 6
+y 17
+end
+arch shop_empty
+x 6
+y 18
+end
+arch light4
+x 6
+y 19
+end
+arch shop_empty
+x 6
+y 19
+end
+arch shop_weapon
+x 6
+y 20
+end
+arch light2
+x 6
+y 21
+end
+arch shop_empty
+x 6
+y 21
+end
+arch window_win2
+x 6
+y 21
+end
+arch grass_only
+x 6
+y 22
+end
+arch grass_only
+x 6
+y 23
+end
+arch grass_only
+x 6
+y 24
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch grass_only
+x 7
+y 2
+end
+arch light4
+x 7
+y 3
+end
+arch shop_empty
+x 7
+y 3
+end
+arch window_win2
+x 7
+y 3
+end
+arch shop_weapon
+x 7
+y 4
+end
+arch shop_empty
+x 7
+y 5
+end
+arch shop_empty
+x 7
+y 6
+end
+arch swall_1_3_half
+x 7
+y 6
+end
+arch wall_0
+x 7
+y 6
+blocksview 0
+end
+arch shop_weapon
+x 7
+y 7
+end
+arch shop_weapon
+x 7
+y 8
+end
+arch shop_weapon
+x 7
+y 9
+end
+arch shop_weapon
+x 7
+y 10
+end
+arch shop_weapon
+x 7
+y 11
+end
+arch shop_weapon
+x 7
+y 12
+end
+arch shop_weapon
+x 7
+y 13
+end
+arch shop_weapon
+x 7
 y 14
 end
 arch shop_empty
-x 3
+x 7
 y 15
 end
+arch swall_1_3_half
+x 7
+y 15
+end
+arch wall_0
+x 7
+y 15
+blocksview 0
+end
+arch shop_empty
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 17
+end
+arch shop_weapon
+x 7
+y 18
+end
+arch shop_weapon
+x 7
+y 19
+end
+arch shop_weapon
+x 7
+y 20
+end
+arch shop_empty
+x 7
+y 21
+end
+arch wall_2_1_2
+x 7
+y 21
+end
+arch grass_only
+x 7
+y 22
+end
+arch grass_only
+x 7
+y 23
+end
+arch grass_only
+x 7
+y 24
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch grass_only
+x 8
+y 2
+end
+arch light3
+x 8
+y 3
+end
+arch shop_empty
+x 8
+y 3
+end
+arch wall_2_1_2
+x 8
+y 3
+end
+arch shop_weapon
+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 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 shop_empty
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 14
+end
+arch shop_empty
+x 8
+y 15
+end
+arch shop_empty
+x 8
+y 16
+end
+arch shop_empty
+x 8
+y 17
+end
+arch woodfloor
+x 8
+y 18
+end
+arch swall_2_2_2
+x 8
+y 18
+end
+arch wall_0
+x 8
+y 18
+blocksview 0
+end
+arch woodfloor
+x 8
+y 19
+end
+arch swall_2_1_1
+x 8
+y 19
+end
+arch woodfloor
+x 8
+y 20
+end
+arch swall_2_1_1
+x 8
+y 20
+end
+arch woodfloor
+x 8
+y 21
+end
 arch swall_1_2_half
-x 3
-y 15
-end
-arch wall_1_4
-x 3
-y 15
-end
-arch shop_empty
-x 4
+x 8
+y 21
 end
 arch wall_2_1_2
-x 4
+x 8
+y 21
 end
-arch shop_gems
-x 4
+arch wall_0
+x 8
+y 21
+blocksview 0
+end
+arch grass_only
+x 8
+y 22
+end
+arch grass_only
+x 8
+y 23
+end
+arch grass_only
+x 8
+y 24
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
-arch shop_empty
-x 4
+arch grass_only
+x 9
 y 2
 end
-arch shop_gems
-x 4
+arch shop_empty
+x 9
 y 3
 end
+arch wall_2_1_2
+x 9
+y 3
+end
+arch shop_weapon
+x 9
+y 4
+end
+arch shop_weapon
+x 9
+y 4
+end
 arch shop_empty
-x 4
-y 4
-end
-arch swall_1_3
-x 4
-y 4
-end
-arch shop_special
-x 4
+x 9
 y 5
 end
 arch shop_empty
-x 4
+x 9
 y 6
 end
-arch shop_special
-x 4
+arch shop_empty
+x 9
 y 7
 end
 arch shop_empty
-x 4
+x 9
 y 8
 end
-arch swall_1_3
-x 4
-y 8
-end
-arch shop_special
-x 4
+arch shop_empty
+x 9
 y 9
 end
 arch shop_empty
-x 4
+x 9
 y 10
 end
-arch shop_special
-x 4
+arch shop_empty
+x 9
 y 11
 end
 arch shop_empty
-x 4
-y 12
-end
-arch swall_1_3
-x 4
+x 9
 y 12
 end
 arch shop_empty
-x 4
+x 9
 y 13
 end
 arch shop_empty
-x 4
-y 14
-end
-arch shop_mat
-x 4
+x 9
 y 14
 end
 arch shop_empty
-x 4
-y 15
-end
-arch wall_2_1_2
-x 4
+x 9
 y 15
 end
 arch shop_empty
-x 5
-end
-arch wall_2_1_2
-x 5
+x 9
+y 16
 end
 arch shop_empty
-x 5
+x 9
+y 17
+end
+arch woodfloor
+x 9
+y 18
+end
+arch swall_2_1_2
+x 9
+y 18
+end
+arch woodfloor
+x 9
+y 19
+end
+arch woodfloor
+x 9
+y 20
+end
+arch woodfloor
+x 9
+y 21
+end
+arch wall_2_1_2
+x 9
+y 21
+end
+arch grass_only
+x 9
+y 22
+end
+arch grass_only
+x 9
+y 23
+end
+arch grass_only
+x 9
+y 24
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
-arch shop_empty
-x 5
+arch grass_only
+x 10
 y 2
 end
 arch shop_empty
-x 5
+x 10
 y 3
 end
-arch shop_empty
-x 5
+arch wall_2_1_2
+x 10
+y 3
+end
+arch shop_weapon
+x 10
 y 4
 end
 arch shop_empty
-x 5
+x 10
 y 5
 end
-arch shop_empty
-x 5
+arch shop_gems
+x 10
 y 6
 end
+arch shop_empty
+x 10
+y 7
+end
+arch swall_1_4
+x 10
+y 7
+end
+arch wall_0
+x 10
+y 7
+blocksview 0
+end
+arch shop_special
+x 10
+y 8
+end
+arch shop_empty
+x 10
+y 9
+end
+arch shop_special
+x 10
+y 10
+end
+arch shop_empty
+x 10
+y 11
+end
+arch swall_1_4
+x 10
+y 11
+end
+arch wall_0
+x 10
+y 11
+blocksview 0
+end
+arch shop_special
+x 10
+y 12
+end
+arch shop_empty
+x 10
+y 13
+end
+arch shop_special
+x 10
+y 14
+end
+arch shop_empty
+x 10
+y 15
+end
+arch swall_1_4
+x 10
+y 15
+end
+arch wall_0
+x 10
+y 15
+blocksview 0
+end
+arch shop_empty
+x 10
+y 16
+end
+arch shop_empty
+x 10
+y 17
+end
+arch woodfloor
+x 10
+y 18
+end
+arch swall_2_1_2
+x 10
+y 18
+end
+arch woodfloor
+x 10
+y 19
+end
+arch menu
+x 10
+y 19
+end
+arch woodfloor
+x 10
+y 20
+end
+arch woodfloor
+x 10
+y 21
+end
+arch wall_2_1_2
+x 10
+y 21
+end
+arch grass_only
+x 10
+y 22
+end
+arch grass_only
+x 10
+y 23
+end
+arch grass_only
+x 10
+y 24
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch grass_only
+x 11
+y 2
+end
+arch shop_empty
+x 11
+y 3
+end
+arch wall_2_1_2
+x 11
+y 3
+end
+arch shop_weapon
+x 11
+y 4
+end
+arch shop_empty
+x 11
+y 5
+end
+arch shop_gems
+x 11
+y 6
+end
+arch shop_empty
+x 11
+y 7
+end
+arch swall_2_1_2
+x 11
+y 7
+end
+arch shop_special
+x 11
+y 8
+end
+arch shop_empty
+x 11
+y 9
+end
+arch shop_special
+x 11
+y 10
+end
+arch shop_empty
+x 11
+y 11
+end
+arch swall_2_1_2
+x 11
+y 11
+end
+arch shop_special
+x 11
+y 12
+end
+arch shop_empty
+x 11
+y 13
+end
+arch shop_special
+x 11
+y 14
+end
+arch shop_empty
+x 11
+y 15
+end
+arch swall_2_1_2
+x 11
+y 15
+end
+arch shop_empty
+x 11
+y 16
+end
+arch shop_empty
+x 11
+y 17
+end
+arch light4
+x 11
+y 18
+end
+arch woodfloor
+x 11
+y 18
+end
+arch swall_2_1_2
+x 11
+y 18
+end
+arch wall_1_short
+x 11
+y 18
+blocksview 0
+end
+arch woodfloor
+x 11
+y 19
+end
+arch button_small
+x 11
+y 20
+connected 1
+end
+arch woodfloor
+x 11
+y 20
+end
+arch woodfloor
+x 11
+y 21
+end
+arch wall_1_3
+x 11
+y 21
+end
+arch dungeon_magic
+x 11
+y 22
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 32
+x 11
+y 22
+end
+arch cobblestones2
+x 11
+y 22
+end
+arch grass_only
+x 11
+y 23
+end
+arch grass_only
+x 11
+y 24
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch grass_only
+x 12
+y 2
+end
+arch light4
+x 12
+y 3
+end
+arch shop_empty
+x 12
+y 3
+end
+arch window_win2
+x 12
+y 3
+end
+arch shop_weapon
+x 12
+y 4
+end
+arch shop_empty
+x 12
+y 5
+end
+arch shop_gems
+x 12
+y 6
+end
+arch light4
+x 12
+y 7
+end
+arch shop_empty
+x 12
+y 7
+end
+arch swall_2_1_2
+x 12
+y 7
+end
+arch wall_1_short
+x 12
+y 7
+blocksview 0
+end
+arch shop_special
+x 12
+y 8
+end
+arch shop_empty
+x 12
+y 9
+end
+arch shop_special
+x 12
+y 10
+end
+arch light4
+x 12
+y 11
+end
+arch shop_empty
+x 12
+y 11
+end
+arch swall_2_1_2
+x 12
+y 11
+end
+arch wall_1_short
+x 12
+y 11
+blocksview 0
+end
+arch shop_special
+x 12
+y 12
+end
+arch shop_empty
+x 12
+y 13
+end
+arch shop_special
+x 12
+y 14
+end
+arch light4
+x 12
+y 15
+end
+arch shop_empty
+x 12
+y 15
+end
+arch swall_2_1_2
+x 12
+y 15
+end
+arch wall_1_short
+x 12
+y 15
+blocksview 0
+end
+arch shop_empty
+x 12
+y 16
+end
+arch shop_empty
+x 12
+y 17
+end
+arch shop_mat
+x 12
+y 17
+end
+arch woodfloor
+x 12
+y 18
+end
+arch swall_2_1_2
+x 12
+y 18
+end
+arch woodfloor
+x 12
+y 19
+end
+arch shop_mat
+x 12
+y 19
+end
+arch button_small
+x 12
+y 20
+connected 1
+end
+arch woodfloor
+x 12
+y 20
+end
+arch button_small
+x 12
+y 21
+connected 1
+end
+arch woodfloor
+x 12
+y 21
+end
+arch odoorn2_closed_1
+x 12
+y 21
+connected 1
+end
+arch dungeon_magic
+x 12
+y 22
+end
+arch light3
+x 12
+y 22
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 32
+x 12
+y 22
+end
+arch cobblestones2
+x 12
+y 22
+end
+arch cobblestones2
+x 12
+y 23
+end
+arch cobblestones2
+x 12
+y 24
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch grass_only
+x 13
+y 2
+end
+arch shop_empty
+x 13
+y 3
+end
+arch wall_2_1_2
+x 13
+y 3
+end
+arch shop_weapon
+x 13
+y 4
+end
+arch shop_empty
+x 13
+y 5
+end
+arch shop_gems
+x 13
+y 6
+end
+arch shop_empty
+x 13
+y 7
+end
+arch swall_2_1_2
+x 13
+y 7
+end
+arch shop_special
+x 13
+y 8
+end
+arch shop_empty
+x 13
+y 9
+end
+arch shop_special
+x 13
+y 10
+end
+arch shop_empty
+x 13
+y 11
+end
+arch swall_2_1_2
+x 13
+y 11
+end
+arch shop_special
+x 13
+y 12
+end
+arch shop_empty
+x 13
+y 13
+end
+arch shop_special
+x 13
+y 14
+end
+arch shop_empty
+x 13
+y 15
+end
+arch swall_2_1_2
+x 13
+y 15
+end
+arch shop_empty
+x 13
+y 16
+end
+arch shop_empty
+x 13
+y 17
+end
+arch light4
+x 13
+y 18
+end
+arch woodfloor
+x 13
+y 18
+end
+arch swall_2_1_2
+x 13
+y 18
+end
+arch wall_1_short
+x 13
+y 18
+blocksview 0
+end
+arch woodfloor
+x 13
+y 19
+end
+arch button_small
+x 13
+y 20
+connected 1
+end
+arch woodfloor
+x 13
+y 20
+end
+arch woodfloor
+x 13
+y 21
+end
+arch wall_1_4
+x 13
+y 21
+end
+arch dungeon_magic
+x 13
+y 22
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 44
+sp 32
+x 13
+y 22
+end
+arch cobblestones2
+x 13
+y 22
+end
+arch grass_only
+x 13
+y 23
+end
+arch grass_only
+x 13
+y 24
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch grass_only
+x 14
+y 2
+end
+arch shop_empty
+x 14
+y 3
+end
+arch wall_2_1_2
+x 14
+y 3
+end
+arch shop_weapon
+x 14
+y 4
+end
+arch shop_empty
+x 14
+y 5
+end
+arch shop_gems
+x 14
+y 6
+end
+arch shop_empty
+x 14
+y 7
+end
+arch swall_1_3
+x 14
+y 7
+end
+arch wall_0
+x 14
+y 7
+blocksview 0
+end
+arch shop_special
+x 14
+y 8
+end
+arch shop_empty
+x 14
+y 9
+end
+arch shop_special
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 11
+end
+arch swall_1_3
+x 14
+y 11
+end
+arch wall_0
+x 14
+y 11
+blocksview 0
+end
+arch shop_special
+x 14
+y 12
+end
+arch shop_empty
+x 14
+y 13
+end
+arch shop_special
+x 14
+y 14
+end
+arch shop_empty
+x 14
+y 15
+end
+arch swall_1_3
+x 14
+y 15
+end
+arch wall_0
+x 14
+y 15
+blocksview 0
+end
+arch shop_empty
+x 14
+y 16
+end
+arch shop_empty
+x 14
+y 17
+end
+arch woodfloor
+x 14
+y 18
+end
+arch swall_2_1_2
+x 14
+y 18
+end
+arch woodfloor
+x 14
+y 19
+end
 arch fighter
 name Shop owner
-x 5
-y 6
+x 14
+y 19
 speed 0.05
 sleep 0
 no_damage 1
@@ -533,879 +2027,1299 @@ title Python
 slaying /python/maps/witherspoon_manor/weapon_shop.py
 end
 end
-arch shop_empty
-x 5
-y 7
+arch woodfloor
+x 14
+y 20
 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 shop_empty
-x 5
-y 15
+arch woodfloor
+x 14
+y 21
 end
 arch wall_2_1_2
-x 5
-y 15
+x 14
+y 21
 end
-arch shop_empty
-x 6
+arch grass_only
+x 14
+y 22
 end
-arch wall_2_1_2
-x 6
+arch grass_only
+x 14
+y 23
 end
-arch shop_empty
-x 6
+arch grass_only
+x 14
+y 24
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
 y 1
 end
-arch shop_weapon
-x 6
-y 2
-end
-arch shop_weapon
-x 6
-y 3
-end
-arch shop_weapon
-x 6
-y 4
-end
-arch shop_weapon
-x 6
-y 5
-end
-arch shop_weapon
-x 6
-y 6
-end
-arch shop_weapon
-x 6
-y 7
-end
-arch shop_weapon
-x 6
-y 8
-end
-arch shop_weapon
-x 6
-y 9
-end
-arch shop_weapon
-x 6
-y 10
-end
-arch shop_weapon
-x 6
-y 11
-end
-arch shop_weapon
-x 6
-y 12
-end
-arch shop_weapon
-x 6
-y 13
-end
-arch shop_empty
-x 6
-y 14
-end
-arch shop_empty
-x 6
-y 15
-end
-arch wall_2_1_2
-x 6
-y 15
-end
-arch shop_empty
-x 7
-end
-arch wall_2_1_2
-x 7
-end
-arch shop_empty
-x 7
-y 1
-end
-arch shop_weapon
-x 7
+arch grass_only
+x 15
 y 2
 end
 arch shop_empty
-x 7
+x 15
 y 3
 end
-arch swall_1_1
-x 7
+arch wall_2_1_2
+x 15
 y 3
 end
-arch shop_empty
-x 7
-y 4
-end
-arch swall_2_1_1
-x 7
-y 4
-end
-arch shop_empty
-x 7
-y 5
-end
-arch swall_2_1_1
-x 7
-y 5
-end
-arch shop_empty
-x 7
-y 6
-end
-arch swall_2_1_1
-x 7
-y 6
-end
-arch shop_empty
-x 7
-y 7
-end
-arch swall_2_1_1
-x 7
-y 7
-end
-arch shop_empty
-x 7
-y 8
-end
-arch swall_2_1_1
-x 7
-y 8
-end
-arch shop_empty
-x 7
-y 9
-end
-arch swall_2_1_1
-x 7
-y 9
-end
-arch shop_empty
-x 7
-y 10
-end
-arch swall_2_1_1
-x 7
-y 10
-end
-arch shop_empty
-x 7
-y 11
-end
-arch swall_2_1_1
-x 7
-y 11
-end
-arch shop_empty
-x 7
-y 12
-end
-arch swall_1_2
-x 7
-y 12
-end
 arch shop_weapon
-x 7
+x 15
+y 4
+end
+arch shop_empty
+x 15
+y 5
+end
+arch shop_empty
+x 15
+y 6
+end
+arch shop_empty
+x 15
+y 7
+end
+arch shop_empty
+x 15
+y 8
+end
+arch shop_empty
+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 shop_empty
+x 15
 y 13
 end
 arch shop_empty
-x 7
+x 15
 y 14
 end
 arch shop_empty
-x 7
-y 15
-end
-arch wall_2_1_2
-x 7
-y 15
-end
-arch shop_empty
-x 8
-end
-arch wall_2_1_2
-x 8
-end
-arch shop_empty
-x 8
-y 1
-end
-arch shop_weapon
-x 8
-y 2
-end
-arch shop_weapon
-x 8
-y 3
-end
-arch shop_weapon
-x 8
-y 4
-end
-arch shop_weapon
-x 8
-y 5
-end
-arch shop_weapon
-x 8
-y 6
-end
-arch shop_weapon
-x 8
-y 7
-end
-arch shop_weapon
-x 8
-y 8
-end
-arch shop_weapon
-x 8
-y 9
-end
-arch shop_weapon
-x 8
-y 10
-end
-arch shop_weapon
-x 8
-y 11
-end
-arch shop_weapon
-x 8
-y 12
-end
-arch shop_weapon
-x 8
-y 13
-end
-arch shop_empty
-x 8
-y 14
-end
-arch shop_empty
-x 8
-y 15
-end
-arch wall_2_1_2
-x 8
-y 15
-end
-arch shop_empty
-x 9
-end
-arch wall_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_empty
-x 9
-y 14
-end
-arch shop_empty
-x 9
-y 15
-end
-arch wall_2_1_2
-x 9
-y 15
-end
-arch shop_empty
-x 10
-end
-arch wall_2_1_2
-x 10
-end
-arch shop_empty
-x 10
-y 1
-end
-arch shop_weapon
-x 10
-y 2
-end
-arch shop_weapon
-x 10
-y 3
-end
-arch shop_weapon
-x 10
-y 4
-end
-arch shop_weapon
-x 10
-y 5
-end
-arch shop_weapon
-x 10
-y 6
-end
-arch shop_weapon
-x 10
-y 7
-end
-arch shop_weapon
-x 10
-y 8
-end
-arch shop_weapon
-x 10
-y 9
-end
-arch shop_weapon
-x 10
-y 10
-end
-arch shop_weapon
-x 10
-y 11
-end
-arch shop_weapon
-x 10
-y 12
-end
-arch shop_weapon
-x 10
-y 13
-end
-arch shop_empty
-x 10
-y 14
-end
-arch shop_empty
-x 10
-y 15
-end
-arch wall_2_1_2
-x 10
-y 15
-end
-arch shop_empty
-x 11
-end
-arch wall_2_1_2
-x 11
-end
-arch shop_empty
-x 11
-y 1
-end
-arch shop_weapon
-x 11
-y 2
-end
-arch shop_empty
-x 11
-y 3
-end
-arch swall_1_1
-x 11
-y 3
-end
-arch shop_empty
-x 11
-y 4
-end
-arch swall_2_1_1
-x 11
-y 4
-end
-arch shop_empty
-x 11
-y 5
-end
-arch swall_2_1_1
-x 11
-y 5
-end
-arch shop_empty
-x 11
-y 6
-end
-arch swall_2_1_1
-x 11
-y 6
-end
-arch shop_empty
-x 11
-y 7
-end
-arch swall_2_1_1
-x 11
-y 7
-end
-arch shop_empty
-x 11
-y 8
-end
-arch swall_2_1_1
-x 11
-y 8
-end
-arch shop_empty
-x 11
-y 9
-end
-arch swall_2_1_1
-x 11
-y 9
-end
-arch shop_empty
-x 11
-y 10
-end
-arch swall_2_1_1
-x 11
-y 10
-end
-arch shop_empty
-x 11
-y 11
-end
-arch swall_2_1_1
-x 11
-y 11
-end
-arch shop_empty
-x 11
-y 12
-end
-arch swall_1_2
-x 11
-y 12
-end
-arch shop_weapon
-x 11
-y 13
-end
-arch shop_empty
-x 11
-y 14
-end
-arch shop_empty
-x 11
-y 15
-end
-arch wall_2_1_2
-x 11
-y 15
-end
-arch shop_empty
-x 12
-end
-arch wall_2_1_2
-x 12
-end
-arch shop_empty
-x 12
-y 1
-end
-arch shop_weapon
-x 12
-y 2
-end
-arch shop_weapon
-x 12
-y 3
-end
-arch shop_weapon
-x 12
-y 4
-end
-arch shop_weapon
-x 12
-y 5
-end
-arch shop_weapon
-x 12
-y 6
-end
-arch shop_weapon
-x 12
-y 7
-end
-arch shop_weapon
-x 12
-y 8
-end
-arch shop_weapon
-x 12
-y 9
-end
-arch shop_weapon
-x 12
-y 10
-end
-arch shop_weapon
-x 12
-y 11
-end
-arch shop_weapon
-x 12
-y 12
-end
-arch shop_weapon
-x 12
-y 13
-end
-arch shop_empty
-x 12
-y 14
-end
-arch shop_empty
-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_empty
-x 13
-y 1
-end
-arch shop_empty
-x 13
-y 2
-end
-arch shop_empty
-x 13
-y 3
-end
-arch shop_empty
-x 13
-y 4
-end
-arch shop_empty
-x 13
-y 5
-end
-arch shop_empty
-x 13
-y 6
-end
-arch shop_empty
-x 13
-y 7
-end
-arch shop_empty
-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 shop_empty
-x 13
-y 12
-end
-arch shop_empty
-x 13
-y 13
-end
-arch shop_empty
-x 13
-y 14
-end
-arch shop_empty
-x 13
-y 15
-end
-arch wall_2_1_2
-x 13
-y 15
-end
-arch shop_empty
-x 14
-end
-arch wall_2_1_2
-x 14
-end
-arch shop_weapon
-x 14
-y 1
-end
-arch shop_weapon
-x 14
-y 2
-end
-arch shop_weapon
-x 14
-y 3
-end
-arch shop_weapon
-x 14
-y 4
-end
-arch shop_weapon
-x 14
-y 5
-end
-arch shop_weapon
-x 14
-y 6
-end
-arch shop_weapon
-x 14
-y 7
-end
-arch shop_weapon
-x 14
-y 8
-end
-arch shop_weapon
-x 14
-y 9
-end
-arch shop_weapon
-x 14
-y 10
-end
-arch shop_weapon
-x 14
-y 11
-end
-arch shop_weapon
-x 14
-y 12
-end
-arch shop_weapon
-x 14
-y 13
-end
-arch shop_weapon
-x 14
-y 14
-end
-arch shop_empty
-x 14
-y 15
-end
-arch wall_2_1_2
-x 14
+x 15
 y 15
 end
 arch shop_empty
 x 15
+y 16
+end
+arch shop_empty
+x 15
+y 17
+end
+arch woodfloor
+x 15
+y 18
+end
+arch swall_2_1_2
+x 15
+y 18
+end
+arch woodfloor
+x 15
+y 19
+end
+arch woodfloor
+x 15
+y 20
+end
+arch woodfloor
+x 15
+y 21
+end
+arch wall_2_1_2
+x 15
+y 21
+end
+arch grass_only
+x 15
+y 22
+end
+arch grass_only
+x 15
+y 23
+end
+arch grass_only
+x 15
+y 24
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch grass_only
+x 16
+y 2
+end
+arch light3
+x 16
+y 3
+end
+arch shop_empty
+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_empty
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+end
+arch shop_empty
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 9
+end
+arch shop_empty
+x 16
+y 10
+end
+arch shop_empty
+x 16
+y 11
+end
+arch shop_empty
+x 16
+y 12
+end
+arch shop_empty
+x 16
+y 13
+end
+arch shop_empty
+x 16
+y 14
+end
+arch shop_empty
+x 16
+y 15
+end
+arch shop_empty
+x 16
+y 16
+end
+arch shop_empty
+x 16
+y 17
+end
+arch woodfloor
+x 16
+y 18
+end
+arch swall_2_2_3
+x 16
+y 18
+end
+arch wall_0
+x 16
+y 18
+blocksview 0
+end
+arch woodfloor
+x 16
+y 19
+end
+arch swall_2_1_1
+x 16
+y 19
+end
+arch woodfloor
+x 16
+y 20
+end
+arch swall_2_1_1
+x 16
+y 20
+end
+arch woodfloor
+x 16
+y 21
+end
+arch swall_1_2_half
+x 16
+y 21
+end
+arch wall_2_1_2
+x 16
+y 21
+end
+arch wall_0
+x 16
+y 21
+blocksview 0
+end
+arch grass_only
+x 16
+y 22
+end
+arch grass_only
+x 16
+y 23
+end
+arch grass_only
+x 16
+y 24
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch grass_only
+x 17
+y 2
+end
+arch light4
+x 17
+y 3
+end
+arch shop_empty
+x 17
+y 3
+end
+arch window_win2
+x 17
+y 3
+end
+arch shop_weapon
+x 17
+y 4
+end
+arch shop_empty
+x 17
+y 5
+end
+arch shop_empty
+x 17
+y 6
+end
+arch swall_1_4_half
+x 17
+y 6
+end
+arch wall_0
+x 17
+y 6
+blocksview 0
+end
+arch shop_weapon
+x 17
+y 7
+end
+arch shop_weapon
+x 17
+y 8
+end
+arch shop_weapon
+x 17
+y 9
+end
+arch shop_weapon
+x 17
+y 10
+end
+arch shop_weapon
+x 17
+y 11
+end
+arch shop_weapon
+x 17
+y 12
+end
+arch shop_weapon
+x 17
+y 13
+end
+arch shop_weapon
+x 17
+y 14
+end
+arch shop_empty
+x 17
+y 15
+end
+arch swall_1_4_half
+x 17
+y 15
+end
+arch wall_0
+x 17
+y 15
+blocksview 0
+end
+arch shop_empty
+x 17
+y 16
+end
+arch shop_empty
+x 17
+y 17
+end
+arch shop_weapon
+x 17
+y 18
+end
+arch shop_weapon
+x 17
+y 19
+end
+arch shop_weapon
+x 17
+y 20
+end
+arch shop_empty
+x 17
+y 21
+end
+arch wall_2_1_2
+x 17
+y 21
+end
+arch grass_only
+x 17
+y 22
+end
+arch grass_only
+x 17
+y 23
+end
+arch grass_only
+x 17
+y 24
+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_1_2
+x 18
+y 3
+end
+arch shop_weapon
+x 18
+y 4
+end
+arch shop_empty
+x 18
+y 5
+end
+arch shop_empty
+x 18
+y 6
+end
+arch swall_2_2_3
+x 18
+y 6
+end
+arch wall_0
+x 18
+y 6
+blocksview 0
+end
+arch light4
+x 18
+y 7
+end
+arch shop_empty
+x 18
+y 7
+end
+arch swall_2_1_1
+x 18
+y 7
+end
+arch shop_empty
+x 18
+y 8
+end
+arch swall_2_1_1
+x 18
+y 8
+end
+arch shop_empty
+x 18
+y 9
+end
+arch swall_2_1_1
+x 18
+y 9
+end
+arch wall_1_short
+x 18
+y 9
+blocksview 0
+end
+arch shop_empty
+x 18
+y 10
+end
+arch swall_2_1_1
+x 18
+y 10
+end
+arch light4
+x 18
+y 11
+end
+arch shop_empty
+x 18
+y 11
+end
+arch swall_2_1_1
+x 18
+y 11
+end
+arch shop_empty
+x 18
+y 12
+end
+arch swall_2_1_1
+x 18
+y 12
+end
+arch wall_1_short
+x 18
+y 12
+blocksview 0
+end
+arch shop_empty
+x 18
+y 13
+end
+arch swall_2_1_1
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 14
+end
+arch swall_2_1_1
+x 18
+y 14
+end
+arch light4
+x 18
+y 15
+end
+arch shop_empty
+x 18
+y 15
+end
+arch swall_2_2_4
+x 18
+y 15
+end
+arch wall_0
+x 18
+y 15
+blocksview 0
+end
+arch shop_empty
+x 18
+y 16
+end
+arch shop_empty
+x 18
+y 17
+end
+arch shop_empty
+x 18
+y 18
+end
+arch light4
+x 18
+y 19
+end
+arch shop_empty
+x 18
+y 19
+end
+arch shop_weapon
+x 18
+y 20
+end
+arch light2
+x 18
+y 21
+end
+arch shop_empty
+x 18
+y 21
+end
+arch window_win2
+x 18
+y 21
+end
+arch grass_only
+x 18
+y 22
+end
+arch grass_only
+x 18
+y 23
+end
+arch grass_only
+x 18
+y 24
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch shop_empty
+x 19
+y 3
+end
+arch wall_2_1_2
+x 19
+y 3
+end
+arch shop_weapon
+x 19
+y 4
+end
+arch shop_empty
+x 19
+y 5
+end
+arch shop_empty
+x 19
+y 6
+end
+arch shop_empty
+x 19
+y 7
+end
+arch shop_empty
+x 19
+y 8
+end
+arch shop_empty
+x 19
+y 9
+end
+arch shop_empty
+x 19
+y 10
+end
+arch shop_empty
+x 19
+y 11
+end
+arch shop_empty
+x 19
+y 12
+end
+arch shop_empty
+x 19
+y 13
+end
+arch shop_empty
+x 19
+y 14
+end
+arch shop_empty
+x 19
+y 15
+end
+arch shop_empty
+x 19
+y 16
+end
+arch shop_empty
+x 19
+y 17
+end
+arch shop_empty
+x 19
+y 18
+end
+arch shop_empty
+x 19
+y 19
+end
+arch shop_weapon
+x 19
+y 20
+end
+arch shop_empty
+x 19
+y 21
+end
+arch wall_2_1_2
+x 19
+y 21
+end
+arch grass_only
+x 19
+y 22
+end
+arch grass_only
+x 19
+y 23
+end
+arch grass_only
+x 19
+y 24
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch grass_only
+x 20
+y 2
+end
+arch shop_empty
+x 20
+y 3
+end
+arch wall_2_1_2
+x 20
+y 3
+end
+arch shop_weapon
+x 20
+y 4
+end
+arch shop_weapon
+x 20
+y 5
+end
+arch shop_weapon
+x 20
+y 6
+end
+arch shop_weapon
+x 20
+y 7
+end
+arch shop_weapon
+x 20
+y 8
+end
+arch shop_weapon
+x 20
+y 9
+end
+arch shop_weapon
+x 20
+y 10
+end
+arch shop_weapon
+x 20
+y 11
+end
+arch shop_weapon
+x 20
+y 12
+end
+arch shop_weapon
+x 20
+y 13
+end
+arch shop_weapon
+x 20
+y 14
+end
+arch shop_weapon
+x 20
+y 15
+end
+arch shop_weapon
+x 20
+y 16
+end
+arch shop_weapon
+x 20
+y 17
+end
+arch shop_weapon
+x 20
+y 18
+end
+arch shop_weapon
+x 20
+y 19
+end
+arch shop_weapon
+x 20
+y 20
+end
+arch shop_empty
+x 20
+y 21
+end
+arch wall_2_1_2
+x 20
+y 21
+end
+arch grass_only
+x 20
+y 22
+end
+arch grass_only
+x 20
+y 23
+end
+arch grass_only
+x 20
+y 24
+end
+arch grass_only
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch grass_only
+x 21
+y 2
+end
+arch light3
+x 21
+y 3
+end
+arch shop_empty
+x 21
+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
+x 21
 y 3
 end
-arch wall_2_1_1
-x 15
+arch wall_0
+x 21
 y 3
+blocksview 0
 end
 arch shop_empty
-x 15
+x 21
 y 4
 end
 arch wall_2_1_1
-x 15
+x 21
 y 4
 end
 arch shop_empty
-x 15
+x 21
 y 5
 end
 arch wall_2_1_1
-x 15
+x 21
 y 5
 end
 arch shop_empty
-x 15
+x 21
 y 6
 end
 arch wall_2_1_1
-x 15
+x 21
 y 6
 end
 arch shop_empty
-x 15
+x 21
 y 7
 end
 arch wall_2_1_1
-x 15
+x 21
 y 7
 end
-arch shop_empty
-x 15
-y 8
-end
-arch wall_2_1_1
-x 15
+arch light4
+x 21
 y 8
 end
 arch shop_empty
-x 15
+x 21
+y 8
+end
+arch window_win1
+x 21
+y 8
+end
+arch shop_empty
+x 21
 y 9
 end
 arch wall_2_1_1
-x 15
+x 21
 y 9
 end
 arch shop_empty
-x 15
+x 21
 y 10
 end
 arch wall_2_1_1
-x 15
+x 21
 y 10
 end
 arch shop_empty
-x 15
+x 21
 y 11
 end
 arch wall_2_1_1
-x 15
+x 21
 y 11
 end
 arch shop_empty
-x 15
+x 21
 y 12
 end
 arch wall_2_1_1
-x 15
+x 21
 y 12
 end
 arch shop_empty
-x 15
+x 21
 y 13
 end
 arch wall_2_1_1
-x 15
+x 21
 y 13
 end
 arch shop_empty
-x 15
+x 21
 y 14
 end
 arch wall_2_1_1
-x 15
+x 21
 y 14
 end
 arch shop_empty
-x 15
+x 21
 y 15
 end
+arch wall_2_1_1
+x 21
+y 15
+end
+arch light4
+x 21
+y 16
+end
+arch shop_empty
+x 21
+y 16
+end
+arch window_win1
+x 21
+y 16
+end
+arch shop_empty
+x 21
+y 17
+end
+arch wall_2_1_1
+x 21
+y 17
+end
+arch shop_empty
+x 21
+y 18
+end
+arch wall_2_1_1
+x 21
+y 18
+end
+arch shop_empty
+x 21
+y 19
+end
+arch wall_2_1_1
+x 21
+y 19
+end
+arch shop_empty
+x 21
+y 20
+end
+arch wall_2_1_1
+x 21
+y 20
+end
+arch shop_empty
+x 21
+y 21
+end
 arch wall_2_2_4
-x 15
+x 21
+y 21
+end
+arch wall_0
+x 21
+y 21
+blocksview 0
+end
+arch grass_only
+x 21
+y 22
+end
+arch grass_only
+x 21
+y 23
+end
+arch grass_only
+x 21
+y 24
+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
+arch grass_only
+x 22
+y 22
+end
+arch grass_only
+x 22
+y 23
+end
+arch grass_only
+x 22
+y 24
+end
+arch grass_only
+x 23
+end
+arch grass_only
+x 23
+y 1
+end
+arch grass_only
+x 23
+y 2
+end
+arch grass_only
+x 23
+y 3
+end
+arch grass_only
+x 23
+y 4
+end
+arch grass_only
+x 23
+y 5
+end
+arch grass_only
+x 23
+y 6
+end
+arch grass_only
+x 23
+y 7
+end
+arch grass_only
+x 23
+y 8
+end
+arch grass_only
+x 23
+y 9
+end
+arch grass_only
+x 23
+y 10
+end
+arch grass_only
+x 23
+y 11
+end
+arch grass_only
+x 23
+y 12
+end
+arch grass_only
+x 23
+y 13
+end
+arch grass_only
+x 23
+y 14
+end
+arch grass_only
+x 23
+y 15
+end
+arch grass_only
+x 23
+y 16
+end
+arch grass_only
+x 23
+y 17
+end
+arch grass_only
+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 23
+y 22
+end
+arch grass_only
+x 23
+y 23
+end
+arch grass_only
+x 23
+y 24
+end
+arch grass_only
+x 24
+end
+arch grass_only
+x 24
+y 1
+end
+arch grass_only
+x 24
+y 2
+end
+arch grass_only
+x 24
+y 3
+end
+arch grass_only
+x 24
+y 4
+end
+arch grass_only
+x 24
+y 5
+end
+arch grass_only
+x 24
+y 6
+end
+arch grass_only
+x 24
+y 7
+end
+arch grass_only
+x 24
+y 8
+end
+arch grass_only
+x 24
+y 9
+end
+arch grass_only
+x 24
+y 10
+end
+arch grass_only
+x 24
+y 11
+end
+arch grass_only
+x 24
+y 12
+end
+arch grass_only
+x 24
+y 13
+end
+arch grass_only
+x 24
+y 14
+end
+arch grass_only
+x 24
+y 15
+end
+arch grass_only
+x 24
+y 16
+end
+arch grass_only
+x 24
+y 17
+end
+arch grass_only
+x 24
+y 18
+end
+arch grass_only
+x 24
+y 19
+end
+arch grass_only
+x 24
+y 20
+end
+arch grass_only
+x 24
+y 21
+end
+arch grass_only
+x 24
+y 22
+end
+arch grass_only
+x 24
+y 23
+end
+arch grass_only
+x 24
+y 24
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 2b93cb01f..4fb216c0d 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-03-31 Rick Tanner
+Modified: 2011-04-02 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -12862,8 +12862,8 @@ end
 arch store_weapons
 name Weapon Shop
 slaying /scorn/shops/weaponshop
-hp 2
-sp 15
+hp 12
+sp 20
 x 44
 y 31
 end