From c497e075b3fed7dbaf5136a0a1fd0991a74d3a4e Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 14 Apr 2012 05:14:30 +0000
Subject: [PATCH] Cosmetic overhaul to Gunther's Smithy
 (navar_city/misc/city1smith) in Navar.  Expanded 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@17920 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/misc/city1smith | 2535 ++++++++++++++++++++++++++----------
 world/world_122_117        |    6 +-
 2 files changed, 1862 insertions(+), 679 deletions(-)

diff --git a/navar_city/misc/city1smith b/navar_city/misc/city1smith
index 1515b498f..709a6c908 100644
--- a/navar_city/misc/city1smith
+++ b/navar_city/misc/city1smith
@@ -8,843 +8,1566 @@ shopmin 500
 shopmax 5000000
 shoprace dwarf
 darkness 1
-width 16
-height 10
-enter_x 8
-enter_y 8
+width 24
+height 17
+enter_x 10
+enter_y 10
 msg
 Created:  1993-10-27
-Modified: 2011-11-09 Rick Tanner
+Modified: 2012-04-14 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 cobblestones2
+y 16
+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 cobblestones2
+x 1
+y 16
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch stonefloor2
+x 2
+y 2
 end
 arch wwall_2_2_2
-end
-arch stonefloor2
-y 1
-end
-arch wwall_2_1_1
-y 1
-end
-arch stonefloor2
-y 2
-end
-arch wwall_2_1_1
+x 2
 y 2
 end
 arch stonefloor2
+x 2
 y 3
 end
 arch wwall_2_1_1
+x 2
 y 3
 end
 arch stonefloor2
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
 arch stonefloor2
+x 2
 y 5
 end
 arch wwall_2_1_1
+x 2
 y 5
 end
 arch stonefloor2
+x 2
 y 6
 end
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch light2
+x 2
+y 7
+end
+arch stonefloor2
+x 2
+y 7
+end
+arch wwall_win1
+x 2
+y 7
+end
+arch stonefloor2
+x 2
+y 8
+end
 arch wwall_3_2
-y 6
-end
-arch stonefloor2
-y 7
-end
-arch wwall_2_1_1
-y 7
-end
-arch stonefloor2
-y 8
-end
-arch wwall_2_1_1
+x 2
 y 8
 end
 arch stonefloor2
+x 2
 y 9
 end
+arch wwall_2_1_1
+x 2
+y 9
+end
+arch stonefloor2
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch stonefloor2
+x 2
+y 11
+end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch stonefloor2
+x 2
+y 12
+end
 arch wwall_2_2_1
-y 9
+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 cobblestones2
+x 2
+y 16
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch stonefloor2
-x 1
+x 3
+y 2
 end
 arch wwall_2_1_2
-x 1
+x 3
+y 2
+end
+arch light4
+x 3
+y 3
 end
 arch shop_armour
-x 1
-y 1
-end
-arch shop_weapon
-x 1
-y 2
-end
-arch shop_weapon
-x 1
+x 3
 y 3
 end
-arch shop_empty
-x 1
+arch shop_weapon
+x 3
 y 4
 end
-arch shop_empty
-x 1
+arch shop_weapon
+x 3
 y 5
 end
-arch magic_banned
-x 1
+arch shop_empty
+x 3
 y 6
 end
+arch shop_empty
+x 3
+y 7
+end
+arch magic_banned
+x 3
+y 8
+end
 arch stonefloor2
-x 1
-y 6
+x 3
+y 8
 end
 arch wwall_2_1_2
-x 1
-y 6
-end
-arch stonefloor2
-x 1
-y 7
-end
-arch stonefloor2
-x 1
-y 7
-end
-arch stonefloor2
-x 1
+x 3
 y 8
 end
 arch stonefloor2
-x 1
-y 8
+x 3
+y 9
+end
+arch stonefloor2
+x 3
+y 9
+end
+arch stonefloor2
+x 3
+y 10
+end
+arch stonefloor2
+x 3
+y 10
+end
+arch stonefloor2
+x 3
+y 11
+end
+arch stonefloor2
+x 3
+y 11
 end
 arch firepot
-x 1
-y 8
+x 3
+y 11
 end
 arch stonefloor2
-x 1
-y 9
+x 3
+y 12
 end
 arch wwall_2_1_2
-x 1
-y 9
+x 3
+y 12
 end
-arch stonefloor2
-x 2
+arch grass_only
+x 3
+y 13
 end
-arch wwall_2_1_2
-x 2
+arch grass_only
+x 3
+y 14
 end
-arch shop_empty
-x 2
+arch grass_only
+x 3
+y 15
+end
+arch cobblestones2
+x 3
+y 16
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch shop_empty
-x 2
+arch stonefloor2
+x 4
+y 2
+end
+arch wwall_2_1_2
+x 4
 y 2
 end
 arch shop_empty
-x 2
+x 4
 y 3
 end
 arch shop_empty
