From 0155d8347b8ee2b1e02282eb5709526e573a8f12 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 3 Apr 2011 05:12:52 +0000
Subject: [PATCH] Major cosmetic overhaul to the Armour 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 sign information. Updated
 world map for new map entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14367 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/armourshop | 4454 +++++++++++++++++++++++++++++-----------
 world/world_104_115    |    4 +-
 2 files changed, 3250 insertions(+), 1208 deletions(-)

diff --git a/scorn/shops/armourshop b/scorn/shops/armourshop
index 8555fd9e5..d157cfe42 100644
--- a/scorn/shops/armourshop
+++ b/scorn/shops/armourshop
@@ -5,181 +5,2009 @@ difficulty 2
 region scorn
 shopitems armour:50;shield:50;helmet:40;cloak:40;boots:40;gloves:40;bracers:50;girdle:50;*:-50
 shopmax 2000
-width 16
-height 16
+width 25
+height 25
 enter_x 14
 enter_y 1
 msg
 Created:  1993-10-15
-Modified: 2010-11-05 Andreas Kirschbaum
+Modified: 2011-04-03 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 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
-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 swall_1_4_half
+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 light3
+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 light3
+x 3
 y 15
 end
+arch shop_empty
+x 3
+y 15
+end
+arch window_win1
+x 3
+y 15
+end
+arch shop_empty
+x 3
+y 16
+end
+arch wall_2_1_1
+x 3
+y 16
+end
+arch shop_empty
+x 3
+y 17
+end
+arch wall_2_1_1
+x 3
+y 17
+end
+arch woodfloor
+x 3
+y 18
+end
+arch swall_1_4_half
+x 3
+y 18
+end
+arch wall_2_1_1
+x 3
+y 18
+end
+arch woodfloor
+x 3
+y 19
+end
+arch wall_2_1_1
+x 3
+y 19
+end
+arch woodfloor
+x 3
+y 20
+end
+arch wall_2_1_1
+x 3
+y 20
+end
+arch woodfloor
+x 3
+y 21
+end
 arch wall_2_2_1
-y 15
+x 3
+y 21
 end
-arch shop_empty
-x 1
+arch grass_only
+x 3
+y 22
 end
-arch wall_2_1_2
-x 1
+arch grass_only
+x 3
+y 23
 end
-arch shop_gems
-x 1
+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_gems
+x 4
 y 4
 end
-arch swall_2_1_2
-x 1
-y 4
-end
-arch shop_special
-x 1
+arch shop_gems
+x 4
 y 5
 end
-arch shop_special
-x 1
+arch shop_gems
+x 4
 y 6
 end
-arch shop_special
-x 1
+arch shop_empty
+x 4
+y 7
+end
+arch swall_1_3_half
+x 4
+y 7
+end
+arch wall_0
+x 4
+y 7
+blocksview 0
+end
+arch shop_armour
+x 4
+y 8
+end
+arch shop_armour
+x 4
+y 9
+end
+arch shop_armour
+x 4
+y 10
+end
+arch shop_armour
+x 4
+y 11
+end
+arch shop_armour
+x 4
+y 12
+end
+arch shop_armour
+x 4
+y 13
+end
+arch shop_armour
+x 4
+y 14
+end
+arch shop_armour
+x 4
+y 15
+end
+arch shop_armour
+x 4
+y 16
+end
+arch shop_armour
+x 4
+y 17
+end
+arch light4
+x 4
+y 18
+end
+arch woodfloor
+x 4
+y 18
+end
+arch swall_2_1_2
+x 4
+y 18
+end
+arch wall_0
+x 4
+y 18
+blocksview 0
+end
+arch woodfloor
+x 4
+y 19
+end
+arch button_small
+x 4
+y 20
+connected 1
+end
+arch woodfloor
+x 4
+y 20
+end
+arch woodfloor
+x 4
+y 21
+end
+arch wall_1_3
+x 4
+y 21
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 47
+sp 32
+x 4
+y 22
+end
+arch cobblestones2
+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 grass_only
+x 5
+y 2
+end
+arch shop_empty
+x 5
+y 3
+end
+arch wall_2_1_2
+x 5
+y 3
+end
+arch shop_gems
+x 5
+y 4
+end
+arch light4
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 6
+end
+arch shop_empty
+x 5
 y 7
 end
 arch shop_empty
-x 1
-y 8
-end
-arch swall_2_1_2
-x 1
+x 5
 y 8
 end
 arch shop_empty
-x 1
+x 5
 y 9
 end
 arch shop_empty
-x 1
+x 5
 y 10
 end
