From ccf4e421c9e0eed5d199d91cf60f6931491862a0 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 18 Sep 2011 02:19:32 +0000
Subject: [PATCH] Changes to the Metal Smith's Workshop in Scorn. Enlarged the
 shop so the hallways allow for multiple players to pass by each other. 
 Expanded outside the shop to add grass tiles and cobblestone to visually
 match the shop's placement in the world map. Updated world map for new map
 entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15108 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/houses/smithery | 1635 ++++++++++++++++++++++++++++-------------
 world/world_105_115   |    4 +-
 2 files changed, 1143 insertions(+), 496 deletions(-)

diff --git a/scorn/houses/smithery b/scorn/houses/smithery
index c84b0db05..8d26f423c 100644
--- a/scorn/houses/smithery
+++ b/scorn/houses/smithery
@@ -3,8 +3,8 @@ name Metal Smith's Workshop
 reset_timeout 7200
 difficulty 2
 region scorn
-width 9
-height 13
+width 15
+height 18
 enter_x 4
 enter_y 11
 msg
@@ -12,170 +12,463 @@ Created:  2002-12-28
 Modified: 2011-09-17 Rick Tanner
 endmsg
 end
+arch cobblestones2
+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 cobblestones2
+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 cobblestones2
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
 arch woodfloor
+x 2
+y 2
 end
 arch stwall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch stwall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch wall_2_1_1
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
-arch wall_2_1_1
-y 3
-end
-arch woodfloor
-y 4
-end
-arch wall_2_1_1
-y 4
-end
-arch woodfloor
-y 5
-end
-arch wall_2_1_1
-y 5
-end
-arch woodfloor
-y 6
-end
-arch wall_2_1_1
-y 6
-end
-arch woodfloor
-y 7
-end
-arch wall_2_1_1
-y 7
-end
-arch woodfloor
-y 8
-end
-arch wall_2_1_1
-y 8
-end
-arch woodfloor
-y 9
-end
-arch wall_2_1_1
-y 9
-end
-arch woodfloor
-y 10
-end
-arch wall_2_1_1
-y 10
-end
-arch woodfloor
-y 11
-end
 arch stwall_2_1_1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch wall_2_1_1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch wall_2_1_1
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch wall_2_1_1
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch wall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch wall_2_1_1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch wall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch wall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch wall_2_1_1
+x 2
 y 11
 end
 arch woodfloor
+x 2
 y 12
 end
+arch wall_2_1_1
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
+arch wall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch stwall_2_1_1
+x 2
+y 14
+end
+arch woodfloor
+x 2
+y 15
+end
 arch stwall_2_2_1
-y 12
+x 2
+y 15
+end
+arch grass_only
+x 2
+y 16
+end
+arch grass_only
+x 2
+y 17
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch woodfloor
-x 1
+x 3
+y 2
 end
 arch stwall_2_1_2
-x 1
-end
-arch woodfloor
-x 1
-y 1
-end
-arch firepot
-x 1
-y 1
-end
-arch woodfloor
-x 1
+x 3
 y 2
 end
 arch woodfloor
-x 1
+x 3
+y 3
+end
+arch firepot
+x 3
 y 3
 end
 arch woodfloor
-x 1
+x 3
 y 4
 end
 arch woodfloor
-x 1
+x 3
 y 5
 end
 arch woodfloor
-x 1
+x 3
 y 6
 end
 arch woodfloor
-x 1
+x 3
 y 7
 end
 arch woodfloor
-x 1
+x 3
 y 8
 end
 arch woodfloor
-x 1
+x 3
 y 9
 end
 arch woodfloor
-x 1
+x 3
 y 10
 end
+arch woodfloor
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
+arch woodfloor
+x 3
+y 13
+end
 arch platinum_converter
 name Buy Small Shield (7pp)
 name_pl Buy Small Shield (7pp)
 other_arch small_shield
 sp 1
 food 7