-x 2
+x 4
 y 4
 end
 arch shop_empty
-x 2
+x 4
 y 5
 end
-arch shop_mat
-x 2
-y 5
-end
-arch magic_banned
-x 2
+arch shop_empty
+x 4
 y 6
 end
-arch stonefloor2
-x 2
-y 6
-end
-arch wwall_2_1_2
-x 2
-y 6
-end
-arch stonefloor2
-x 2
+arch shop_empty
+x 4
 y 7
 end
 arch shop_mat
-x 2
+x 4
 y 7
 end
-arch stonefloor2
-x 2
+arch magic_banned
+x 4
 y 8
 end
 arch stonefloor2
-x 2
-y 9
+x 4
+y 8
 end
 arch wwall_2_1_2
-x 2
+x 4
+y 8
+end
+arch stonefloor2
+x 4
+y 9
+end
+arch shop_mat
+x 4
 y 9
 end
 arch stonefloor2
-x 3
+x 4
+y 10
+end
+arch stonefloor2
+x 4
+y 11
+end
+arch stonefloor2
+x 4
+y 12
 end
 arch wwall_2_1_2
-x 3
+x 4
+y 12
 end
-arch shop_empty
-x 3
+arch grass_only
+x 4
+y 13
+end
+arch grass_only
+x 4
+y 14
+end
+arch grass_only
+x 4
+y 15
+end
+arch cobblestones2
+x 4
+y 16
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
-arch shop_empty
-x 3
+arch light2
+x 5
+y 2
+end
+arch stonefloor2
+x 5
+y 2
+end
+arch wwall_win2
+x 5
 y 2
 end
 arch shop_empty
-x 3
+x 5
 y 3
 end
 arch shop_empty
-x 3
+x 5
 y 4
 end
 arch shop_empty
-x 3
+x 5
 y 5
 end
-arch magic_banned
-x 3
+arch light4
+x 5
 y 6
 end
-arch stonefloor2
-x 3
+arch shop_empty
+x 5
 y 6
 end
-arch wwall_2_1_2
-x 3
-y 6
-end
-arch stonefloor2
-x 3
+arch shop_empty
+x 5
 y 7
 end
-arch stonefloor2
-x 3
+arch magic_banned
+x 5
 y 8
 end
 arch stonefloor2
-x 3
-y 9
+x 5
+y 8
 end
 arch wwall_2_1_2
-x 3
+x 5
+y 8
+end
+arch stonefloor2
+x 5
 y 9
 end
 arch stonefloor2
-x 4
+x 5
+y 10
+end
+arch stonefloor2
+x 5
+y 11
+end
+arch stonefloor2
+x 5
+y 12
 end
 arch wwall_2_1_2
-x 4
+x 5
+y 12
+end
+arch grass_only
+x 5
+y 13
+end
+arch grass_only
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 15
+end
+arch cobblestones2
+x 5
+y 16
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch stonefloor2
+x 6
+y 2
+end
+arch wwall_2_1_2
+x 6
+y 2
 end
 arch shop_empty
-x 4
-y 1
+x 6
+y 3
 end
 arch firepot
-x 4
-y 1
+x 6
+y 3
 end
 arch magic_ear
 msg
 @match *
 Hello, I am Gunther, if you have items to make, just put them on the anvils and I will make them for you.
 endmsg
-x 4
-y 2
-end
-arch shop_empty
-x 4
-y 2
-end
-arch shop_empty
-x 4
-y 3
-end
-arch shop_empty
-x 4
+x 6
 y 4
 end
 arch shop_empty
-x 4
+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 magic_banned
-x 4
-y 6
+x 6
+y 8
 end
 arch stonefloor2
-x 4
-y 6
+x 6
+y 8
 end
 arch wwall_win2
-x 4
-y 6
-end
-arch stonefloor2
-x 4
-y 7
-end
-arch stonefloor2
-x 4
+x 6
 y 8
 end
 arch stonefloor2
-x 4
-y 9
-end
-arch wwall_2_1_2
-x 4
+x 6
 y 9
 end
 arch stonefloor2
-x 5
+x 6
+y 10
+end
+arch light4
+x 6
+y 11
+end
+arch stonefloor2
+x 6
+y 11
+end
+arch stonefloor2
+x 6
+y 12
 end
 arch wwall_2_1_2
-x 5
+x 6
+y 12
+end
+arch grass_only
+x 6
+y 13
+end
+arch grass_only
+x 6
+y 14
+end
+arch grass_only
+x 6
+y 15
+end
+arch cobblestones2
+x 6
+y 16
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch stonefloor2
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
 end
 arch shop_empty
-x 5
-y 1
+x 7
+y 3
 end
 arch create_dragon_mail
-x 5
-y 1
+x 7
+y 3
 end
 arch shop_empty
-x 5
-y 2
+x 7
+y 4
 end
 arch create_dragon_shield
