From 23eb8805e808287bc41c9ac5eb5d482382097ed9 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 3 May 2011 05:20:06 +0000
Subject: [PATCH] Major cosmetic overhall to Olaf's Armour Emporium in Navar.
 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. Shop item and decor layout changes. Map considered an outdoor map
 so darkness or time of day is visible when inside; added light sources. 
 Updated world map for new map entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14448 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/misc/city1armour | 2508 +++++++++++++++++++++++------------
 world/world_122_117         |    6 +-
 2 files changed, 1675 insertions(+), 839 deletions(-)

diff --git a/navar_city/misc/city1armour b/navar_city/misc/city1armour
index 0ed6f65d2..2d097b095 100644
--- a/navar_city/misc/city1armour
+++ b/navar_city/misc/city1armour
@@ -8,259 +8,874 @@ shopgreed 1.10000
 shopmin 20
 shopmax 10000
 shoprace dwarf
-width 19
-height 16
+width 23
+height 20
 enter_x 1
 enter_y 2
 msg
 Created:  1993-10-27
-Modified: 2008-12-10 Rick Tanner
+Modified: 2011-05-03 Rick Tanner
 endmsg
+outdoor 1
 end
-arch flagstone
-name floor
-face shop_empty.111
+arch cobblestones2
 end
-arch wall_2_2_2
-end
-arch flagstone
-name floor
-face shop_empty.111
+arch cobblestones2
 y 1
 end
-arch wall_1_2
-y 1
-end
-arch flagstone
-name floor
-face shop_empty.111
+arch cobblestones2
 y 2
 end
-arch oakdoor_1
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch cobblestones2
+y 19
+end
+arch cobblestones2
+x 1
+end
+arch cobblestones2
+x 1
+y 1
+end
+arch cobblestones2
+x 1
+y 2
+end
+arch cobblestones2
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 4
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 8
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
+x 1
+y 13
+end
+arch cobblestones2
+x 1
+y 14
+end
+arch cobblestones2
+x 1
+y 15
+end
+arch cobblestones2
+x 1
+y 16
+end
+arch cobblestones2
+x 1
+y 17
+end
+arch cobblestones2
+x 1
+y 18
+end
+arch cobblestones2
+x 1
+y 19
+end
+arch cobblestones2
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch stonefloor2
+x 2
+y 2
+end
+arch wall_2_2_2
+x 2
+y 2
+end
+arch stonefloor2
+x 2
+y 3
+end
+arch wall_2_1_1
+x 2
+y 3
+end
+arch stonefloor2
+x 2
+y 4
+end
+arch wall_2_1_1
+x 2
+y 4
+end
+arch stonefloor2
+x 2
+y 5
+end
+arch wall_2_1_1
+x 2
+y 5
+end
+arch light2
+x 2
+y 6
+end
+arch stonefloor2
+x 2
+y 6
+end
+arch wall_2_1_1
+x 2
+y 6
+end
+arch window_win1
+x 2
+y 6
+end
+arch stonefloor2
+x 2
+y 7
+end
+arch wall_2_1_1
+x 2
+y 7
+end
+arch stonefloor2
+x 2
+y 8
+end
+arch wall_2_1_1
+x 2
+y 8
+end
+arch stonefloor2
+x 2
+y 9
+end
+arch wall_2_1_1
+x 2
+y 9
+end
+arch light2
+x 2
+y 10
+end
+arch stonefloor2
+x 2
+y 10
+end
+arch wall_2_1_1
+x 2
+y 10
+end
+arch window_win1
+x 2
+y 10
+end
+arch stonefloor2
+x 2
+y 11
+end
+arch wall_2_1_1
+x 2
+y 11
+end
+arch stonefloor2
+x 2
+y 12
+end
+arch wall_2_1_1
+x 2
+y 12
+end
+arch stonefloor2
+x 2
+y 13
+end
+arch swall_1_4_half
+x 2
+y 13
+end
+arch wall_2_1_1
+x 2
+y 13
+end
+arch stonefloor2
+x 2
+y 14
+end
+arch wall_2_1_1
+x 2
+y 14
+end
+arch stonefloor2
+x 2
+y 15
+end
+arch wall_2_1_1
+x 2
+y 15
+end
+arch stonefloor2
+x 2
+y 16
+end
+arch wall_2_1_1
+x 2
+y 16
+end
+arch stonefloor2
+x 2
+y 17
+end
+arch wall_2_2_1
+x 2
+y 17
+end
+arch cobblestones2
+x 2
+y 18
+end
+arch cobblestones2
+x 2
+y 19
+end
+arch cobblestones2
+x 3
+end
+arch cobblestones2
+x 3
+y 1
+end
+arch stonefloor2
+x 3
+y 2
+end
+arch wall_2_1_2
+x 3
+y 2
+end
+arch shop_potions
+x 3
+y 3
+end
+arch shop_books
+x 3
+y 4
+end
+arch shop_special
+x 3
+y 5
+end
+arch shop_special
+x 3
+y 6
+end
+arch shop_food
+x 3
+y 7
+end
+arch shop_empty
+x 3
+y 8
+end
+arch shop_weapon
+x 3
+y 8
+end
+arch shop_amulets
+x 3
+y 9
+end
+arch shop_armour
+x 3
+y 10
+end
+arch shop_weapon
+x 3
+y 11
+end
+arch shop_empty
+x 3
+y 12
+end
+arch shop_mat
+x 3
+y 12
+end
+arch stonefloor2
+x 3
+y 13
+end
+arch swall_2_1_2
+x 3
+y 13
+end
+arch stonefloor2
+x 3
+y 14
+end
+arch shop_mat
+x 3
+y 14
+end
+arch stonefloor2
+x 3
+y 15
+end
+arch light4
+x 3
+y 16
+end
+arch button_small
+x 3
+y 16
+connected 1
+end
+arch stonefloor2
+x 3
+y 16
+end
+arch stonefloor2
+x 3
+y 17
+end
+arch wall_1_3
+x 3
+y 17
+end
+arch dungeon_magic
+x 3
+y 18
+end
+arch invis_exit
 slaying /world/world_122_117
 hp 16
 sp 2
