From 8fa77454ef9e0cbedce8a32c87777bda81635a37 Mon Sep 17 00:00:00 2001
From: kbulgrien <kbulgrien@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 23 Jun 2009 03:50:05 +0000
Subject: [PATCH] - Re-orient the armourshop to have the door inside the
 building match the   location on the world map by rotating the map 180
 degrees and fixing up   walls and fences.  To keep the door style the same,
 the door was moved   over by one.  To make the player exit on the world tile
 that has the   door on it, the target coordinate was also adjusted.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11980 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/armourshop | 1880 ++++++++++++++++++++--------------------
 world/world_104_115    |    6 +-
 2 files changed, 953 insertions(+), 933 deletions(-)

diff --git a/scorn/shops/armourshop b/scorn/shops/armourshop
index 171311cb4..43c2b6382 100644
--- a/scorn/shops/armourshop
+++ b/scorn/shops/armourshop
@@ -11,7 +11,7 @@ enter_x 14
 enter_y 1
 msg
 Created:  1993-10-15
-Modified: 2008-12-02 Rick Tanner
+Modified: 2009-06-22 Kevin Bulgrien
 endmsg
 end
 arch shop_empty
@@ -39,6 +39,9 @@ end
 arch shop_empty
 y 4
 end
+arch swall_1_4_half
+y 4
+end
 arch wall_2_1_1
 y 4
 end
@@ -63,6 +66,9 @@ end
 arch shop_empty
 y 8
 end
+arch swall_1_4_half
+y 8
+end
 arch wall_2_1_1
 y 8
 end
@@ -87,6 +93,9 @@ end
 arch shop_empty
 y 12
 end
+arch swall_1_4_half
+y 12
+end
 arch wall_2_1_1
 y 12
 end
@@ -105,6 +114,9 @@ end
 arch shop_empty
 y 15
 end
+arch shop_empty
+y 15
+end
 arch wall_2_2_1
 y 15
 end
@@ -114,59 +126,79 @@ end
 arch wall_2_1_2
 x 1
 end
-arch shop_armour
+arch shop_gems
 x 1
 y 1
 end
-arch shop_armour
+arch shop_gems
 x 1
 y 2
 end
-arch shop_armour
+arch shop_gems
 x 1
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 1
 y 4
 end
-arch shop_armour
+arch swall_2_1_2
+x 1
+y 4
+end
+arch shop_special
 x 1
 y 5
 end
-arch shop_armour
+arch shop_special
 x 1
 y 6
 end
-arch shop_armour
+arch shop_special
 x 1
 y 7
 end
-arch shop_armour
+arch shop_empty
 x 1
 y 8
 end
-arch shop_armour
+arch swall_2_1_2
+x 1
+y 8
+end
+arch shop_empty
 x 1
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 1
 y 10
 end
-arch shop_armour
+arch smith
+x 1
+y 10
+end
+arch shop_empty
 x 1
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 1
 y 12
 end
-arch shop_armour
+arch swall_2_1_2
+x 1
+y 12
+end
+arch woodfloor
 x 1
 y 13
 end
-arch shop_armour
+arch menu
+x 1
+y 13
+end
+arch woodfloor
 x 1
 y 14
 end
@@ -174,7 +206,7 @@ arch shop_empty
 x 1
 y 15
 end
-arch wall_2_1_2
+arch wall_1_3
 x 1
 y 15
 end
@@ -184,7 +216,7 @@ end
 arch wall_2_1_2
 x 2
 end
-arch shop_empty
+arch shop_gems
 x 2
 y 1
 end
@@ -192,7 +224,7 @@ arch shop_empty
 x 2
 y 2
 end
-arch shop_empty
+arch shop_gems
 x 2
 y 3
 end
@@ -200,7 +232,11 @@ arch shop_empty
 x 2
 y 4
 end
-arch shop_empty
+arch swall_2_1_2
+x 2
+y 4
+end
+arch shop_special
 x 2
 y 5
 end
@@ -208,7 +244,7 @@ arch shop_empty
 x 2
 y 6
 end
-arch shop_empty
+arch shop_special
 x 2
 y 7
 end
@@ -216,712 +252,224 @@ arch shop_empty
 x 2
 y 8
 end
+arch swall_2_1_2
+x 2
+y 8
+end
 arch shop_empty
 x 2
 y 9
 end