-arch smith
-x 1
+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
+end
+arch shop_empty
+x 5
+y 16
+end
+arch shop_empty
+x 5
+y 17
+end
+arch woodfloor
+x 5
+y 18
+end
+arch swall_2_1_2
+x 5
+y 18
+end
+arch woodfloor
+x 5
+y 19
+end
+arch button_small
+x 5
+y 20
+connected 1
+end
+arch woodfloor
+x 5
+y 20
+end
+arch button_small
+x 5
+y 21
+connected 1
+end
+arch woodfloor
+x 5
+y 21
+end
+arch odoorn2_closed_1
+x 5
+y 21
+connected 1
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 47
+sp 32
+x 5
+y 22
+end
+arch cobblestones2
+x 5
+y 22
+end
+arch cobblestones2
+x 5
+y 23
+end
+arch cobblestones2
+x 5
+y 24
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch grass_only
+x 6
+y 2
+end
+arch light3
+x 6
+y 3
+end
+arch shop_empty
+x 6
+y 3
+end
+arch window_win2
+x 6
+y 3
+end
+arch shop_gems
+x 6
+y 4
+end
+arch shop_empty
+x 6
+y 5
+end
+arch shop_empty
+x 6
+y 6
+end
+arch shop_empty
+x 6
+y 7
+end
+arch shop_armour
+x 6
+y 8
+end
+arch light4
+x 6
+y 9
+end
+arch shop_empty
+x 6
+y 9
+end
+arch swall_1_4_half
+x 6
+y 9
+end
+arch wall_0
+x 6
+y 9
+blocksview 0
+end
+arch shop_armour
+x 6
 y 10