-y 2
+x 3
+y 18
 end
-arch flagstone
-name floor
-face shop_empty.111
-y 3
+arch cobblestones2
+x 3
+y 18
 end
-arch wall_2_2_2
-y 3
+arch cobblestones2
+x 3
+y 19
 end
-arch shop_empty
-y 4
+arch cobblestones2
+x 4
 end
-arch wall_2_1_1
-y 4
-end
-arch shop_empty
-y 5
-end
-arch wall_3_2
-y 5
-end
-arch shop_empty
-y 6
-end
-arch wall_2_1_1
-y 6
-end
-arch shop_empty
-y 7
-end
-arch wall_2_1_1
-y 7
-end
-arch shop_empty
-y 8
-end
-arch wall_2_1_1
-y 8
-end
-arch shop_empty
-y 9
-end
-arch wall_2_1_1
-y 9
-end
-arch shop_empty
-y 10
-end
-arch wall_2_1_1
-y 10
-end
-arch shop_empty
-y 11
-end
-arch wall_2_1_1
-y 11
-end
-arch shop_empty
-y 12
-end
-arch wall_2_1_1
-y 12
-end
-arch shop_empty
-y 13
-end
-arch wall_2_1_1
-y 13
-end
-arch shop_empty
-y 14
-end
-arch wall_2_1_1
-y 14
-end
-arch shop_empty
-y 15
-end
-arch wall_2_2_1
-y 15
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
-end
-arch wall_2_1_2
-x 1
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch cobblestones2
+x 4
 y 1
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
+arch stonefloor2
+x 4
 y 2
 end
-arch flagstone
-name floor
-face shop_empty.111
-x 1
-y 3
-end
 arch wall_2_1_2
-x 1
-y 3
-end
-arch shop_empty
-x 1
-y 4
-end
-arch dwarf
-name Olaf
-dam 10
-ac -2
-x 1
-y 4
-pick_up 0
-will_apply 0
-can_cast_spell 0
-can_use_scroll 0
-can_use_bow 0
-can_use_armour 0
-can_use_weapon 0
-can_use_ring 0
-end
-arch shop_empty
-x 1
-y 5
-end
-arch wall_2_1_2
-x 1
-y 5
-end
-arch shop_potions
-x 1
-y 6
-end
-arch shop_books
-x 1
-y 7
-end
-arch shop_special
-x 1
-y 8
-end
-arch shop_special
-x 1
-y 9
-end
-arch shop_food
-x 1
-y 10
-end
-arch shop_amulets
-x 1
-y 11
-end
-arch shop_weapon
-x 1
-y 12
+x 4
+y 2
 end
 arch shop_armour
-x 1
+x 4
+y 3
+end
+arch light4
+x 4
+y 4
+end
+arch shop_empty
+x 4
+y 4
+end
+arch shop_special
+x 4
+y 5
+end
+arch light4
+x 4
+y 6
+end
+arch shop_empty
+x 4
+y 6
+end
+arch shop_food
+x 4
+y 7
+end
+arch light4
+x 4
+y 8
+end
+arch shop_empty
+x 4
+y 8
+end
+arch shop_amulets
+x 4
+y 9
+end
+arch light4
+x 4
+y 10
+end
+arch shop_empty
+x 4
+y 10
+end
+arch shop_armour
+x 4
+y 11
+end
+arch shop_empty
+x 4
+y 12
+end
+arch stonefloor2
+x 4
 y 13
 end