-x 1
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
+end
+arch firepot
+x 3
+y 14
+end
+arch woodfloor
+x 3
+y 15
+end
+arch stwall_2_1_2
+x 3
+y 15
+end
+arch grass_only
+x 3
+y 16
+end
+arch grass_only
+x 3
+y 17
+end
+arch cobblestones2
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch woodfloor
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 3
+end
+arch woodfloor
+x 4
+y 4
+end
+arch woodfloor
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch woodfloor
+x 4
 y 10
 end
 arch woodfloor
-x 1
-y 11
-end
-arch firepot
-x 1
+x 4
 y 11
 end
 arch woodfloor
-x 1
-y 12
-end
-arch stwall_2_1_2
-x 1
+x 4
 y 12
 end
 arch woodfloor
-x 2
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 14
+end
+arch platinum_converter
+name Buy Gauntlets (8pp)
+name_pl Buy Gauntlets (8pp)
+other_arch gauntlets
+sp 1
+food 8
+x 4
+y 14
+end
+arch woodfloor
+x 4
+y 15
 end
 arch wall_2_1_2
-x 2
+x 4
+y 15
+end
+arch grass_only
+x 4
+y 16
+end
+arch grass_only
+x 4
+y 17
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
 end
 arch woodfloor
-x 2
-y 1
+x 5
+y 2
+end
+arch wall_2_1_2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
 end
 arch table_3
-x 2
-y 1
+x 5
+y 3
 no_pick 1
 end
 arch quarto
@@ -186,244 +479,277 @@ need gauntlets, the heart of a giant, and a
 bottle of philosophical oil.
 endmsg
 face book_red.111
-x 2
-y 1
+x 5
+y 3
 no_pick 1
 end
 arch woodfloor
-x 2
-y 2
+x 5
+y 4
 end
 arch dungeon_magic
-x 2
-y 3
+x 5
+y 5
 end
 arch stonefloor2
-x 2
-y 3
+x 5
+y 5
 end
 arch swall_2_2_2
-x 2
-y 3
+x 5
+y 5
 end
 arch awall_0
-x 2
-y 3
-end
-arch dungeon_magic
-x 2
-y 4
-end
-arch stonefloor2
-x 2
-y 4
-end
-arch swall_2_1_1
-x 2
-y 4
-end
-arch dungeon_magic
-x 2
-y 5
-end
-arch stonefloor2
-x 2
-y 5
-end
-arch swall_2_1_1
-x 2
+x 5
 y 5
 end
 arch dungeon_magic
-x 2
+x 5
 y 6
 end
 arch stonefloor2
-x 2
+x 5
 y 6
 end
 arch swall_2_1_1
-x 2
+x 5
 y 6
 end
 arch dungeon_magic
-x 2
+x 5
 y 7
 end
 arch stonefloor2
-x 2
+x 5
 y 7
 end
 arch swall_2_1_1
-x 2
+x 5
 y 7
 end
 arch dungeon_magic
-x 2
+x 5
 y 8
 end
 arch stonefloor2
-x 2
+x 5
 y 8
 end
-arch swall_2_2_1
-x 2
+arch swall_2_1_1
+x 5
 y 8
 end
-arch awall_0
-x 2
-y 8
-end
-arch woodfloor
-x 2
+arch dungeon_magic
+x 5
 y 9
 end
-arch woodfloor
-x 2
+arch stonefloor2
+x 5
+y 9
+end
+arch swall_2_1_1
+x 5
+y 9
+end
+arch dungeon_magic
+x 5
+y 10
+end
+arch stonefloor2
+x 5
+y 10
+end
+arch swall_2_2_1
+x 5
+y 10
+end
+arch awall_0
+x 5
 y 10
 end
 arch woodfloor
-x 2
-y 11
-end
-arch platinum_converter
-name Buy Gauntlets (8pp)
-name_pl Buy Gauntlets (8pp)
-other_arch gauntlets
-sp 1
-food 8
-x 2
+x 5
 y 11
 end
 arch woodfloor
-x 2
-y 12
-end
-arch wall_2_1_2
-x 2
+x 5
 y 12
 end
 arch woodfloor
-x 3
-end
-arch wall_2_1_2
-x 3
+x 5
+y 13
 end
 arch woodfloor