+end
+arch shop_empty
+x 6
+y 11
+end
+arch shop_armour
+x 6
+y 12
+end
+arch light4
+x 6
+y 13
+end
+arch shop_empty
+x 6
+y 13
+end
+arch swall_1_4_half
+x 6
+y 13
+end
+arch wall_0
+x 6
+y 13
+blocksview 0
+end
+arch shop_armour
+x 6
+y 14
+end
+arch shop_empty
+x 6
+y 15
+end
+arch shop_empty
+x 6
+y 16
+end
+arch shop_empty
+x 6
+y 17
+end
+arch woodfloor
+x 6
+y 18
+end
+arch swall_2_1_2
+x 6
+y 18
+end
+arch woodfloor
+x 6
+y 19
+end
+arch button_small
+x 6
+y 20
+connected 1
+end
+arch woodfloor
+x 6
+y 20
+end
+arch woodfloor
+x 6
+y 21
+end
+arch wall_1_4
+x 6
+y 21
+end
+arch invis_exit
+slaying /world/world_104_115
+hp 47
+sp 32
+x 6
+y 22
+end
+arch cobblestones2
+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 shop_empty
+x 7
+y 3
+end
+arch wall_2_1_2
+x 7
+y 3
+end
+arch shop_gems
+x 7
+y 4
+end
+arch shop_gems
+x 7
+y 5
+end
+arch shop_gems
+x 7
+y 6
+end
+arch shop_empty
+x 7
+y 7
+end
+arch shop_armour
+x 7
+y 8
+end
+arch shop_empty
+x 7
+y 9
+end
+arch shop_empty
+x 7
+y 9
+end
+arch swall_2_1_2
+x 7
+y 9
+end
+arch wall_0
+x 7
+y 9
+blocksview 0
+end
+arch shop_armour
+x 7
+y 10
+end
+arch shop_empty
+x 7
+y 11
+end
+arch shop_armour
+x 7
+y 12
+end
+arch shop_empty
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 13
+end
+arch swall_2_1_2
+x 7
+y 13
+end
+arch wall_0
+x 7
+y 13
+blocksview 0
+end
+arch shop_armour
+x 7
+y 14
+end
+arch shop_empty
+x 7
+y 15
+end
+arch shop_empty
+x 7
+y 16
+end
+arch sign_e
+msg
+Custom Armour made in the back of the store.
+endmsg
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 17
+end
+arch shop_mat
+x 7
+y 17
+end
+arch woodfloor
+x 7
+y 18
+end
+arch swall_2_1_2
+x 7
+y 18
+end
+arch woodfloor
+x 7
+y 19
+end
+arch shop_mat
+x 7
+y 19
+end
+arch woodfloor
+x 7
+y 20
+end
+arch woodfloor
+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 shop_empty
+x 8
+y 3
+end
+arch swall_1_1_half
+x 8
+y 3
+end
+arch wall_2_1_2
+x 8
+y 3
+end
+arch wall_0
+x 8
+y 3
+blocksview 0
+end
+arch shop_empty
+x 8
+y 4
+end
+arch swall_2_1_1
+x 8
+y 4
+end
+arch wall_0
+x 8
+y 4
+blocksview 0
+end
+arch light4
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 5
+end
+arch swall_2_1_1
+x 8
+y 5
+end
+arch wall_0
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch swall_2_2_1
+x 8
+y 6
+end
+arch wall_0
+x 8
+y 6
+blocksview 0
+end
+arch shop_empty
+x 8
+y 7
+end
+arch shop_armour
+x 8
+y 8
+end
+arch shop_empty
+x 8
+y 9
+end
+arch shop_empty
+x 8
+y 9
+end
+arch swall_2_1_2
+x 8
+y 9
+end
+arch wall_0
+x 8
+y 9
+blocksview 0
+end
+arch shop_armour
+x 8
+y 10
+end
+arch shop_empty
+x 8
+y 11
+end
+arch shop_armour
+x 8
+y 12
+end
+arch shop_empty
+x 8
+y 13
+end
+arch shop_empty
+x 8
+y 13
+end
+arch swall_2_1_2
+x 8
+y 13
+end
+arch wall_0
+x 8
+y 13
+blocksview 0
+end
+arch shop_armour
+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_1_2
+x 8
+y 18
+end
+arch woodfloor
+x 8
+y 19
+end
+arch woodfloor
+x 8
+y 20
+end
+arch menu
+x 8
+y 20
+end
+arch woodfloor
+x 8
+y 21
+end
+arch wall_2_1_2
+x 8
+y 21
+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 grass_only
+x 9
+y 2
+end
+arch shop_empty
+x 9
+y 3
+end
+arch wall_2_1_2
+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 swall_2_1_2
+x 9
+y 6
+end
+arch shop_empty
+x 9
+y 7
+end
+arch shop_armour
+x 9
+y 8
+end
+arch shop_empty
+x 9
+y 9
+end
+arch shop_empty
+x 9
+y 9
+end
+arch swall_2_1_2
+x 9
+y 9
+end
+arch wall_0
+x 9
+y 9
+blocksview 0
+end
+arch shop_armour
+x 9
+y 10
+end
+arch shop_empty
+x 9
+y 11
+end
+arch shop_armour
+x 9
+y 12
+end
+arch shop_empty
+x 9
+y 13
+end
+arch shop_empty
+x 9
+y 13
+end
+arch swall_2_1_2
+x 9
+y 13
+end
+arch wall_0
+x 9
+y 13
+blocksview 0
+end
+arch shop_armour
+x 9
+y 14
+end
+arch shop_empty
+x 9
+y 15
+end
+arch shop_empty
+x 9
+y 16
+end
+arch shop_empty
+x 9
+y 17
+end
+arch swall_2_2_2
+x 9
+y 17
+end
+arch wall_0
+x 9
+y 17
+blocksview 0
+end
+arch light4
+x 9
+y 18
+end
+arch woodfloor
+x 9
+y 18
+end
+arch swall_3_4
+x 9
+y 18
+end
+arch wall_0
+x 9
+y 18
+blocksview 0
+end
+arch woodfloor
+x 9
+y 19
+end
+arch swall_2_1_1
+x 9
+y 19
+end
+arch woodfloor
+x 9
+y 20
+end
+arch swall_2_1_1
+x 9
+y 20
+end
+arch wall_0
+x 9
+y 20
+blocksview 0
+end
+arch woodfloor
+x 9
+y 21
+end
+arch swall_1_2_half
+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 grass_only
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 3
+end
+arch wall_2_1_2
+x 10
+y 3
+end
+arch shop_empty
+x 10
+y 4
+end
+arch shop_empty
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
+arch swall_1_3_half
+x 10
+y 6
+end
+arch wall_0
+x 10
+y 6
+blocksview 0
+end
+arch shop_empty
+x 10
+y 7
+end
+arch shop_armour
+x 10
+y 8
+end
+arch shop_empty
+x 10
+y 9
+end
+arch swall_2_1_2
+x 10
+y 9
+end
+arch wall_0
+x 10
+y 9
+blocksview 0
+end
+arch shop_armour
+x 10
+y 10
+end
+arch shop_empty
+x 10
+y 11
+end
+arch shop_armour
+x 10
+y 12
+end
+arch shop_empty
+x 10
+y 13
+end
+arch swall_2_1_2
+x 10
+y 13
+end
+arch wall_0
+x 10
+y 13
+blocksview 0
+end
+arch shop_armour
+x 10
+y 14
+end
+arch shop_empty
+x 10
+y 15
+end
+arch shop_empty
+x 10
+y 16
+end
+arch shop_empty
+x 10
+y 17
+end
+arch swall_2_1_2
+x 10
+y 17
+end
+arch wall_0
+x 10
+y 17
+blocksview 0
+end
+arch shop_armour
+x 10
+y 18
+end
+arch shop_armour
+x 10
+y 19
+end
+arch shop_armour
+x 10
+y 20
+end
+arch light3
+x 10
+y 21
+end
+arch shop_empty
+x 10
+y 21
+end
+arch window_win2
+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 light3
+x 11
+y 3
+end
+arch shop_empty
+x 11
+y 3
+end
+arch window_win2
+x 11
+y 3
+end
+arch shop_empty
+x 11
+y 4
+end
+arch shop_empty
+x 11
+y 5
+end
+arch shop_empty
+x 11
+y 6
+end
+arch shop_empty
+x 11
+y 7
+end
+arch shop_armour
+x 11
+y 8
+end
+arch shop_empty
+x 11
+y 9
+end
+arch swall_1_3_half
+x 11
+y 9
+end
+arch wall_0
+x 11
+y 9
+blocksview 0
+end
+arch shop_armour
+x 11
+y 10
+end
+arch shop_empty
+x 11
+y 11
+end
+arch shop_armour
+x 11
+y 12
+end
+arch shop_empty
+x 11
+y 13
+end
+arch swall_1_3_half
+x 11
+y 13
+end
+arch wall_0
+x 11
+y 13
+blocksview 0
+end
+arch shop_armour
+x 11
+y 14
+end
+arch shop_empty
+x 11
+y 15
+end
+arch shop_empty
+x 11
+y 16
+end
+arch shop_empty
+x 11
+y 17
+end
+arch swall_1_3_half
+x 11
+y 17
+end
+arch wall_0
+x 11
+y 17
+blocksview 0
+end
+arch shop_armour
+x 11
+y 18
+end
+arch shop_empty
+x 11
+y 19
+end
+arch shop_armour
+x 11
+y 20
+end
+arch shop_empty
+x 11
+y 21
+end
+arch wall_2_1_2
+x 11
+y 21
+end
+arch grass_only
+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 shop_empty
+x 12
+y 3
+end
+arch wall_2_1_2
+x 12
+y 3
+end
+arch shop_empty
+x 12
+y 4
+end
+arch shop_empty
+x 12
+y 5
+end
+arch light4
+x 12
+y 6
+end
+arch shop_empty
+x 12
+y 6
+end
+arch sign_e
+msg
+Custom Armour made here.
+endmsg
+x 12
+y 6
+end
+arch shop_empty
+x 12
+y 7
+end
+arch shop_empty
+x 12
+y 8
+end
+arch light4
+x 12
+y 9
+end
+arch shop_empty
+x 12
+y 9
+end
+arch shop_empty
+x 12
+y 10
+end
+arch shop_empty
+x 12
+y 11
+end
+arch shop_empty
+x 12
+y 12
+end
+arch light4
+x 12
+y 13
+end
+arch shop_empty
+x 12
+y 13
+end
+arch shop_empty
+x 12
+y 14
+end
+arch shop_empty
+x 12
+y 15
+end
+arch shop_empty
+x 12
+y 16
+end
+arch shop_empty
+x 12
+y 17
+end
+arch shop_empty
+x 12
+y 18
+end
+arch shop_empty
+x 12
+y 19
+end
+arch shop_armour
+x 12
+y 20
+end
+arch shop_empty
+x 12
+y 21
+end
+arch wall_2_1_2
+x 12
+y 21
+end
+arch grass_only
+x 12
+y 22
+end
+arch grass_only
+x 12
+y 23
+end
+arch grass_only
+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 light3
+x 13
+y 3
+end
+arch shop_empty
+x 13
+y 3
+end
+arch window_win2
+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_armour
+x 13
+y 8
+end
+arch shop_empty
+x 13
+y 9
+end
+arch shop_empty
+x 13
+y 9
+end
+arch swall_1_4_half
+x 13
+y 9
+end
+arch wall_0
+x 13
+y 9
+blocksview 0
+end
+arch shop_armour
+x 13
+y 10
+end
+arch shop_empty
+x 13
+y 11
+end
+arch shop_armour
+x 13
+y 12
+end
+arch shop_empty
+x 13
+y 13
+end
+arch shop_empty
+x 13
+y 13
+end
+arch swall_1_4_half
+x 13
+y 13
+end
+arch wall_0
+x 13
+y 13
+blocksview 0
+end
+arch shop_armour
+x 13
+y 14
+end
+arch shop_empty
+x 13
+y 15
+end
+arch shop_armour
+x 13
+y 16
+end
+arch shop_empty
+x 13
+y 17
+end
+arch shop_empty
+x 13
+y 17
+end
+arch swall_1_4_half
+x 13
+y 17
+end
+arch wall_0
+x 13
+y 17
+blocksview 0
+end
+arch light4
+x 13
+y 18
+end
+arch shop_armour
+x 13
+y 18
+end
+arch shop_empty
+x 13
+y 19
+end
+arch shop_armour
+x 13
+y 20
+end
+arch shop_empty
+x 13
+y 21
+end
+arch wall_2_1_2
+x 13
+y 21
+end
+arch grass_only
+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_empty
+x 14
+y 4
+end
+arch shop_empty
+x 14
+y 5
+end
+arch smith
+x 14
+y 5
 arch event_say
 name scorn/shops/smith.msg
 title Python