+arch swall_2_1_2
+x 4
+y 13
+end
+arch stonefloor2
+x 4
+y 14
+end
+arch menu
+x 4
+y 14
+end
+arch stonefloor2
+x 4
+y 15
+end
+arch button_small
+x 4
+y 16
+connected 1
+end
+arch stonefloor2
+x 4
+y 16
+end
+arch button_small
+x 4
+y 17
+connected 1
+end
+arch stonefloor2
+x 4
+y 17
+end
+arch odoorn2_closed_1
+x 4
+y 17
+connected 1
+end
+arch dungeon_magic
+x 4
+y 18
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 2
+x 4
+y 18
+end
+arch cobblestones2
+x 4
+y 18
+end
+arch cobblestones2
+x 4
+y 19
+end
+arch cobblestones2
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch stonefloor2
+x 5
+y 2
+end
+arch wall_2_1_2
+x 5
+y 2
+end
 arch shop_weapon
-x 1
+x 5
+y 3
+end
+arch shop_empty
+x 5
+y 4
+end
+arch shop_armour
+x 5
+y 5
+end
+arch shop_empty
+x 5
+y 6
+end
+arch shop_ring
+x 5
+y 7
+end
+arch shop_empty
+x 5
+y 8
+end
+arch shop_armour
+x 5
+y 9
+end
+arch shop_empty
+x 5
+y 10
+end
+arch shop_weapon
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch stonefloor2
+x 5
+y 13
+end
+arch swall_2_1_2
+x 5
+y 13
+end
+arch light4
+x 5
+y 14
+end
+arch stonefloor2
+x 5
+y 14
+end
+arch stonefloor2
+x 5
+y 15
+end
+arch button_small
+x 5
+y 16
+connected 1
+end
+arch stonefloor2
+x 5
+y 16
+end
+arch stonefloor2
+x 5
+y 17
+end
+arch wall_1_4
+x 5
+y 17
+end
+arch dungeon_magic
+x 5
+y 18
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 2
+x 5
+y 18
+end
+arch cobblestones2
+x 5
+y 18
+end
+arch cobblestones2
+x 5
+y 19
+end
+arch cobblestones2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch light2
+x 6
+y 2
+end
+arch stonefloor2
+x 6
+y 2
+end
+arch window_win2
+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 stonefloor2
+x 6
+y 13
+end
+arch swall_2_2_3
+x 6
+y 13
+end
+arch stonefloor2
+x 6
+y 14
+end
+arch swall_2_1_1
+x 6
+y 14
+end
+arch stonefloor2
+x 6
+y 15
+end
+arch swall_2_1_1
+x 6
+y 15
+end
+arch stonefloor2
+x 6
+y 16
+end
+arch swall_2_1_1
+x 6
+y 16
+end
+arch stonefloor2
+x 6
+y 17
+end
+arch swall_1_2_half
+x 6
+y 17
+end
+arch wall_2_1_2
+x 6
+y 17
+end
+arch cobblestones2
+x 6
+y 18
+end
+arch cobblestones2
+x 6
+y 19
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch stonefloor2
+x 7
+y 2
+end
+arch wall_2_1_2
+x 7
+y 2
+end
+arch shop_armour
+x 7
+y 3
+end
+arch shop_empty
+x 7
+y 4
+end
+arch shop_armour
+x 7
+y 5
+end
+arch shop_empty
+x 7
+y 6
+end
+arch shop_armour
+x 7
+y 7
+end
+arch light4
+x 7
+y 8
+end
+arch shop_empty
+x 7
+y 8
+end
+arch shop_armour
+x 7
+y 9
+end
+arch shop_empty
+x 7
+y 10
+end
+arch shop_armour
+x 7
+y 11
+end
+arch shop_empty
+x 7
+y 12
+end
+arch light4
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 14
+end
+arch longtable_1_4
+x 7
 y 14
 end
 arch shop_empty
-x 1
+x 7
 y 15
 end
-arch wall_2_1_2
-x 1
-y 15
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-end
-arch wall_2_1_2
-x 2
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 1
-end
-arch menu
-x 2
-y 1
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 2
-end
-arch shop_mat
-x 2
-y 2
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 2
-y 3
-end
-arch wall_2_1_2
-x 2
-y 3
-end
 arch magic_ear
 msg
 @match armour
@@ -277,461 +892,45 @@ things around, but armour is my
 specialty, so buy something or get
 out, no loitering here
 endmsg