-x 3
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 15
+end
+arch wall_2_1_2
+x 5
+y 15
+end
+arch grass_only
+x 5
+y 16
+end
+arch grass_only
+x 5
+y 17
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
 y 1
 end
+arch woodfloor
+x 6
+y 2
+end
+arch wall_2_1_2
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
 arch chair_3.1
-x 3
-y 1
+x 6
+y 3
 no_pick 1
 end
 arch woodfloor
-x 3
-y 2
+x 6
+y 4
 end
 arch dungeon_magic
-x 3
-y 3
+x 6
+y 5
 end
 arch stonefloor2
-x 3
-y 3
+x 6
+y 5
 end
 arch swall_2_1_2
-x 3
-y 3
-end
-arch lava
-x 3
-y 4
-type 0
-end
-arch lava
-x 3
+x 6
 y 5
-type 0
 end
 arch lava
-x 3
+x 6
 y 6
 type 0
 end
 arch lava
-x 3
+x 6
 y 7
 type 0
 end
-arch dungeon_magic
-x 3
+arch lava
+x 6
 y 8
+type 0
+end
+arch lava
+x 6
+y 9
+type 0
+end
+arch dungeon_magic
+x 6
+y 10
 end
 arch stonefloor2
-x 3
-y 8
+x 6
+y 10
 end
 arch swall_2_1_2
-x 3
-y 8
-end
-arch woodfloor
-x 3
-y 9
-end
-arch firepot
-x 3
-y 9
-end
-arch woodfloor
-x 3
+x 6
 y 10
 end
 arch woodfloor
-x 3
+x 6
+y 11
+end
+arch firepot
+x 6
 y 11
 end
 arch woodfloor
-x 3
+x 6
 y 12
 end
+arch woodfloor
+x 6
+y 13
+end
+arch woodfloor
+x 6
+y 14
+end
+arch woodfloor
+x 6
+y 15
+end
 arch wall_1_3
-x 3
-y 12
+x 6
+y 15
+end
+arch grass_only
+x 6
+y 16
+end
+arch grass_only
+x 6
+y 17
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
 end
 arch woodfloor
-x 4
+x 7
+y 2
 end
 arch wall_2_1_2
-x 4
+x 7
+y 2
 end
 arch woodfloor
-x 4
-y 1
+x 7
+y 3
 end
 arch altar_mostrai
-x 4
-y 1
+x 7
+y 3
 level 120
 end
 arch woodfloor
-x 4
-y 2
+x 7
+y 4
 end
 arch dungeon_magic
-x 4
-y 3
+x 7
+y 5
 end
 arch stonefloor2
-x 4
-y 3
+x 7
+y 5
 end
 arch swall_2_1_2
-x 4
-y 3
+x 7
+y 5
 end
 arch stonefloor2
-x 4
-y 4
+x 7
+y 6
 end
 arch greater_dwarven_guard
 msg
@@ -438,8 +764,8 @@ Go read the books or I'll pound you!
 endmsg
 exp 1
 dam 50
-x 4
-y 4
+x 7
+y 6
 speed 2.000000
 level 2
 resist_magic 100
@@ -457,51 +783,51 @@ stand_still 1
 can_see_in_dark 1
 end
 arch ahole_left
-x 4
-y 5
+x 7
+y 7
 end
 arch forge
-x 4
-y 5
-end
-arch stonefloor2
-x 4
-y 6
-end
-arch stonefloor2
-x 4
+x 7
 y 7
 end
+arch stonefloor2
+x 7
+y 8
+end
+arch stonefloor2
+x 7
+y 9
+end
 arch pedestal
-x 4
-y 7
+x 7
+y 9
 invisible 1
 connected 11
 end
 arch stonefloor2
-x 4
-y 8
+x 7
+y 10
 end
 arch ggate_closed
-x 4
-y 8
+x 7
+y 10
 connected 11
 no_magic 1
 damned 1
 end
 arch woodfloor
-x 4
-y 9
+x 7
+y 11
 end
 arch check_floor
 slaying smith_house1
-x 4
-y 9
+x 7
+y 11
 connected 11
 end
 arch woodfloor