-x 5
-y 2
+x 7
+y 4
 end
 arch shop_empty
-x 5
-y 3
+x 7
+y 5
 end
 arch create_eyeshield
-x 5
-y 3
+x 7
+y 5
 end
 arch shop_empty
-x 5
-y 4
+x 7
+y 6
 end
 arch swall_1_1
-x 5
-y 4
+x 7
+y 6
 end
 arch shop_empty
-x 5
-y 5
+x 7
+y 7
 end
 arch swall_2_1_1
-x 5
-y 5
+x 7
+y 7
 end
 arch stonefloor2
-x 5
-y 6
+x 7
+y 8
 end
 arch swall_1_2_half
-x 5
-y 6
+x 7
+y 8
 end
 arch wwall_2_1_2
-x 5
-y 6
-end
-arch stonefloor2
-x 5
-y 7
-end
-arch stonefloor2
-x 5
-y 7
-end
-arch firepot
-x 5
-y 7
-end
-arch stonefloor2
-x 5
+x 7
 y 8
 end
 arch stonefloor2
-x 5
-y 9
-end
-arch wwall_2_1_2
-x 5
+x 7
 y 9
 end
 arch stonefloor2
-x 6
+x 7
+y 9
+end
+arch firepot
+x 7
+y 9
+end
+arch stonefloor2
+x 7
+y 10
+end
+arch stonefloor2
+x 7
+y 11
+end
+arch stonefloor2
+x 7
+y 12
 end
 arch wwall_2_1_2
-x 6
+x 7
+y 12
 end
-arch shop_empty
-x 6
+arch grass_only
+x 7
+y 13
+end
+arch grass_only
+x 7
+y 14
+end
+arch grass_only
+x 7
+y 15
+end
+arch cobblestones2
+x 7
+y 16
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch shop_empty
-x 6
+arch stonefloor2
+x 8
 y 2
 end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch shop_empty
+x 8
+y 3
+end
+arch shop_empty
+x 8
+y 4
+end
 arch dwarf
 name Gunther
-x 6
-y 2
+x 8
+y 4
 end
 arch shop_empty
-x 6
-y 3
-end
-arch permanent_lava
-x 6
-y 4
-end
-arch dungeon_magic
-x 6
-y 4
-end
-arch permanent_lava
-x 6
+x 8
 y 5
 end
+arch permanent_lava
+x 8
+y 6
+end
 arch dungeon_magic
-x 6
-y 5
+x 8
+y 6
+end
+arch permanent_lava
+x 8
+y 7
+end
+arch dungeon_magic
+x 8
+y 7
 end
 arch stonefloor2
-x 6
-y 6
+x 8
+y 8
 end
 arch wwall_2_1_2
-x 6
+x 8
+y 8
+end
+arch stonefloor2
+x 8
+y 9
+end
+arch stonefloor2
+x 8
+y 10
+end
+arch stonefloor2
+x 8
+y 11
+end
+arch stonefloor2
+x 8
+y 12
+end
+arch wwall_2_1_2
+x 8
+y 12
+end
+arch grass_only
+x 8
+y 13
+end
+arch grass_only
+x 8
+y 14
+end
+arch grass_only
+x 8
+y 15
+end
+arch cobblestones2
+x 8
+y 16
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch stonefloor2
+x 9
+y 2
+end
+arch wwall_3_3
+x 9
+y 2
+end
+arch stonefloor2
+x 9
+y 3
+end
+arch wwall_win1
+x 9
+y 3
+end
+arch stonefloor2
+x 9
+y 4
+end
+arch wwall_win1
+x 9
+y 4
+end
+arch stonefloor2
+x 9
+y 5
+end
+arch wwall_win1
+x 9
+y 5
+end
+arch stonefloor2
+x 9
+y 6
+end
+arch wwall_2_1_1
+x 9
 y 6
 end
 arch stonefloor2
-x 6
+x 9
 y 7
 end
+arch wwall_2_1_1
+x 9
+y 7
+end
+arch stonefloor2
+x 9
+y 8
+end
+arch wwall_2_2_4
+x 9
+y 8
+end
+arch stonefloor2
+x 9
+y 9
+end
+arch stonefloor2
+x 9
+y 10
+end
 arch sign_w
 name shop
-x 6
-y 7
+x 9
+y 10
+end
+arch button_small
+x 9
+y 11
+connected 12
 end
 arch stonefloor2
-x 6
-y 8
+x 9
+y 11
 end
 arch stonefloor2