-x 2
-y 4
-end
-arch shop_empty
-x 2
-y 4
-end
-arch shop_empty
-x 2
-y 5
-end
-arch wall_1_3
-x 2
-y 5
-end
-arch shop_armour
-x 2
-y 6
-end
-arch shop_empty
-x 2
-y 7
-end
-arch shop_special
-x 2
-y 8
-end
-arch shop_empty
-x 2
-y 9
-end
-arch shop_food
-x 2
-y 10
-end
-arch shop_amulets
-x 2
-y 11
-end
-arch shop_empty
-x 2
-y 12
-end
-arch shop_empty
-x 2
-y 13
-end
-arch shop_armour
-x 2
-y 14
-end
-arch shop_empty
-x 2
-y 15
-end
-arch wall_2_1_2
-x 2
-y 15
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-end
-arch wall_2_1_2
-x 3
-end
-arch swall_1_1_half
-x 3
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 1
-end
-arch swall_2_1_1
-x 3
-y 1
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 2
-end
-arch swall_2_1_1
-x 3
-y 2
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 3
-y 3
-end
-arch swall_1_2_half
-x 3
-y 3
-end
-arch wall_1_3
-x 3
-y 3
-end
-arch shop_empty
-x 3
-y 4
-end
-arch shop_empty
-x 3
-y 5
-end
-arch shop_weapon
-x 3
-y 6
-end
-arch shop_empty
-x 3
-y 7
-end
-arch shop_armour
-x 3
-y 8
-end
-arch shop_empty
-x 3
-y 9
-end
-arch shop_ring
-x 3
-y 10
-end
-arch shop_armour
-x 3
-y 11
-end
-arch shop_empty
-x 3
-y 12
-end
-arch shop_empty
-x 3
-y 13
-end
-arch shop_weapon
-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_empty
-x 4
-y 2
-end
-arch shop_mat
-x 4
-y 2
-end
-arch shop_empty
-x 4
-y 3
-end
-arch shop_empty
-x 4
-y 4
-end
-arch shop_empty
-x 4
-y 5
-end
-arch shop_empty
-x 4
-y 6
-end
-arch shop_empty
-x 4
-y 7
-end
-arch shop_armour
-x 4
-y 8
-end
-arch shop_empty
-x 4
-y 9
-end
-arch shop_armour
-x 4
-y 10
-end
-arch shop_armour
-x 4
-y 11
-end
-arch shop_empty
-x 4
-y 12
-end
-arch shop_empty
-x 4
-y 13
-end
-arch shop_armour
-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_wands
-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_empty
-x 6
-y 3
-end
-arch shop_armour
-x 6
-y 4
-end
-arch shop_empty
-x 6
-y 5
-end
-arch shop_armour
-x 6
-y 6
-end
-arch shop_empty
-x 6
-y 7
-end
-arch shop_armour
-x 6
-y 8
-end
-arch shop_empty
-x 6
-y 9
-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 shop_empty
-x 6
-y 13
-end
-arch shop_armour
-x 6
-y 14
-end
-arch shop_empty
-x 6
-y 15
-end
-arch wall_2_1_2
-x 6
-y 15
+x 7
+y 16
 end
 arch shop_empty
 x 7
+y 16
+end
+arch stonefloor2
+x 7
+y 17
 end
 arch wall_2_1_2
 x 7
+y 17
 end
-arch shop_empty
+arch cobblestones2
 x 7
-y 1
+y 18
 end
-arch shop_armour
+arch cobblestones2
 x 7
-y 2
+y 19
 end
-arch shop_armour
-x 7
-y 3
-end
-arch shop_armour
-x 7
-y 4
-end
-arch shop_empty
-x 7
-y 5
-end
-arch shop_armour
-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_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_armour
-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
+arch cobblestones2
 x 8
 end
-arch wall_2_1_2
-x 8
-end
-arch shop_empty
+arch cobblestones2
 x 8
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 8
 y 2
 end
-arch shop_empty
+arch wall_2_1_2
+x 8
+y 2
+end
+arch shop_armour
 x 8
 y 3
 end
@@ -739,43 +938,51 @@ arch shop_empty
 x 8
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 8
 y 5
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 6
 end
-arch shop_empty
+arch shop_armour
 x 8
 y 7
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 8
 y 9
 end
-arch shop_armour
+arch light4
 x 8
 y 10
 end
 arch shop_empty
 x 8
-y 11
+y 10
 end
 arch shop_armour
 x 8
+y 11
+end
+arch shop_empty
+x 8
 y 12
 end
 arch shop_empty
 x 8
 y 13
 end
-arch shop_armour
+arch shop_empty
+x 8
+y 14
+end
+arch longtable_2_1_2
 x 8
 y 14
 end
@@ -783,29 +990,65 @@ arch shop_empty
 x 8
 y 15
 end
-arch wall_2_1_2
+arch dwarf
+name Olaf
+dam 10
+ac -2
 x 8
 y 15
+pick_up 0
+will_apply 0
+can_cast_spell 0
+can_use_scroll 0
+can_use_bow 0
+can_use_armour 0
+can_use_weapon 0
+can_use_ring 0
 end
 arch shop_empty