@@ -199,1239 +2027,1453 @@ end
 end
 end
 arch shop_empty
-x 1
-y 11
+x 14
+y 6
+end
+arch swall_1_4_half
+x 14
+y 6
+end
+arch wall_0
+x 14
+y 6
+blocksview 0
 end
 arch shop_empty
-x 1
-y 12
+x 14
+y 7
+end
+arch shop_armour
+x 14
+y 8
+end
+arch shop_empty
+x 14
+y 9
+end
+arch shop_empty
+x 14
+y 9
 end
 arch swall_2_1_2
-x 1
+x 14
+y 9
+end
+arch wall_0
+x 14
+y 9
+blocksview 0
+end
+arch shop_armour
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 11
+end
+arch shop_armour
+x 14
 y 12
 end
-arch woodfloor
-x 1
+arch shop_empty
+x 14
 y 13
 end
-arch menu
-x 1
+arch shop_empty
+x 14
 y 13
 end
-arch woodfloor
-x 1
-y 14
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
-y 15
-end
-arch wall_1_3
-x 1
-y 15
-end
-arch shop_empty
-x 2
-end
-arch wall_2_1_2
-x 2
-end
-arch shop_gems
-x 2
-y 1
-end
-arch shop_empty
-x 2
-y 2
-end
-arch shop_gems
-x 2
-y 3
-end
-arch shop_empty
-x 2
-y 4
-end
 arch swall_2_1_2