-x 6
-y 9
-end
-arch wwall_2_1_2
-x 6
-y 9
-end
-arch stonefloor2
-x 7
-end
-arch wwall_3_3
-x 7
-end
-arch stonefloor2
-x 7
-y 1
-end
-arch wwall_win1
-x 7
-y 1
-end
-arch stonefloor2
-x 7
-y 2
-end
-arch wwall_win1
-x 7
-y 2
-end
-arch stonefloor2
-x 7
-y 3
-end
-arch wwall_win1
-x 7
-y 3
-end
-arch stonefloor2
-x 7
-y 4
-end
-arch wwall_2_1_1
-x 7
-y 4
-end
-arch stonefloor2
-x 7
-y 5
-end
-arch wwall_2_1_1
-x 7
-y 5
-end
-arch stonefloor2
-x 7
-y 6
-end
-arch wwall_2_2_4
-x 7
-y 6
-end
-arch stonefloor2
-x 7
-y 7
-end
-arch sign_e
-name forging facilities
-x 7
-y 7
-end
-arch stonefloor2
-x 7
-y 8
-end
-arch stonefloor2
-x 7
-y 9
+x 9
+y 12
 end
 arch wwall_1_3
-x 7
-y 9
+x 9
+y 12
+end
+arch dungeon_magic
+x 9
+y 13
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 11
+sp 7
+x 9
+y 13
+end
+arch cobblestones2
+x 9
+y 13
+end
+arch grass_only
+x 9
+y 14
+end
+arch grass_only
+x 9
+y 15
+end
+arch cobblestones2
+x 9
+y 16
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
 end
 arch stonefloor2
-x 8
+x 10
+y 2
 end
 arch wwall_2_1_2
-x 8
-end
-arch stonefloor2
-x 8
-y 1
-end
-arch firepot
-x 8
-y 1
-end
-arch stonefloor2
-x 8
+x 10
 y 2
 end
 arch stonefloor2
-x 8
+x 10
+y 3
+end
+arch firepot
+x 10
 y 3
 end
 arch stonefloor2
-x 8
+x 10
 y 4
 end
+arch stonefloor2
+x 10
+y 5
+end
+arch stonefloor2
+x 10
+y 6
+end
 arch platinum_converter
 name Buy Small Shield (7pp)
 other_arch small_shield
 sp 1
 food 7
-x 8
-y 4
-end
-arch stonefloor2
-x 8
-y 5
-end
-arch stonefloor2
-x 8
+x 10
 y 6
 end
+arch stonefloor2
+x 10
+y 7
+end
+arch stonefloor2
+x 10
+y 8
+end
 arch platinum_converter
 name Buy Gauntlets (8pp)
 other_arch gauntlets
 sp 1
 food 8
-x 8
-y 6
-end
-arch stonefloor2
-x 8
-y 7
-end
-arch stonefloor2
-x 8
+x 10
 y 8
 end
 arch stonefloor2
-x 8
+x 10
 y 9
 end
-arch oakdoor_2
+arch light4
+x 10
+y 10
+end
+arch stonefloor2
+x 10
+y 10
+end
+arch button_small
+x 10
+y 11
+connected 12
+end
+arch stonefloor2
+x 10
+y 11
+end
+arch button_small
+x 10
+y 12
+connected 12
+end
+arch stonefloor2
+x 10
+y 12
+end
+arch odoorn2_closed_1
+x 10
+y 12
+connected 12
+end
+arch dungeon_magic
+x 10
+y 13
+end
+arch invis_exit
 slaying /world/world_122_117
 hp 11
 sp 7
-x 8
-y 9
+x 10
+y 13
+end
+arch cobblestones2
+x 10
+y 13
+end
+arch cobblestones2
+x 10
+y 14
+end
+arch cobblestones2
+x 10
+y 15
+end
+arch cobblestones2
+x 10
+y 16
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
 end
 arch stonefloor2
-x 9
+x 11
+y 2
 end
 arch wwall_2_1_2
-x 9
-end
-arch stonefloor2
-x 9
-y 1
-end
-arch awall_0
-x 9
-y 1
-end
-arch swall_2_2_2
-x 9
-y 1
-end
-arch dungeon_magic
-x 9
-y 1
-end
-arch stonefloor2
-x 9
-y 2
-end
-arch swall_2_1_1
-x 9
-y 2
-end
-arch dungeon_magic
-x 9
+x 11
 y 2
 end
 arch stonefloor2
-x 9
-y 3
-end
-arch swall_2_1_1
-x 9
-y 3
-end
-arch dungeon_magic
-x 9
+x 11
 y 3
 end
 arch stonefloor2
-x 9
-y 4
-end
-arch swall_2_1_1
-x 9
-y 4
-end
-arch dungeon_magic
-x 9
+x 11
 y 4
 end
 arch stonefloor2
-x 9
-y 5
-end
-arch swall_2_2_1
-x 9
-y 5
-end
-arch awall_0
-x 9
-y 5
-end
-arch dungeon_magic
-x 9
+x 11
 y 5
 end
 arch stonefloor2
-x 9
+x 11
 y 6
 end
-arch stonefloor2
-x 9
+arch light4
+x 11
 y 7
 end
 arch stonefloor2
-x 9
+x 11
+y 7
+end
+arch stonefloor2
+x 11
 y 8
 end
 arch stonefloor2