-x 9
+x 8
+y 16
+end
+arch stonefloor2
+x 8
+y 17
 end
 arch wall_2_1_2
+x 8
+y 17
+end
+arch cobblestones2
+x 8
+y 18
+end
+arch cobblestones2
+x 8
+y 19
+end
+arch cobblestones2
 x 9
 end
-arch shop_empty
+arch cobblestones2
 x 9
 y 1
 end
-arch shop_armour
+arch stonefloor2
 x 9
 y 2
 end
+arch wall_2_1_2
+x 9
+y 2
+end
+arch light4
+x 9
+y 3
+end
 arch shop_armour
 x 9
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 4
 end
@@ -813,31 +1056,35 @@ arch shop_armour
 x 9
 y 5
 end
-arch shop_armour
+arch light4
 x 9
 y 6
 end
 arch shop_empty
 x 9
-y 7
+y 6
 end
 arch shop_armour
 x 9
+y 7
+end
+arch shop_empty
+x 9
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 9
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 9
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 12
 end
@@ -845,7 +1092,11 @@ arch shop_empty
 x 9
 y 13
 end
-arch shop_armour
+arch shop_empty
+x 9
+y 14
+end
+arch longtable_2_2_3
 x 9
 y 14
 end
@@ -853,25 +1104,50 @@ arch shop_empty
 x 9
 y 15
 end
-arch wall_2_1_2
+arch longtable_2_1_1
 x 9
 y 15
 end
 arch shop_empty
-x 10
+x 9
+y 16
+end
+arch longtable_1_2
+x 9
+y 16
+end
+arch stonefloor2
+x 9
+y 17
 end
 arch wall_2_1_2
+x 9
+y 17
+end
+arch cobblestones2
+x 9
+y 18
+end
+arch cobblestones2
+x 9
+y 19
+end
+arch cobblestones2
 x 10
 end
-arch shop_empty
+arch cobblestones2
 x 10
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 10
 y 2
 end
-arch shop_empty
+arch wall_2_1_2
+x 10
+y 2
+end
+arch shop_armour
 x 10
 y 3
 end
@@ -879,7 +1155,7 @@ arch shop_empty
 x 10
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 5
 end
@@ -887,27 +1163,27 @@ arch shop_empty
 x 10
 y 6
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 7
 end
-arch shop_armour
+arch shop_empty
 x 10
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 10
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 10
 y 12
 end
@@ -915,29 +1191,58 @@ arch shop_empty
 x 10
 y 13
 end
-arch shop_armour
+arch shop_empty
 x 10
 y 14
 end
-arch shop_empty
-x 10
-y 15
-end
-arch wall_2_1_2
+arch light4
 x 10
 y 15
 end
 arch shop_empty
-x 11
-end
-arch wall_2_1_2
-x 11
+x 10
+y 15
 end
 arch shop_empty
+x 10
+y 16
+end
+arch light2
+x 10
+y 17
+end
+arch stonefloor2
+x 10
+y 17
+end
+arch window_win2
+x 10
+y 17
+end
+arch cobblestones2
+x 10
+y 18
+end
+arch cobblestones2
+x 10
+y 19
+end
+arch cobblestones2
+x 11
+end
+arch cobblestones2
 x 11
 y 1
 end
-arch shop_armour
+arch light2
+x 11
+y 2
+end
+arch stonefloor2
+x 11
+y 2
+end
+arch window_win2
 x 11
 y 2
 end
@@ -945,7 +1250,7 @@ arch shop_armour
 x 11
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 4
 end
@@ -953,7 +1258,7 @@ arch shop_armour
 x 11
 y 5
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 6
 end
@@ -961,19 +1266,19 @@ arch shop_armour
 x 11
 y 7
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 11
 end
@@ -981,7 +1286,7 @@ arch shop_armour
 x 11
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 13
 end
@@ -989,29 +1294,46 @@ arch shop_armour
 x 11
 y 14
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 15
 end
+arch shop_armour
+x 11
+y 16
+end
+arch stonefloor2
+x 11
+y 17
+end
 arch wall_2_1_2
 x 11
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 11
+y 18
+end
+arch cobblestones2
+x 11
+y 19
+end
+arch cobblestones2
 x 12
 end
-arch wall_2_1_2
-x 12
-end
-arch shop_empty
+arch cobblestones2
 x 12
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 12
 y 2
 end
-arch shop_empty
+arch wall_2_1_2
+x 12
+y 2
+end
+arch shop_armour
 x 12
 y 3
 end
@@ -1019,35 +1341,47 @@ arch shop_empty
 x 12
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 12
 y 5
 end
-arch shop_empty
+arch light4
 x 12
 y 6
 end
 arch shop_empty
 x 12