-x 4
-y 10
+x 7
+y 12
 end
 arch trigger_marker
 slaying smith_house1
@@ -509,8 +835,8 @@ msg
 You have one day's use of these facilities.
 endmsg
 food 504
-x 4
-y 10
+x 7
+y 12
 speed 1.0
 connected 10
 end
@@ -518,125 +844,167 @@ arch altar_trigger
 name Drop 200 platinum to enter
 slaying money
 food 10000
-x 4
-y 10
+x 7
+y 12
 connected 10
 end
 arch woodfloor
-x 4
-y 11
+x 7
+y 13
 end
 arch woodfloor
-x 4
-y 12
+x 7
+y 14
+end
+arch woodfloor
+x 7
+y 15
 end
 arch oakdoor_2
 slaying /world/world_105_115
 hp 10
 sp 39
-x 4
-y 12
+x 7
+y 15
+end
+arch grass_only
+x 7
+y 16
+end
+arch grass_only
+x 7
+y 17
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
+y 1
 end
 arch woodfloor
-x 5
+x 8
+y 2
 end
 arch wall_2_1_2
-x 5
+x 8
+y 2
 end
 arch woodfloor
-x 5
-y 1
+x 8
+y 3
 end
 arch chair_3.1
-x 5
-y 1
+x 8
+y 3
 no_pick 1
 end
 arch woodfloor
-x 5
-y 2
+x 8
+y 4
 end
 arch dungeon_magic
-x 5
-y 3
+x 8
+y 5
 end
 arch stonefloor2
-x 5
-y 3
+x 8
+y 5
 end
 arch swall_2_1_2
-x 5
-y 3
-end
-arch lava
-x 5
-y 4
-type 0
-end
-arch lava
-x 5
+x 8
 y 5
-type 0
 end
 arch lava
-x 5
+x 8
 y 6
 type 0
 end
 arch lava
-x 5
+x 8
 y 7
 type 0
 end
-arch dungeon_magic
-x 5
+arch lava
+x 8
 y 8
+type 0
+end
+arch lava
+x 8
+y 9
+type 0
+end
+arch dungeon_magic
+x 8
+y 10
 end
 arch stonefloor2
-x 5
-y 8
+x 8
+y 10
 end
 arch swall_2_1_2
-x 5
-y 8
-end
-arch woodfloor
-x 5
-y 9
-end
-arch firepot
-x 5
-y 9
-end
-arch woodfloor
-x 5
+x 8
 y 10
 end
 arch woodfloor
-x 5
+x 8
+y 11
+end
+arch firepot
+x 8
 y 11
 end
 arch woodfloor
-x 5
+x 8
 y 12
 end
+arch woodfloor
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
 arch wall_1_4
-x 5
-y 12
+x 8
+y 15
+end
+arch grass_only
+x 8
+y 16
+end
+arch grass_only
+x 8
+y 17
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
+y 1
 end
 arch woodfloor
-x 6
+x 9
+y 2
 end
 arch wall_2_1_2
-x 6
+x 9
+y 2
 end
 arch woodfloor
-x 6
-y 1
+x 9
+y 3
 end
 arch table_3
-x 6
-y 1
+x 9
+y 3
 no_pick 1
 end
 arch quarto
@@ -646,297 +1014,576 @@ Combine a pair of shoes or boots with
 3 crystals of mithril to create steel.
 endmsg
 face book_red.111
-x 6
-y 1
+x 9
+y 3
 no_pick 1
 end
 arch woodfloor
-x 6
-y 2
+x 9
+y 4
 end
 arch dungeon_magic
-x 6
-y 3
+x 9
+y 5
 end
 arch stonefloor2
-x 6
-y 3
+x 9
+y 5
 end
 arch swall_2_2_3
-x 6
-y 3
+x 9
+y 5
 end
 arch awall_0
-x 6
-y 3
-end
-arch dungeon_magic
-x 6
-y 4
-end
-arch stonefloor2
-x 6
-y 4
-end
-arch swall_2_1_1
-x 6
-y 4
-end
-arch dungeon_magic
-x 6
-y 5
-end
-arch stonefloor2
-x 6
-y 5
-end
-arch swall_2_1_1
-x 6
+x 9
 y 5
 end
 arch dungeon_magic