-x 9
+x 11
 y 9
 end
+arch stonefloor2
+x 11
+y 10
+end
+arch sign_e
+name forging facilities
+x 11
+y 10
+end
+arch button_small
+x 11
+y 11
+connected 12
+end
+arch stonefloor2
+x 11
+y 11
+end
+arch stonefloor2
+x 11
+y 12
+end
 arch wwall_1_4
-x 9
-y 9
-end
-arch stonefloor2
-x 10
-end
-arch wwall_2_1_2
-x 10
-end
-arch stonefloor2
-x 10
-y 1
-end
-arch swall_2_1_2
-x 10
-y 1
+x 11
+y 12
 end
 arch dungeon_magic
-x 10
+x 11
+y 13
+end
+arch invis_exit
+slaying /world/world_122_117
+hp 11
+sp 7
+x 11
+y 13
+end
+arch cobblestones2
+x 11
+y 13
+end
+arch grass_only
+x 11
+y 14
+end
+arch grass_only
+x 11
+y 15
+end
+arch cobblestones2
+x 11
+y 16
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
 y 1
 end
-arch afloor_left
-x 10
+arch light2
+x 12
 y 2
 end
-arch afloor_left
-x 10
+arch stonefloor2
+x 12
+y 2
+end
+arch wwall_win2
+x 12
+y 2
+end
+arch stonefloor2
+x 12
 y 3
 end
-arch afloor_left
-x 10
-y 4
-end
-arch firepot
-x 10
+arch stonefloor2
+x 12
 y 4
 end
 arch stonefloor2
-x 10
-y 5
-end
-arch swall_2_1_2
-x 10
-y 5
-end
-arch dungeon_magic
-x 10
+x 12
 y 5
 end
 arch stonefloor2
-x 10
-y 6
-end
-arch firepot
-x 10
+x 12
 y 6
 end
 arch stonefloor2
-x 10
+x 12
 y 7
 end
 arch stonefloor2
-x 10
+x 12
 y 8
 end
 arch stonefloor2
-x 10
-y 9
-end
-arch wwall_2_1_2
-x 10
+x 12
 y 9
 end
 arch stonefloor2
-x 11
-end
-arch wwall_2_1_2
-x 11
+x 12
+y 10
 end
 arch stonefloor2
-x 11
+x 12
+y 11
+end
+arch stonefloor2
+x 12
+y 12
+end
+arch wwall_2_2_3
+x 12
+y 12
+end
+arch stonefloor2
+x 12
+y 13
+end
+arch wwall_2_1_1
+x 12
+y 13
+end
+arch stonefloor2
+x 12
+y 14
+end
+arch wwall_2_2_1
+x 12
+y 14
+end
+arch grass_only
+x 12
+y 15
+end
+arch cobblestones2
+x 12
+y 16
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
-arch swall_2_1_2
-x 11
-y 1
+arch stonefloor2
+x 13
+y 2
+end
+arch wwall_2_1_2
+x 13
+y 2
+end
+arch stonefloor2
+x 13
+y 3
+end
+arch awall_0
+x 13
+y 3
+end
+arch swall_2_2_2
+x 13
+y 3
 end
 arch dungeon_magic
-x 11
+x 13
+y 3
+end
+arch stonefloor2
+x 13
+y 4
+end
+arch swall_2_1_1
+x 13
+y 4
+end
+arch dungeon_magic
+x 13
+y 4
+end
+arch stonefloor2
+x 13
+y 5
+end
+arch swall_2_1_1
+x 13
+y 5
+end
+arch dungeon_magic
+x 13
+y 5
+end
+arch stonefloor2
+x 13
+y 6
+end
+arch swall_2_1_1
+x 13
+y 6
+end
+arch dungeon_magic
+x 13
+y 6
+end
+arch stonefloor2
+x 13
+y 7
+end
+arch swall_2_2_1
+x 13
+y 7
+end
+arch awall_0
+x 13
+y 7
+end
+arch dungeon_magic
+x 13
+y 7
+end
+arch stonefloor2
+x 13
+y 8
+end
+arch stonefloor2
+x 13
+y 9
+end
+arch stonefloor2
+x 13
+y 10
+end
+arch stonefloor2
+x 13
+y 11
+end
+arch light4
+x 13
+y 12
+end
+arch stonefloor2
+x 13
+y 12
+end
+arch stonefloor2
+x 13
+y 13
+end
+arch stonefloor2
+x 13
+y 14
+end
+arch wwall_2_1_2
+x 13
+y 14
+end
+arch grass_only
+x 13
+y 15
+end
+arch cobblestones2
+x 13
+y 16
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch afloor_left
-x 11
+arch stonefloor2
+x 14
 y 2
 end
-arch forge
-x 11
+arch wwall_2_1_2
+x 14
 y 2
 end