+y 6
+end
+arch shop_armour
+x 12
 y 7
 end
-arch shop_empty
+arch light4
 x 12
 y 8
 end
 arch shop_empty
 x 12
-y 9
+y 8
 end
 arch shop_armour
 x 12
+y 9
+end
+arch light4
+x 12
+y 10
+end
+arch shop_empty
+x 12
 y 10
 end
 arch shop_empty
 x 12
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 12
 y 12
 end
@@ -1055,7 +1389,11 @@ arch shop_empty
 x 12
 y 13
 end
-arch shop_armour
+arch light4
+x 12
+y 14
+end
+arch shop_empty
 x 12
 y 14
 end
@@ -1063,21 +1401,38 @@ arch shop_empty
 x 12
 y 15
 end
+arch shop_empty
+x 12
+y 16
+end
+arch stonefloor2
+x 12
+y 17
+end
 arch wall_2_1_2
 x 12
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 12
+y 18
+end
+arch cobblestones2
+x 12
+y 19
+end
+arch cobblestones2
 x 13
 end
-arch wall_2_1_2
-x 13
-end
-arch shop_empty
+arch cobblestones2
 x 13
 y 1
 end
-arch shop_armour
+arch stonefloor2
+x 13
+y 2
+end
+arch wall_2_1_2
 x 13
 y 2
 end
@@ -1085,7 +1440,7 @@ arch shop_armour
 x 13
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 13
 y 4
 end
@@ -1093,7 +1448,7 @@ arch shop_armour
 x 13
 y 5
 end
-arch shop_armour
+arch shop_empty
 x 13
 y 6
 end
@@ -1101,7 +1456,7 @@ arch shop_armour
 x 13
 y 7
 end
-arch shop_armour
+arch shop_empty
 x 13
 y 8
 end
@@ -1113,7 +1468,7 @@ arch shop_armour
 x 13
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 11
 end
@@ -1121,7 +1476,7 @@ arch shop_armour
 x 13
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 13
 end
@@ -1129,29 +1484,50 @@ arch shop_armour
 x 13
 y 14
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 15
 end
+arch shop_armour
+x 13
+y 16
+end
+arch stonefloor2
+x 13
+y 17
+end
 arch wall_2_1_2
 x 13
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 13
+y 18
+end
+arch cobblestones2
+x 13
+y 19
+end
+arch cobblestones2
 x 14
 end
-arch wall_2_1_2
-x 14
-end
-arch shop_empty
+arch cobblestones2
 x 14
 y 1
 end
-arch shop_empty
+arch stonefloor2
 x 14
 y 2
 end
-arch shop_empty
+arch wall_2_1_2
+x 14
+y 2
+end
+arch light4
+x 14
+y 3
+end
+arch shop_armour
 x 14
 y 3
 end
@@ -1159,7 +1535,7 @@ arch shop_empty
 x 14
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 14
 y 5
 end
@@ -1167,10 +1543,14 @@ arch shop_empty
 x 14
 y 6
 end
-arch shop_empty
+arch shop_armour
 x 14
 y 7
 end
+arch light4
+x 14
+y 8
+end
 arch shop_empty
 x 14
 y 8
@@ -1187,7 +1567,7 @@ arch shop_empty
 x 14
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 14
 y 12
 end
@@ -1195,7 +1575,7 @@ arch shop_empty
 x 14
 y 13
 end
-arch shop_armour
+arch shop_empty
 x 14
 y 14
 end
@@ -1203,21 +1583,38 @@ arch shop_empty
 x 14
 y 15
 end
+arch shop_empty
+x 14
+y 16
+end
+arch stonefloor2
+x 14
+y 17
+end
 arch wall_2_1_2
 x 14
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 14
+y 18
+end
+arch cobblestones2
+x 14
+y 19
+end
+arch cobblestones2
 x 15
 end
-arch wall_2_1_2
-x 15
-end
-arch shop_empty
+arch cobblestones2
 x 15
 y 1
 end
-arch shop_armour
+arch stonefloor2
+x 15
+y 2
+end
+arch wall_2_1_2
 x 15
 y 2
 end
@@ -1225,7 +1622,7 @@ arch shop_armour
 x 15
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 15
 y 4
 end
@@ -1233,7 +1630,11 @@ arch shop_armour
 x 15
 y 5
 end
-arch shop_armour
+arch light4
+x 15
+y 6
+end
+arch shop_empty
 x 15
 y 6
 end
@@ -1261,7 +1662,7 @@ arch shop_armour
 x 15
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 15
 y 13
 end
@@ -1269,29 +1670,50 @@ arch shop_armour
 x 15
 y 14
 end
-arch shop_empty
+arch shop_armour
 x 15
 y 15
 end