-x 2
-y 4
+x 14
+y 13
 end
-arch shop_special
-x 2
-y 5
+arch wall_0
+x 14
+y 13
+blocksview 0
+end
+arch shop_armour
+x 14
+y 14
 end
 arch shop_empty
-x 2
-y 6
+x 14
+y 15
 end
-arch shop_special
-x 2
-y 7
+arch shop_armour
+x 14
+y 16
 end
 arch shop_empty
-x 2
-y 8
+x 14
+y 17
+end
+arch shop_empty
+x 14
+y 17
 end
 arch swall_2_1_2
-x 2
-y 8
+x 14
+y 17
+end
+arch wall_0
+x 14
+y 17
+blocksview 0
+end
+arch shop_armour
+x 14
+y 18
 end
 arch shop_empty
-x 2
-y 9
+x 14
+y 19
+end
+arch shop_armour
+x 14
+y 20
 end
 arch shop_empty
-x 2
-y 10
-end
-arch shop_empty
-x 2
-y 11
-end
-arch shop_empty
-x 2
-y 12
-end
-arch swall_2_1_2
-x 2
-y 12
-end
-arch woodfloor
-x 2
-y 13
-end
-arch shop_mat
-x 2
-y 13
-end
-arch woodfloor
-x 2
-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 47
-sp 32
-x 2
-y 15
-end
-arch shop_empty
-x 3
-end
-arch shop_empty
-x 3
+x 14
+y 21
 end
 arch wall_2_1_2
-x 3
+x 14
+y 21
 end
-arch shop_gems
-x 3
+arch grass_only
+x 14
+y 22
+end
+arch grass_only
+x 14
+y 23
+end
+arch grass_only
+x 14
+y 24
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
 y 1
 end
-arch shop_empty
-x 3
+arch grass_only
+x 15
 y 2
 end