-x 6
+x 9
 y 6
 end
 arch stonefloor2
-x 6
+x 9
 y 6
 end
 arch swall_2_1_1
-x 6
+x 9
 y 6
 end
 arch dungeon_magic
-x 6
+x 9
 y 7
 end
 arch stonefloor2
-x 6
+x 9
 y 7
 end
 arch swall_2_1_1
-x 6
+x 9
 y 7
 end
 arch dungeon_magic
-x 6
+x 9
 y 8
 end
 arch stonefloor2
-x 6
+x 9
 y 8
 end
-arch swall_2_2_4
-x 6
+arch swall_2_1_1
+x 9
 y 8
 end
-arch awall_0
-x 6
-y 8
-end
-arch woodfloor
-x 6
+arch dungeon_magic
+x 9
 y 9
 end
-arch woodfloor
-x 6
+arch stonefloor2
+x 9
+y 9
+end
+arch swall_2_1_1
+x 9
+y 9
+end
+arch dungeon_magic
+x 9
+y 10
+end
+arch stonefloor2
+x 9
+y 10
+end
+arch swall_2_2_4
+x 9
+y 10
+end
+arch awall_0
+x 9
 y 10
 end
 arch woodfloor
-x 6
+x 9
 y 11
 end
+arch woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
+arch wall_2_1_2
+x 9
+y 15
+end
+arch grass_only
+x 9
+y 16
+end
+arch grass_only
+x 9
+y 17
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch wall_2_1_2
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch woodfloor
+x 10
+y 12
+end
+arch woodfloor
+x 10
+y 13
+end
+arch woodfloor
+x 10
+y 14
+end
 arch platinum_converter
 name Buy shoes (5pp)
 name_pl Buy shoes (5pp)
 other_arch low_boots
 sp 1
 food 5
-x 6
-y 11
+x 10
+y 14
 end
 arch woodfloor
-x 6
-y 12
+x 10
+y 15
 end
 arch wall_2_1_2
-x 6
-y 12
+x 10
+y 15
+end
+arch grass_only
+x 10
+y 16
+end
+arch grass_only
+x 10
+y 17
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
 end
 arch woodfloor
-x 7
+x 11
+y 2
 end
 arch stwall_2_1_2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch firepot
-x 7
-y 1
-end
-arch woodfloor
-x 7
+x 11
 y 2
 end
 arch woodfloor
-x 7
+x 11
+y 3
+end
+arch firepot
+x 11
 y 3
 end
 arch woodfloor
-x 7
+x 11
 y 4
 end
 arch woodfloor
-x 7
+x 11
 y 5
 end
 arch woodfloor
-x 7
+x 11
 y 6
 end
 arch woodfloor
-x 7
+x 11
 y 7
 end
 arch woodfloor
-x 7
+x 11
 y 8
 end
 arch woodfloor
-x 7
+x 11
 y 9
 end
 arch woodfloor
-x 7
+x 11
 y 10
 end
+arch woodfloor
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
 arch platinum_converter
 name Buy Helmets (10pp)
 name_pl Buy Helmets (10pp)
 other_arch helmet
 sp 1
 food 10
-x 7
-y 10
+x 11
+y 13
 end
 arch woodfloor
-x 7
-y 11
+x 11
+y 14
 end
 arch firepot
-x 7
-y 11
+x 11
+y 14
 end
 arch woodfloor
-x 7
-y 12
+x 11
+y 15
 end
 arch stwall_2_1_2
-x 7
-y 12
+x 11
+y 15
+end
+arch grass_only
+x 11
+y 16
+end
+arch grass_only
+x 11
+y 17
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
 end
 arch woodfloor
-x 8
+x 12
+y 2
 end
 arch stwall_2_2_3
-x 8
-end
-arch woodfloor
-x 8
-y 1
-end
-arch stwall_2_1_1
-x 8
-y 1
-end
-arch woodfloor
-x 8
-y 2
-end
-arch wall_2_1_1
-x 8
+x 12
 y 2
 end
 arch woodfloor