+arch shop_armour
+x 15
+y 16
+end
+arch stonefloor2
+x 15
+y 17
+end
 arch wall_2_1_2
 x 15
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 15
+y 18
+end
+arch cobblestones2
+x 15
+y 19
+end
+arch cobblestones2
 x 16
 end
-arch wall_2_1_2
-x 16
-end
-arch shop_empty
+arch cobblestones2
 x 16
 y 1
 end
-arch shop_empty
+arch light2
 x 16
 y 2
 end
-arch shop_empty
+arch stonefloor2
+x 16
+y 2
+end
+arch window_win2
+x 16
+y 2
+end
+arch shop_armour
 x 16
 y 3
 end
@@ -1299,7 +1721,7 @@ arch shop_empty
 x 16
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 16
 y 5
 end
@@ -1335,29 +1757,54 @@ arch shop_empty
 x 16
 y 13
 end
-arch shop_armour
+arch shop_empty
 x 16
 y 14
 end
-arch shop_empty
-x 16
-y 15
-end
-arch wall_2_1_2
+arch light4
 x 16
 y 15
 end
 arch shop_empty
+x 16
+y 15
+end
+arch shop_empty
+x 16
+y 16
+end
+arch light2
+x 16
+y 17
+end
+arch stonefloor2
+x 16
+y 17
+end
+arch window_win2
+x 16
+y 17
+end
+arch cobblestones2
+x 16
+y 18
+end
+arch cobblestones2
+x 16
+y 19
+end
+arch cobblestones2
 x 17
 end
-arch wall_2_1_2
-x 17
-end
-arch shop_armour
+arch cobblestones2
 x 17
 y 1
 end
-arch shop_armour
+arch stonefloor2
+x 17
+y 2
+end
+arch wall_2_1_2
 x 17
 y 2
 end
@@ -1365,7 +1812,7 @@ arch shop_armour
 x 17
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 17
 y 4
 end
@@ -1409,137 +1856,526 @@ arch shop_armour
 x 17
 y 14
 end
-arch shop_empty
+arch shop_armour
 x 17
 y 15
 end
+arch shop_armour
+x 17
+y 16
+end
+arch stonefloor2
+x 17
+y 17
+end
 arch wall_2_1_2
 x 17
+y 17
+end
+arch cobblestones2
+x 17
+y 18
+end
+arch cobblestones2
+x 17
+y 19
+end
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
+y 1
+end
+arch stonefloor2
+x 18
+y 2
+end
+arch wall_2_1_2
+x 18
+y 2
+end
+arch shop_armour
+x 18
+y 3
+end
+arch light4
+x 18
+y 4
+end
+arch shop_empty
+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_empty
+x 18
+y 8
+end
+arch shop_empty
+x 18
+y 9
+end
+arch shop_empty
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 11
+end
+arch shop_empty
+x 18
+y 12
+end
+arch light4
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 13
+end
+arch shop_empty
+x 18
+y 14
+end
+arch light4
+x 18
 y 15
 end
 arch shop_empty
 x 18
+y 15
+end
+arch shop_empty
+x 18
+y 16
+end
+arch stonefloor2
+x 18
+y 17
+end
+arch wall_2_1_2
+x 18
+y 17
+end
+arch cobblestones2
+x 18
+y 18
+end
+arch cobblestones2
+x 18
+y 19
+end
+arch cobblestones2
+x 19
+end
+arch cobblestones2
+x 19
+y 1
+end
+arch stonefloor2
+x 19
+y 2
+end
+arch wall_2_1_2
+x 19
+y 2
+end
+arch shop_armour
+x 19
+y 3
+end
+arch shop_armour
+x 19
+y 4
+end
+arch shop_armour
+x 19
+y 5
+end
+arch shop_armour
+x 19
+y 6
+end
+arch shop_armour
+x 19
+y 7
+end
+arch light4
+x 19
+y 8
+end
+arch shop_armour
+x 19
+y 8
+end
+arch shop_armour
+x 19
+y 9
+end
+arch shop_armour
+x 19
+y 10
+end
+arch shop_armour
+x 19
+y 11
+end
+arch shop_armour
+x 19
+y 12
+end
+arch shop_armour
+x 19
+y 13
+end
+arch shop_armour
+x 19
+y 14
+end
+arch shop_armour
+x 19
+y 15
+end
+arch shop_armour
+x 19
+y 16
+end
+arch stonefloor2
+x 19
+y 17
+end
+arch wall_2_1_2
+x 19
+y 17
+end
+arch cobblestones2
+x 19
+y 18
+end
+arch cobblestones2
+x 19
+y 19
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch stonefloor2
+x 20
+y 2
 end
 arch wall_2_2_3
-x 18
-end
-arch shop_empty
-x 18
-y 1
-end
-arch wall_2_1_1
-x 18
-y 1
-end
-arch shop_empty
-x 18
+x 20
 y 2
 end