+arch create_eyeshield
+x 2
+y 9
+end
 arch shop_empty
 x 2
 y 10
 end
+arch create_dragon_shield
+x 2
+y 10
+end
+arch create_blue_dragon_mail
+x 2
+y 11
+end
+arch create_green_dragon_mail
+x 2
+y 11
+end
 arch shop_empty
 x 2
 y 11
 end
+arch create_dragon_mail
+x 2
+y 11
+end
 arch shop_empty
 x 2
 y 12
 end
-arch shop_empty
+arch swall_2_1_2
+x 2
+y 12
+end
+arch woodfloor
 x 2
 y 13
 end
-arch shop_empty
-x 2
-y 14
-end
-arch shop_empty
-x 2
-y 15
-end
-arch wall_2_1_2
-x 2
-y 15
-end
-arch shop_empty
-x 3
-end
-arch wall_2_1_2
-x 3
-end
-arch shop_empty
-x 3
-y 1
-end
-arch shop_armour
-x 3
-y 2
-end
-arch shop_armour
-x 3
-y 3
-end
-arch shop_armour
-x 3
-y 4
-end
-arch shop_armour
-x 3
-y 5
-end
-arch shop_armour
-x 3
-y 6
-end
-arch shop_armour
-x 3
-y 7
-end
-arch shop_armour
-x 3
-y 8
-end
-arch shop_armour
-x 3
-y 9
-end
-arch shop_armour
-x 3
-y 10
-end
-arch shop_armour
-x 3
-y 11
-end
-arch shop_armour
-x 3
-y 12
-end
-arch shop_armour
-x 3
-y 13
-end
-arch shop_empty
-x 3
-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_empty
-x 4
-y 1
-end
-arch shop_armour
-x 4
-y 2
-end
-arch shop_empty
-x 4
-y 3
-end
-arch swall_1_1
-x 4
-y 3
-end
-arch shop_empty
-x 4
-y 4
-end
-arch swall_2_1_1
-x 4
-y 4
-end
-arch shop_empty
-x 4
-y 5
-end
-arch swall_2_1_1
-x 4
-y 5
-end
-arch shop_empty
-x 4
-y 6
-end
-arch swall_2_1_1
-x 4
-y 6
-end
-arch shop_empty
-x 4
-y 7
-end
-arch swall_2_1_1
-x 4
-y 7
-end
-arch shop_empty
-x 4
-y 8
-end
-arch swall_2_1_1
-x 4
-y 8
-end
-arch shop_empty
-x 4
-y 9
-end
-arch swall_2_1_1
-x 4
-y 9
-end
-arch shop_empty
-x 4
-y 10
-end
-arch swall_2_1_1
-x 4
-y 10
-end
-arch shop_empty
-x 4
-y 11
-end
-arch swall_2_1_1
-x 4
-y 11
-end
-arch shop_empty
-x 4
-y 12
-end
-arch swall_1_2
-x 4
-y 12
-end
-arch shop_armour
-x 4
-y 13
-end
-arch shop_empty
-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_armour
-x 5
-y 2
-end
-arch shop_armour
-x 5
-y 3
-end
-arch shop_armour
-x 5
-y 4
-end
-arch shop_armour
-x 5
-y 5
-end
-arch shop_armour
-x 5
-y 6
-end
-arch shop_armour
-x 5
-y 7
-end
-arch shop_armour
-x 5
-y 8
-end
-arch shop_armour
-x 5
-y 9
-end
-arch shop_armour
-x 5
-y 10
-end
-arch shop_armour
-x 5
-y 11
-end
-arch shop_armour
-x 5
-y 12
-end
-arch shop_armour
-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_empty
-x 6
-y 2
-end
-arch shop_empty
-x 6
-y 3
-end
-arch shop_empty
-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_empty
-x 6
-y 8
-end
-arch shop_empty
-x 6
-y 9
-end
-arch shop_empty
-x 6
-y 10
-end
-arch shop_empty
-x 6
-y 11
-end
-arch shop_empty
-x 6
-y 12
-end
-arch shop_empty
-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_armour
-x 7
-y 3
-end
-arch shop_armour
-x 7
-y 4
-end
-arch shop_armour
-x 7
-y 5
-end
-arch shop_armour
-x 7
-y 6
-end
-arch shop_armour
-x 7
-y 7
-end
-arch shop_armour
-x 7
-y 8
-end
-arch shop_armour
-x 7
-y 9
-end
-arch shop_armour
-x 7
-y 10
-end
-arch shop_armour
-x 7
-y 11
-end
-arch shop_armour
-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_empty
-x 8
-y 3
-end
-arch swall_1_1
-x 8
-y 3
-end
-arch shop_empty
-x 8
-y 4
-end
-arch swall_2_1_1
-x 8
-y 4
-end
-arch shop_empty
-x 8
-y 5
-end
-arch swall_2_1_1
-x 8
-y 5
-end
-arch shop_empty
-x 8
-y 6
-end
-arch swall_2_1_1
-x 8
-y 6
-end
-arch shop_empty
-x 8
-y 7
-end
-arch swall_2_1_1
-x 8
-y 7
-end
-arch shop_empty
-x 8
-y 8
-end
-arch swall_2_1_1
-x 8
-y 8
-end
-arch shop_empty
-x 8
-y 9
-end
-arch swall_2_1_1
-x 8
-y 9
-end
-arch shop_empty
-x 8
-y 10
-end
-arch swall_2_1_1
-x 8
-y 10
-end
-arch shop_empty
-x 8
-y 11
-end
-arch swall_2_1_1
-x 8
-y 11
-end
-arch shop_empty
-x 8
-y 12
-end
-arch swall_1_2
-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_armour
-x 9
-y 2
-end
-arch shop_armour
-x 9
-y 3
-end
-arch shop_armour
-x 9
-y 4
-end
-arch shop_armour
-x 9
-y 5
-end
-arch shop_armour
-x 9
-y 6
-end
-arch shop_armour
-x 9
-y 7
-end
-arch shop_armour
-x 9
-y 8
-end
-arch shop_armour
-x 9
-y 9
-end
-arch shop_armour
-x 9
-y 10
-end
-arch shop_armour
-x 9
-y 11
-end
-arch shop_armour
-x 9
-y 12
-end
-arch shop_armour
-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_empty
-x 10
-y 2
-end
-arch shop_empty
-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 shop_empty
-x 10
-y 7
-end
-arch shop_empty
-x 10
-y 8
-end
-arch shop_empty
-x 10
-y 9
-end
-arch shop_empty
-x 10
-y 10
-end
-arch shop_empty
-x 10
-y 11
-end
-arch shop_empty
-x 10
-y 12
-end
-arch shop_empty
-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_mat
-x 11
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch shop_empty
+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
+end
+arch wall_2_1_2
+x 3
+end
+arch shop_gems
+x 3
 y 1
 end
 arch shop_empty