-arch shop_gems
-x 3
-y 3
-end
-arch shop_empty
-x 3
-y 4
-end
-arch swall_2_1_2
-x 3
-y 4
-end
-arch shop_special
-x 3
-y 5
-end
-arch shop_empty
-x 3
-y 6
-end
-arch shop_special
-x 3
-y 7
-end
-arch shop_empty
-x 3
-y 8
-end
-arch swall_2_1_2
-x 3
-y 8
-end
-arch shop_empty
-x 3
-y 9
-end
-arch shop_empty
-x 3
-y 10
-end
-arch shop_empty
-x 3
-y 11
-end
-arch shop_empty
-x 3
-y 12
-end
-arch swall_3_3
-x 3
-y 12
-end
-arch shop_empty
-x 3
-y 13
-end
-arch swall_2_1_1
-x 3
-y 13
-end
-arch shop_empty
-x 3
-y 14
-end
-arch swall_2_1_1
-x 3
-y 14
-end
-arch shop_empty
-x 3
-y 15
-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
-end
-arch wall_2_1_2
-x 4
-end
-arch shop_gems
-x 4
-y 1
-end
-arch shop_empty
-x 4
-y 2
-end
-arch shop_gems
-x 4
-y 3
-end
-arch shop_empty
-x 4
-y 4
-end
-arch swall_1_3
-x 4
-y 4
-end
-arch shop_special
-x 4
-y 5
-end
-arch shop_empty
-x 4
-y 6
-end
-arch shop_special
-x 4
-y 7
-end
-arch shop_empty
-x 4
-y 8
-end
-arch swall_1_3
-x 4
-y 8
-end
-arch shop_empty
-x 4
-y 9
-end
-arch shop_empty
-x 4
-y 10
-end
-arch sign_e
-msg
-Custom Armour made here.
-endmsg
-x 4
-y 10
-end
-arch shop_empty
-x 4
-y 11
-end
-arch shop_empty
-x 4
-y 12
-end
-arch swall_1_3
-x 4
-y 12
-end
-arch shop_empty
-x 4
-y 13
-end
-arch shop_empty
-x 4
-y 14
-end
-arch shop_mat
-x 4
-y 14
-end
-arch shop_empty
-x 4
-y 15
-end
-arch wall_2_1_2
-x 4
-y 15
-end
-arch shop_empty
-x 5
-end
-arch wall_2_1_2
-x 5
-end
-arch shop_empty
-x 5
-y 1
-end
-arch shop_empty
-x 5
-y 2
-end
-arch shop_empty
-x 5
-y 3
-end
-arch shop_empty
-x 5
-y 4
-end
-arch shop_empty
-x 5
-y 5
-end
-arch shop_empty
-x 5
-y 6
-end
-arch shop_empty
-x 5
-y 7
-end
-arch shop_empty
-x 5
-y 8
-end
-arch shop_empty
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 10
-end
-arch shop_empty
-x 5
-y 11
-end
-arch shop_empty
-x 5
-y 12
-end
-arch shop_empty
-x 5
-y 13
-end
-arch shop_empty
-x 5
-y 14
-end
-arch shop_empty
-x 5
-y 15
-end
-arch wall_2_1_2
-x 5
-y 15
-end
-arch shop_empty
-x 6
-end
-arch wall_2_1_2
-x 6
-end
-arch shop_empty
-x 6
-y 1
-end
-arch shop_armour
-x 6
-y 2
-end
-arch shop_armour
-x 6
-y 3
-end
-arch shop_armour
-x 6
-y 4
-end
-arch shop_armour
-x 6
-y 5
-end
-arch shop_armour
-x 6
-y 6
-end
-arch shop_armour
-x 6
-y 7
-end
-arch shop_armour
-x 6
-y 8
-end
-arch shop_armour
-x 6
-y 9
-end
-arch shop_armour
-x 6
-y 10
-end
-arch shop_armour
-x 6
-y 11
-end
-arch shop_armour
-x 6
-y 12
-end
-arch shop_armour
-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_armour
-x 7
-y 2
-end
-arch shop_empty
-x 7
-y 3
-end
-arch swall_1_2
-x 7
-y 3
-end
-arch shop_empty
-x 7
-y 3
-end
-arch swall_1_1
-x 7
-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_armour
-x 7
-y 13
-end
-arch shop_empty
-x 7
-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_armour
-x 8
-y 2
-end
-arch shop_armour
-x 8
-y 3
-end
-arch shop_armour
-x 8
-y 4
-end
-arch shop_armour
-x 8
-y 5
-end
-arch shop_armour
-x 8
-y 6
-end
-arch shop_armour
-x 8
-y 7
-end
-arch shop_armour
-x 8
-y 8
-end
-arch shop_armour
-x 8
-y 9
-end
-arch shop_armour
-x 8
-y 10
-end
-arch shop_armour
-x 8
-y 11
-end
-arch shop_armour
-x 8
-y 12
-end
-arch shop_armour
-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_armour
-x 10
-y 2
-end
-arch shop_armour
-x 10
-y 3
-end
-arch shop_armour
-x 10
-y 4
-end
-arch shop_armour
-x 10
-y 5
-end
-arch shop_armour
-x 10
-y 6
-end
-arch shop_armour
-x 10
-y 7
-end
-arch shop_armour
-x 10
-y 8
-end
-arch shop_armour
-x 10
-y 9
-end
-arch shop_armour
-x 10
-y 10
-end
-arch shop_armour
-x 10
-y 11
-end
-arch shop_armour
-x 10
-y 12
-end
-arch shop_armour
-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_armour
-x 11
-y 2
-end
-arch shop_empty
-x 11
-y 3
-end
-arch swall_1_2
-x 11
-y 3
-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_armour
-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_armour
-x 12
-y 2
-end
-arch shop_armour
-x 12
-y 3
-end
-arch shop_armour
-x 12
-y 4
-end
-arch shop_armour
-x 12
-y 5
-end
-arch shop_armour
-x 12
-y 6
-end
-arch shop_armour
-x 12
-y 7
-end
-arch shop_armour
-x 12
-y 8
-end
-arch shop_armour
-x 12
-y 9
-end
-arch shop_armour
-x 12
-y 10
-end
-arch shop_armour
-x 12
-y 11
-end
-arch shop_armour
-x 12
-y 12
-end
-arch shop_armour
-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_armour
-x 14
-y 1
-end
-arch shop_armour
-x 14
-y 2
-end
-arch shop_armour
-x 14
-y 3
-end
-arch shop_armour
-x 14
-y 4
-end
-arch shop_armour
-x 14
-y 5
-end
-arch shop_armour
-x 14
-y 6
-end
-arch shop_armour
-x 14
-y 7
-end
-arch shop_armour
-x 14
-y 8
-end
-arch shop_armour
-x 14
-y 9
-end
-arch shop_armour
-x 14
-y 10
-end
-arch shop_armour
-x 14
-y 11
-end
-arch shop_armour
-x 14
-y 12
-end
-arch shop_armour
-x 14
-y 13
-end
-arch shop_armour
-x 14
-y 14
-end
-arch shop_empty
-x 14
-y 15
-end
-arch wall_2_1_2
-x 14
-y 15
-end
 arch shop_empty
 x 15