-arch wall_2_1_1
-x 18
-y 2
-end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 3
 end
 arch wall_2_1_1
-x 18
+x 20
 y 3
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 4
 end
 arch wall_2_1_1
-x 18
+x 20
 y 4
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 5
 end
 arch wall_2_1_1
-x 18
+x 20
 y 5
 end
-arch shop_empty
-x 18
+arch light2
+x 20
 y 6
 end
-arch wall_2_1_1
-x 18
+arch stonefloor2
+x 20
 y 6
 end
-arch shop_empty
-x 18
+arch window_win1
+x 20
+y 6
+end
+arch stonefloor2
+x 20
 y 7
 end
 arch wall_2_1_1
-x 18
+x 20
 y 7
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 8
 end
 arch wall_2_1_1
-x 18
+x 20
 y 8
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 9
 end
 arch wall_2_1_1
-x 18
+x 20
 y 9
 end
-arch shop_empty
-x 18
+arch light2
+x 20
 y 10
 end
-arch wall_2_1_1
-x 18
+arch stonefloor2
+x 20
 y 10
 end
-arch shop_empty
-x 18
+arch window_win1
+x 20
+y 10
+end
+arch stonefloor2
+x 20
 y 11
 end
 arch wall_2_1_1
-x 18
+x 20
 y 11
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 12
 end
 arch wall_2_1_1
-x 18
+x 20
 y 12
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 13
 end
 arch wall_2_1_1
-x 18
+x 20
 y 13
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 14
 end
 arch wall_2_1_1
-x 18
+x 20
 y 14
 end
-arch shop_empty
-x 18
+arch stonefloor2
+x 20
 y 15
 end
+arch wall_2_1_1
+x 20
+y 15
+end
+arch stonefloor2
+x 20
+y 16
+end
+arch wall_2_1_1
+x 20
+y 16
+end
+arch stonefloor2
+x 20
+y 17
+end
 arch wall_2_2_4
-x 18
+x 20
+y 17
+end
+arch cobblestones2
+x 20
+y 18
+end
+arch cobblestones2
+x 20
+y 19
+end
+arch cobblestones2
+x 21
+end
+arch cobblestones2
+x 21
+y 1
+end
+arch cobblestones2
+x 21
+y 2
+end
+arch cobblestones2
+x 21
+y 3
+end
+arch cobblestones2
+x 21
+y 4
+end
+arch cobblestones2
+x 21
+y 5
+end
+arch cobblestones2
+x 21
+y 6
+end
+arch cobblestones2
+x 21
+y 7
+end
+arch cobblestones2
+x 21
+y 8
+end
+arch cobblestones2
+x 21
+y 9
+end
+arch cobblestones2
+x 21
+y 10
+end
+arch cobblestones2
+x 21
+y 11
+end
+arch cobblestones2
+x 21
+y 12
+end
+arch cobblestones2
+x 21
+y 13
+end
+arch cobblestones2
+x 21
+y 14
+end
+arch cobblestones2
+x 21
 y 15
 end
+arch cobblestones2
+x 21
+y 16
+end
+arch cobblestones2
+x 21
+y 17
+end
+arch cobblestones2
+x 21
+y 18
+end
+arch cobblestones2
+x 21
+y 19
+end
+arch cobblestones2
+x 22
+end
+arch cobblestones2
+x 22
+y 1
+end
+arch cobblestones2
+x 22
+y 2
+end
+arch cobblestones2
+x 22
+y 3
+end
+arch cobblestones2
+x 22
+y 4
+end
+arch cobblestones2
+x 22
+y 5
+end
+arch cobblestones2
+x 22
+y 6
+end
+arch cobblestones2
+x 22
+y 7
+end
+arch cobblestones2
+x 22
+y 8
+end
+arch cobblestones2
+x 22
+y 9
+end
+arch cobblestones2
+x 22
+y 10
+end
+arch cobblestones2
+x 22
+y 11
+end
+arch cobblestones2
+x 22
+y 12
+end
+arch cobblestones2
+x 22
+y 13
+end
+arch cobblestones2
+x 22
+y 14
+end
+arch cobblestones2
+x 22
+y 15
+end
+arch cobblestones2
+x 22
+y 16
+end
+arch cobblestones2
+x 22
+y 17
+end
+arch cobblestones2
+x 22
+y 18
+end
+arch cobblestones2
+x 22
+y 19
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 6a1af32c2..7a7d95a6c 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2011-04-29 Rick Tanner
+Modified: 2011-05-03 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -5583,8 +5583,8 @@ end
 arch store_armour
 name Olaf's Armor Emporium
 slaying /navar_city/misc/city1armour
-hp 1
-sp 2
+hp 4
+sp 15
 x 16
 y 1
 end