-x 11
+x 3
 y 2
 end
-arch shop_empty
-x 11
-y 3
-end
-arch swall_1_4
-x 11
+arch shop_gems
+x 3
 y 3
 end
 arch shop_empty
-x 11
+x 3
 y 4
 end
-arch shop_empty
-x 11
+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
 If you have killed any large dragons
@@ -933,169 +481,708 @@ anvil besides the smith, and he will
 turn them into shields and armours
 for a small fee.
 endmsg
-x 11
-y 5
-end
-arch shop_empty
-x 11
-y 6
-end
-arch shop_empty
-x 11
-y 7
-end
-arch swall_1_4
-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
+x 4
 y 10
 end
 arch shop_empty
-x 11
+x 4
 y 11
 end
-arch swall_1_4
-x 11
-y 11
+arch shop_empty
+x 4
+y 12
 end
-arch shop_gems
-x 11
+arch swall_1_3
+x 4
 y 12
 end
 arch shop_empty
-x 11
+x 4
 y 13
 end
-arch shop_gems
-x 11
+arch shop_empty
+x 4
 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 swall_1_1_half
-x 12
-end
-arch shop_empty
-x 12
-y 1
-end
-arch swall_2_1_1
-x 12
-y 1
-end
-arch shop_empty
-x 12
-y 2
-end
-arch swall_2_1_1
-x 12
-y 2
-end
-arch shop_empty
-x 12
-y 3
-end
-arch swall_3_1
-x 12
-y 3
-end
-arch shop_empty
-x 12
-y 4
-end
-arch shop_empty
-x 12
-y 5
-end
-arch shop_empty
-x 12
-y 6
-end
-arch shop_empty
-x 12
-y 7
-end
-arch swall_2_1_2
-x 12
-y 7
-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 shop_empty
-x 12
-y 11
-end
-arch swall_2_1_2
-x 12
-y 11
-end
-arch shop_gems
-x 12
-y 12
-end
-arch shop_empty
-x 12
-y 13
-end
-arch shop_gems
-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_1_3
-x 13
-end
-arch woodfloor
-x 13
-y 1
-end
-arch woodfloor
-x 13
-y 2
-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
@@ -1103,51 +1190,23 @@ arch shop_empty
 x 13
 y 3
 end