+arch stonefloor2
+x 14
+y 3
+end
+arch swall_2_1_2
+x 14
+y 3
+end
+arch dungeon_magic
+x 14
+y 3
+end
+arch light4
+x 14
+y 4
+end
 arch afloor_left
-x 11
+x 14
+y 4
+end
+arch afloor_left
+x 14
+y 5
+end
+arch afloor_left
+x 14
+y 6
+end
+arch firepot
+x 14
+y 6
+end
+arch stonefloor2
+x 14
+y 7
+end
+arch swall_2_1_2
+x 14
+y 7
+end
+arch dungeon_magic
+x 14
+y 7
+end
+arch stonefloor2
+x 14
+y 8
+end
+arch firepot
+x 14
+y 8
+end
+arch stonefloor2
+x 14
+y 9
+end
+arch stonefloor2
+x 14
+y 10
+end
+arch stonefloor2
+x 14
+y 11
+end
+arch stonefloor2
+x 14
+y 12
+end
+arch stonefloor2
+x 14
+y 13
+end
+arch stonefloor2
+x 14
+y 14
+end
+arch wwall_2_1_2
+x 14
+y 14
+end
+arch grass_only
+x 14
+y 15
+end
+arch cobblestones2
+x 14
+y 16
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch stonefloor2
+x 15
+y 2
+end
+arch wwall_2_1_2
+x 15
+y 2
+end
+arch stonefloor2
+x 15
+y 3
+end
+arch swall_2_1_2
+x 15
+y 3
+end
+arch dungeon_magic
+x 15
 y 3
 end
 arch afloor_left
-x 11
+x 15
 y 4
 end
-arch pedestal
-x 11
+arch forge
+x 15
 y 4
+end
+arch afloor_left
+x 15
+y 5
+end
+arch afloor_left
+x 15
+y 6
+end
+arch pedestal
+x 15
+y 6
 invisible 1
 connected 11
 end
 arch stonefloor2
-x 11
-y 5
+x 15
+y 7
 end
 arch ggate_closed
-x 11
-y 5
+x 15
+y 7
 connected 11
 no_magic 1
 damned 1
 end
 arch stonefloor2
-x 11
-y 6
+x 15
+y 8
 end
 arch check_floor
 slaying gunthers
-x 11
-y 6
+x 15
+y 8
 connected 11
 end
 arch stonefloor2
-x 11
-y 7
+x 15
+y 9
 end
 arch trigger_marker
 slaying gunthers
@@ -852,8 +1575,8 @@ msg
 You have one day's use of these facilities.
 endmsg
 food 504
-x 11
-y 7
+x 15
+y 9
 speed 1.0
 connected 10
 end
@@ -861,331 +1584,791 @@ arch altar_trigger
 name Drop 160 platinum to enter
 slaying money
 food 8000
-x 11
-y 7
+x 15
+y 9
 connected 10
 end
 arch stonefloor2
-x 11
-y 8
+x 15
+y 10
 end
 arch stonefloor2
-x 11
-y 9
-end
-arch wwall_2_1_2
-x 11
-y 9
+x 15
+y 11
 end
 arch stonefloor2
-x 12
-end
-arch wwall_2_1_2
-x 12
+x 15
+y 12
 end
 arch stonefloor2
-x 12
+x 15
+y 13
+end
+arch light2
+x 15
+y 14
+end
+arch stonefloor2
+x 15
+y 14
+end
+arch wwall_win2
+x 15
+y 14
+end
+arch grass_only
+x 15
+y 15
+end
+arch cobblestones2
+x 15
+y 16
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
 y 1
 end
-arch swall_2_1_2
-x 12
-y 1
-end
-arch dungeon_magic
-x 12
-y 1
-end
-arch afloor_left
-x 12
+arch stonefloor2
+x 16
 y 2
 end
-arch afloor_left
-x 12
+arch wwall_2_1_2
+x 16
+y 2
+end
+arch stonefloor2
+x 16
+y 3
+end
+arch swall_2_1_2
+x 16
+y 3
+end
+arch dungeon_magic
+x 16
 y 3
 end
 arch afloor_left
-x 12
+x 16
 y 4
 end
+arch afloor_left
+x 16
+y 5
+end
+arch afloor_left
+x 16
+y 6
+end
 arch firepot
-x 12
-y 4
+x 16
+y 6
 end
 arch stonefloor2
-x 12
-y 5
+x 16
+y 7
 end
 arch swall_2_1_2
-x 12
-y 5
+x 16
+y 7
 end
 arch dungeon_magic
-x 12
-y 5
-end
-arch stonefloor2
-x 12
-y 6
-end
-arch firepot
-x 12
-y 6
-end
-arch stonefloor2
-x 12
+x 16
 y 7
 end
 arch stonefloor2
-x 12
+x 16
+y 8
+end
+arch firepot
+x 16
 y 8
 end
 arch stonefloor2
-x 12
-y 9
-end
-arch wwall_2_1_2
-x 12
+x 16
 y 9
 end
 arch stonefloor2