-x 8
+x 12
 y 3
 end
-arch wall_2_1_1
-x 8
-y 3
-end
-arch woodfloor
-x 8
-y 4
-end
-arch wall_2_1_1
-x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch wall_2_1_1
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch wall_2_1_1
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch wall_2_1_1
-x 8
-y 7
-end
-arch woodfloor
-x 8
-y 8
-end
-arch wall_2_1_1
-x 8
-y 8
-end
-arch woodfloor
-x 8
-y 9
-end
-arch wall_2_1_1
-x 8
-y 9
-end
-arch woodfloor
-x 8
-y 10
-end
-arch wall_2_1_1
-x 8
-y 10
-end
-arch woodfloor
-x 8
-y 11
-end
 arch stwall_2_1_1
-x 8
+x 12
+y 3
+end
+arch woodfloor
+x 12
+y 4
+end
+arch wall_2_1_1
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 5
+end
+arch wall_2_1_1
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
+arch wall_2_1_1
+x 12
+y 6
+end
+arch woodfloor
+x 12
+y 7
+end
+arch wall_2_1_1
+x 12
+y 7
+end
+arch woodfloor
+x 12
+y 8
+end
+arch wall_2_1_1
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 9
+end
+arch wall_2_1_1
+x 12
+y 9
+end
+arch woodfloor
+x 12
+y 10
+end
+arch wall_2_1_1
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch wall_2_1_1
+x 12
 y 11
 end
 arch woodfloor
-x 8
+x 12
 y 12
 end
+arch wall_2_1_1
+x 12
+y 12
+end
+arch woodfloor
+x 12
+y 13
+end
+arch wall_2_1_1
+x 12
+y 13
+end
+arch woodfloor
+x 12
+y 14
+end
+arch stwall_2_1_1
+x 12
+y 14
+end
+arch woodfloor
+x 12
+y 15
+end
 arch stwall_2_2_4
-x 8
+x 12
+y 15
+end
+arch grass_only
+x 12
+y 16
+end
+arch grass_only
+x 12
+y 17
+end
+arch cobblestones2
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch grass_only
+x 13
+y 2
+end
+arch grass_only
+x 13
+y 3
+end
+arch grass_only
+x 13
+y 4
+end
+arch grass_only
+x 13
+y 5
+end
+arch grass_only
+x 13
+y 6
+end
+arch grass_only
+x 13
+y 7
+end
+arch grass_only
+x 13
+y 8
+end
+arch grass_only
+x 13
+y 9
+end
+arch grass_only
+x 13
+y 10
+end
+arch grass_only
+x 13
+y 11
+end
+arch grass_only
+x 13
 y 12
 end
+arch grass_only
+x 13
+y 13
+end
+arch grass_only
+x 13
+y 14
+end
+arch grass_only
+x 13
+y 15
+end
+arch grass_only
+x 13
+y 16
+end
+arch grass_only
+x 13
+y 17
+end
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch grass_only
+x 14
+y 2
+end
+arch grass_only
+x 14
+y 3
+end
+arch grass_only
+x 14
+y 4
+end
+arch grass_only
+x 14
+y 5
+end
+arch grass_only
+x 14
+y 6
+end
+arch grass_only
+x 14
+y 7
+end
+arch grass_only
+x 14
+y 8
+end
+arch grass_only
+x 14
+y 9
+end
+arch grass_only
+x 14
+y 10
+end
+arch grass_only
+x 14
+y 11
+end
+arch grass_only
+x 14
+y 12
+end
+arch grass_only
+x 14
+y 13
+end
+arch grass_only
+x 14
+y 14
+end
+arch grass_only
+x 14
+y 15
+end
+arch grass_only
+x 14
+y 16
+end
+arch grass_only
+x 14
+y 17
+end
diff --git a/world/world_105_115 b/world/world_105_115
index c9e569ff6..e541988bf 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -4745,8 +4745,8 @@ end
 arch house_small
 name Metal Smith's Workshop
 slaying /scorn/houses/smithery
-hp 4
-sp 12
+hp 7
+sp 13
 x 10
 y 39
 end