-arch swall_2_1_2
-x 13
-y 3
-end
-arch create_blue_dragon_mail
-x 13
-y 4
-end
-arch create_green_dragon_mail
-x 13
-y 4
-end
 arch shop_empty
 x 13
 y 4
 end
-arch create_dragon_mail
-x 13
-y 4
-end
 arch shop_empty
 x 13
 y 5
 end
-arch create_dragon_shield
-x 13
-y 5
-end
 arch shop_empty
 x 13
 y 6
 end
-arch create_eyeshield
-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
+arch shop_empty
 x 13
 y 8
 end
@@ -1155,7 +1214,7 @@ arch shop_empty
 x 13
 y 9
 end
-arch shop_special
+arch shop_empty
 x 13
 y 10
 end
@@ -1163,11 +1222,7 @@ arch shop_empty
 x 13
 y 11
 end
-arch swall_2_1_2
-x 13
-y 11
-end
-arch shop_gems
+arch shop_empty
 x 13
 y 12
 end
@@ -1175,7 +1230,7 @@ arch shop_empty
 x 13
 y 13
 end
-arch shop_gems
+arch shop_empty
 x 13
 y 14
 end
@@ -1190,85 +1245,62 @@ end
 arch shop_empty
 x 14
 end
-arch oakdoor_2
-slaying /world/world_104_115
-hp 48
-sp 32
+arch wall_2_1_2
 x 14
 end
-arch woodfloor
+arch shop_armour
 x 14
 y 1
 end
-arch woodfloor
+arch shop_armour
 x 14
 y 2
 end
-arch menu
-x 14
-y 2
-end
-arch shop_empty
+arch shop_armour
 x 14
 y 3
 end
-arch swall_2_1_2
-x 14
-y 3
-end
-arch shop_empty
+arch shop_armour
 x 14
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 14
 y 5
 end
-arch smith
-x 14
-y 5
-end
-arch shop_empty
+arch shop_armour
 x 14
 y 6
 end
-arch shop_empty
+arch shop_armour
 x 14
 y 7
 end
-arch swall_2_1_2
-x 14
-y 7
-end
-arch shop_special
+arch shop_armour
 x 14
 y 8
 end
-arch shop_special
+arch shop_armour
 x 14
 y 9
 end
-arch shop_special
+arch shop_armour
 x 14
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 14
 y 11
 end
-arch swall_2_1_2
-x 14
-y 11
-end
-arch shop_gems
+arch shop_armour
 x 14
 y 12
 end
-arch shop_gems
+arch shop_armour
 x 14
 y 13
 end
-arch shop_gems
+arch shop_armour
 x 14
 y 14
 end
@@ -1283,7 +1315,7 @@ end
 arch shop_empty
 x 15
 end
-arch wall_1_1
+arch wall_2_2_3
 x 15
 end
 arch shop_empty
@@ -1310,10 +1342,6 @@ arch wall_2_1_1
 x 15
 y 3
 end
-arch swall_1_3_half
-x 15
-y 3
-end
 arch shop_empty
 x 15
 y 4
@@ -1346,10 +1374,6 @@ arch wall_2_1_1
 x 15
 y 7
 end
-arch swall_1_3_half
-x 15
-y 7
-end
 arch shop_empty
 x 15
 y 8
@@ -1382,10 +1406,6 @@ arch wall_2_1_1
 x 15
 y 11
 end
-arch swall_1_3_half
-x 15
-y 11
-end
 arch shop_empty
 x 15
 y 12
diff --git a/world/world_104_115 b/world/world_104_115
index eb73787e3..1f6940810 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: 2008-11-30 Rick Tanner
+Modified: 2009-06-22 Kevin Bulgrien
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -14082,8 +14082,8 @@ end
 arch store_armour
 name Armour Shop
 slaying /scorn/shops/armourshop
-hp 14
-sp 1
+hp 2
+sp 15
 x 47
 y 31
 end