-x 13
+x 16
+y 10
 end
-arch wwall_2_1_2
-x 13
+arch light4
+x 16
+y 11
 end
 arch stonefloor2
-x 13
+x 16
+y 11
+end
+arch stonefloor2
+x 16
+y 12
+end
+arch stonefloor2
+x 16
+y 13
+end
+arch light2
+x 16
+y 14
+end
+arch stonefloor2
+x 16
+y 14
+end
+arch wwall_win2
+x 16
+y 14
+end
+arch grass_only
+x 16
+y 15
+end
+arch cobblestones2
+x 16
+y 16
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
 y 1
 end
+arch stonefloor2
+x 17
+y 2
+end
+arch wwall_2_1_2
+x 17
+y 2
+end
+arch stonefloor2
+x 17
+y 3
+end
 arch awall_0
-x 13
-y 1
+x 17
+y 3
 end
 arch swall_2_2_3
-x 13
-y 1
-end
-arch dungeon_magic
-x 13
-y 1
-end
-arch stonefloor2
-x 13
-y 2
-end
-arch swall_2_1_1
-x 13
-y 2
-end
-arch dungeon_magic
-x 13
-y 2
-end
-arch stonefloor2
-x 13
-y 3
-end
-arch swall_2_1_1
-x 13
+x 17
 y 3
 end
 arch dungeon_magic
-x 13
+x 17
 y 3
 end
 arch stonefloor2
-x 13
+x 17
 y 4
 end
 arch swall_2_1_1
-x 13
+x 17
 y 4
 end
 arch dungeon_magic
-x 13
+x 17
 y 4
 end
 arch stonefloor2
-x 13
+x 17
 y 5
 end
-arch swall_2_2_4
-x 13
-y 5
-end
-arch awall_0
-x 13
+arch swall_2_1_1
+x 17
 y 5
 end
 arch dungeon_magic
-x 13
+x 17
 y 5
 end
 arch stonefloor2
-x 13
+x 17
+y 6
+end
+arch swall_2_1_1
+x 17
+y 6
+end
+arch dungeon_magic
+x 17
 y 6
 end
 arch stonefloor2
-x 13
+x 17
+y 7
+end
+arch swall_2_2_4
+x 17
+y 7
+end
+arch awall_0
+x 17
+y 7
+end
+arch dungeon_magic
+x 17
 y 7
 end
 arch stonefloor2
-x 13
+x 17
 y 8
 end
 arch stonefloor2
-x 13
-y 9
-end
-arch wwall_2_1_2
-x 13
+x 17
 y 9
 end
 arch stonefloor2
-x 14
+x 17
+y 10
+end
+arch stonefloor2
+x 17
+y 11
+end
+arch stonefloor2
+x 17
+y 12
+end
+arch stonefloor2
+x 17
+y 13
+end
+arch stonefloor2
+x 17
+y 14
 end
 arch wwall_2_1_2
-x 14
+x 17
+y 14
 end
-arch stonefloor2
-x 14
+arch grass_only
+x 17
+y 15
+end
+arch cobblestones2
+x 17
+y 16
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
 y 1
 end
-arch firepot
-x 14
-y 1
-end
-arch stonefloor2
-x 14
+arch light2
+x 18
 y 2
 end
 arch stonefloor2
-x 14
+x 18
+y 2
+end
+arch wwall_win2
+x 18
+y 2
+end
+arch stonefloor2
+x 18
 y 3
 end
 arch stonefloor2
-x 14
+x 18
 y 4
 end
+arch stonefloor2
+x 18
+y 5
+end
+arch stonefloor2
+x 18
+y 6
+end
+arch light4
+x 18
+y 7
+end
+arch stonefloor2
+x 18
+y 7
+end
+arch stonefloor2
+x 18
+y 8
+end
+arch stonefloor2
+x 18
+y 9
+end
+arch stonefloor2
+x 18
+y 10
+end
+arch stonefloor2
+x 18
+y 11
+end
+arch light4
+x 18
+y 12
+end
+arch stonefloor2
+x 18
+y 12
+end
+arch stonefloor2
+x 18
+y 13
+end
+arch stonefloor2
+x 18
+y 14
+end
+arch wwall_2_1_2
+x 18
+y 14
+end
+arch grass_only
+x 18
+y 15
+end
+arch cobblestones2
+x 18
+y 16
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch stonefloor2
+x 19
+y 2
+end
+arch wwall_2_1_2
+x 19
+y 2
+end
+arch stonefloor2
+x 19
+y 3
+end
+arch stonefloor2
+x 19
+y 4
+end
+arch stonefloor2
+x 19
+y 5
+end
+arch stonefloor2
+x 19
+y 6
+end
+arch stonefloor2
+x 19
+y 7
+end
+arch stonefloor2
+x 19
+y 8
+end
+arch stonefloor2
+x 19
+y 9
+end
+arch stonefloor2
+x 19
+y 10
+end
+arch stonefloor2
+x 19
+y 11
+end
+arch stonefloor2
+x 19
+y 12
+end
+arch wwall_2_2_2
+x 19
+y 12
+end
+arch stonefloor2
+x 19
+y 13
+end
+arch wwall_2_1_1
+x 19
+y 13
+end
+arch stonefloor2
+x 19
+y 14
+end
+arch wwall_2_2_4
+x 19
+y 14
+end
+arch grass_only
+x 19
+y 15
+end
+arch cobblestones2
+x 19
+y 16
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch stonefloor2
+x 20
+y 2
+end
+arch wwall_2_1_2
+x 20
+y 2
+end
+arch stonefloor2
+x 20
+y 3
+end
+arch firepot
+x 20
+y 3
+end
+arch stonefloor2
+x 20
+y 4
+end
+arch stonefloor2
+x 20
+y 5
+end
+arch stonefloor2
+x 20
+y 6
+end
 arch platinum_converter
 name Buy Helmets (10pp)
 other_arch helmet
 sp 1
 food 10