+y 3
+end
+arch wall_2_1_2
+x 15
+y 3
+end
+arch shop_empty
+x 15
+y 4
+end
+arch shop_empty
+x 15
+y 5
+end
+arch shop_empty
+x 15
+y 6
+end
+arch swall_2_1_2
+x 15
+y 6
+end
+arch shop_empty
+x 15
+y 7
+end
+arch shop_armour
+x 15
+y 8
+end
+arch shop_empty
+x 15
+y 9
+end
+arch shop_empty
+x 15
+y 9
+end
+arch swall_2_1_2
+x 15
+y 9
+end
+arch wall_0
+x 15
+y 9
+blocksview 0
+end
+arch shop_armour
+x 15
+y 10
+end
+arch shop_empty
+x 15
+y 11
+end
+arch shop_armour
+x 15
+y 12
+end
+arch shop_empty
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 13
+end
+arch swall_2_1_2
+x 15
+y 13
+end
+arch wall_0
+x 15
+y 13
+blocksview 0
+end
+arch shop_armour
+x 15
+y 14
+end
+arch shop_empty
+x 15
+y 15
+end
+arch shop_armour
+x 15
+y 16
+end
+arch shop_empty
+x 15
+y 17
+end
+arch shop_empty
+x 15
+y 17
+end
+arch swall_2_1_2
+x 15
+y 17
+end
+arch wall_0
+x 15
+y 17
+blocksview 0
+end
+arch shop_armour
+x 15
+y 18
+end
+arch shop_empty
+x 15
+y 19
+end
+arch shop_armour
+x 15
+y 20
+end
+arch shop_empty
+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 shop_empty
+x 16
+y 3
+end
+arch swall_1_1_half
+x 16
+y 3
+end
+arch wall_2_1_2
+x 16
+y 3
+end
+arch wall_0
+x 16
+y 3
+blocksview 0
+end
+arch shop_empty
+x 16
+y 4
+end
+arch swall_2_1_1
+x 16
+y 4
+end
+arch wall_0
+x 16
+y 4
+blocksview 0
+end
+arch light4
+x 16
+y 5
+end
+arch shop_empty
+x 16
+y 5
+end
+arch swall_2_1_1
+x 16
+y 5
+end
+arch wall_0
+x 16
+y 5
+blocksview 0
+end
+arch shop_empty
+x 16
+y 6
+end
+arch swall_2_2_4
+x 16
+y 6
+end
+arch wall_0
+x 16
+y 6
+blocksview 0
+end
+arch shop_empty
+x 16
+y 7
+end
+arch shop_armour
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 9
+end
+arch swall_2_1_2
+x 16
+y 9
+end
+arch wall_0
+x 16
+y 9
+blocksview 0
+end
+arch shop_armour
+x 16
+y 10
+end
+arch shop_empty
+x 16
+y 11
+end
+arch shop_armour
+x 16
+y 12
+end
+arch shop_empty
+x 16
+y 13
+end
+arch swall_2_1_2
+x 16
+y 13
+end
+arch wall_0
+x 16
+y 13
+blocksview 0
+end
+arch shop_armour
+x 16
+y 14
+end
+arch shop_empty
+x 16
+y 15
+end
+arch shop_armour
+x 16
+y 16
+end
+arch shop_empty
+x 16
+y 17
+end
+arch swall_2_1_2
+x 16
+y 17
+end
+arch wall_0
+x 16
+y 17
+blocksview 0
+end
+arch shop_armour
+x 16
+y 18
+end
+arch shop_empty
+x 16
+y 19
+end
+arch shop_armour
+x 16
+y 20
+end
+arch shop_empty
+x 16
+y 21
+end
+arch wall_2_1_2
+x 16
+y 21
+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 shop_empty
+x 17
+y 3
+end
+arch wall_2_1_2
+x 17
+y 3
+end
+arch shop_special
+x 17
+y 4
+end
+arch shop_special
+x 17
+y 5
+end
+arch shop_special
+x 17
+y 6
+end
+arch shop_empty
+x 17
+y 7
+end
+arch shop_armour
+x 17
+y 8
+end
+arch shop_empty
+x 17
+y 9
+end
+arch swall_2_1_2
+x 17
+y 9
+end
+arch wall_0
+x 17
+y 9
+blocksview 0
+end
+arch shop_armour
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch shop_armour
+x 17
+y 12
+end
+arch shop_empty
+x 17
+y 13
+end
+arch swall_2_1_2
+x 17
+y 13
+end
+arch wall_0
+x 17
+y 13
+blocksview 0
+end
+arch shop_armour
+x 17
+y 14
+end
+arch shop_empty
+x 17
+y 15
+end
+arch shop_armour
+x 17
+y 16
+end
+arch shop_empty
+x 17
+y 17
+end
+arch swall_2_1_2
+x 17
+y 17
+end
+arch wall_0
+x 17
+y 17
+blocksview 0
+end
+arch shop_armour
+x 17
+y 18
+end
+arch shop_empty
+x 17
+y 19
+end
+arch shop_armour
+x 17
+y 20
+end
+arch light3
+x 17
+y 21
+end
+arch shop_empty
+x 17
+y 21
+end
+arch window_win2
+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_special
+x 18
+y 4
+end
+arch shop_empty
+x 18
+y 5
+end
+arch shop_empty
+x 18
+y 6
+end
+arch shop_empty
+x 18
+y 7
+end
+arch shop_armour
+x 18
+y 8
+end
+arch light4
+x 18
+y 9
+end
+arch shop_empty
+x 18
+y 9
+end
+arch swall_1_3_half
+x 18
+y 9
+end
+arch wall_0
+x 18
+y 9
+blocksview 0
+end
+arch shop_armour
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 11
+end
+arch shop_armour
+x 18
+y 12
+end
+arch light4
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 13
+end
+arch swall_1_3_half
+x 18
+y 13
+end
+arch wall_0
+x 18
+y 13
+blocksview 0
+end
+arch shop_armour
+x 18
+y 14
+end
+arch shop_empty
+x 18
+y 15
+end
+arch shop_armour
+x 18
+y 16
+end
+arch shop_empty
+x 18
+y 17
+end
+arch swall_1_3_half
+x 18
+y 17
+end
+arch wall_0
+x 18
+y 17
+blocksview 0
+end
+arch light4
+x 18
+y 18
+end
+arch shop_armour
+x 18
+y 18
+end
+arch shop_empty
+x 18
+y 19
+end
+arch shop_armour
+x 18
+y 20
+end
+arch shop_empty
+x 18
+y 21
+end
+arch wall_2_1_2
+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 light3
+x 19
+y 3
+end
+arch shop_empty
+x 19
+y 3
+end
+arch window_win2
+x 19
+y 3
+end
+arch shop_special
+x 19
+y 4
+end
+arch light4
+x 19
+y 5
+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_armour
+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_special
+x 20
+y 4
+end
+arch shop_special
+x 20
+y 5
+end
+arch shop_special
+x 20
+y 6
+end
+arch shop_empty
+x 20
+y 7
+end
+arch swall_1_4_half
+x 20
+y 7
+end
+arch wall_0
+x 20
+y 7
+blocksview 0
+end
+arch shop_armour
+x 20
+y 8
+end
+arch shop_armour
+x 20
+y 9
+end
+arch shop_armour
+x 20
+y 10
+end
+arch shop_armour
+x 20
+y 11
+end
+arch shop_armour
+x 20
+y 12
+end
+arch shop_armour
+x 20
+y 13
+end
+arch shop_armour
+x 20
+y 14
+end
+arch shop_armour
+x 20
+y 15
+end
+arch shop_armour
+x 20
+y 16
+end
+arch shop_armour
+x 20
+y 17
+end
+arch shop_armour
+x 20
+y 18
+end
+arch shop_armour
+x 20
+y 19
+end
+arch shop_armour
+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 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
-y 3
-end
-arch wall_2_1_1
-x 15
+x 21
 y 3
 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
+arch swall_1_3_half
+x 21
+y 7
 end
-arch wall_2_1_1
-x 15
+arch light3
+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
+arch light3
+x 21
 y 15
 end
+arch shop_empty
+x 21
+y 15
+end
+arch window_win1
+x 21
+y 15
+end
+arch shop_empty
+x 21
+y 16
+end
+arch wall_2_1_1
+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 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 4fb216c0d..586c13918 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -14071,8 +14071,8 @@ end
 arch store_armour
 name Armour Shop
 slaying /scorn/shops/armourshop
-hp 2
-sp 15
+hp 5
+sp 20
 x 47
 y 31
 end