-x 14
-y 4
-end
-arch stonefloor2
-x 14
-y 5
-end
-arch stonefloor2
-x 14
+x 20
 y 6
 end
+arch stonefloor2
+x 20
+y 7
+end
+arch stonefloor2
+x 20
+y 8
+end
 arch platinum_converter
 name Buy shoes (5pp)
 other_arch low_boots
 sp 1
 food 5
-x 14
-y 6
-end
-arch stonefloor2
-x 14
-y 7
-end
-arch stonefloor2
-x 14
+x 20
 y 8
 end
+arch stonefloor2
+x 20
+y 9
+end
+arch stonefloor2
+x 20
+y 10
+end
+arch stonefloor2
+x 20
+y 11
+end
 arch firepot
-x 14
-y 8
+x 20
+y 11
 end
 arch stonefloor2
-x 14
-y 9
+x 20
+y 12
 end
 arch wwall_2_1_2
-x 14
-y 9
+x 20
+y 12
+end
+arch grass_only
+x 20
+y 13
+end
+arch grass_only
+x 20
+y 14
+end
+arch grass_only
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 16
+end
+arch grass_only
+x 21
+end
+arch grass_only
+x 21
+y 1
 end
 arch stonefloor2
-x 15
+x 21
+y 2
 end
 arch wwall_2_2_3
-x 15
-end
-arch stonefloor2
-x 15
-y 1
-end
-arch wwall_2_1_1
-x 15
-y 1
-end
-arch stonefloor2
-x 15
-y 2
-end
-arch wwall_2_1_1
-x 15
+x 21
 y 2
 end
 arch stonefloor2
-x 15
+x 21
 y 3
 end
 arch wwall_2_1_1
-x 15
+x 21
 y 3
 end
 arch stonefloor2
-x 15
+x 21
 y 4
 end
 arch wwall_2_1_1
-x 15
+x 21
 y 4
 end
 arch stonefloor2
-x 15
+x 21
 y 5
 end
 arch wwall_2_1_1
-x 15
+x 21
 y 5
 end
 arch stonefloor2
-x 15
+x 21
 y 6
 end
 arch wwall_2_1_1
-x 15
+x 21
 y 6
 end
-arch stonefloor2
-x 15
-y 7
-end
-arch wwall_2_1_1
-x 15
+arch light2
+x 21
 y 7
 end
 arch stonefloor2
-x 15
+x 21
+y 7
+end
+arch wwall_win1
+x 21
+y 7
+end
+arch stonefloor2
+x 21
 y 8
 end
 arch wwall_2_1_1
-x 15
+x 21
 y 8
 end
 arch stonefloor2
-x 15
+x 21
 y 9
 end
+arch wwall_2_1_1
+x 21
+y 9
+end
+arch stonefloor2
+x 21
+y 10
+end
+arch wwall_2_1_1
+x 21
+y 10
+end
+arch stonefloor2
+x 21
+y 11
+end
+arch wwall_2_1_1
+x 21
+y 11
+end
+arch stonefloor2
+x 21
+y 12
+end
 arch wwall_2_2_4
-x 15
+x 21
+y 12
+end
+arch grass_only
+x 21
+y 13
+end
+arch grass_only
+x 21
+y 14
+end
+arch grass_only
+x 21
+y 15
+end
+arch cobblestones2
+x 21
+y 16
+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 cobblestones2
+x 22
+y 16
+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 cobblestones2
+x 23
+y 16
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 1ba2bae97..cc1c3b0d4 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: 2012-04-12 Rick Tanner
+Modified: 2012-04-14 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -4062,8 +4062,8 @@ end
 arch house_larg_west
 name Gunther's Smithy
 slaying /navar_city/misc/city1smith
-hp 8
-sp 8
+hp 10
+sp 10
 x 11
 y 7
 end