From f5c57d9f2088053112fa0992dbc4335f52fd08c3 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 2 Aug 2012 06:33:08 +0000
Subject: [PATCH] Cosmetic and layout changes to Mason's House
 (navar_city/houses/masonshouse) in Navar.  Enlarged the map to include area
 surrounding the house, added more furniture, made the house larger with rooms
 and windows. Updated world map (world/world_121_116) for map entrance
 coordinate changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18387 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/houses/masonshouse | 1266 ++++++++++++++++++++++++++++++---
 world/world_121_116           |    6 +-
 2 files changed, 1163 insertions(+), 109 deletions(-)

diff --git a/navar_city/houses/masonshouse b/navar_city/houses/masonshouse
index 878b16d03..693330173 100644
--- a/navar_city/houses/masonshouse
+++ b/navar_city/houses/masonshouse
@@ -2,221 +2,1275 @@ arch map
 name Mason's House
 difficulty 1
 region navar
-width 6
-height 6
-enter_x 3
-enter_y 3
+width 17
+height 14
+enter_x 12
+enter_y 10
 msg
 Created:  2012-03-20 Rick Tanner
-Modified: 2012-05-16 Rick Tanner
+Modified: 2012-08-02 Rick Tanner
 endmsg
 end
-arch woodfloor
+arch cobblestones2
 end
-arch wwall_2_2_2
-end
-arch woodfloor
+arch grass_only
 y 1
 end
-arch wwall_2_1_1
+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 cobblestones2
+y 13
+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 cobblestones2
+x 1
+y 13
+end
+arch cobblestones2
+x 2
+end
+arch grass_only
+x 2
 y 1
 end
 arch woodfloor
+x 2
 y 2
 end
-arch wwall_2_1_1
+arch woodwall_2_2_2
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
-arch wwall_2_1_1
+arch woodwall_2_1_1
+x 2
 y 3
 end
 arch woodfloor
+x 2
 y 4
 end
-arch wwall_2_2_1
+arch woodwall_2_1_1
+x 2
 y 4
 end
-arch blocked
+arch woodfloor
+x 2
+y 5
+end
+arch woodwall_win1
+x 2
 y 5
 end
 arch woodfloor
-x 1
+x 2
+y 6
 end
-arch wwall_2_1_2
-x 1
+arch woodwall_2_1_1
+x 2
+y 6
 end
 arch woodfloor
-x 1
-y 1
+x 2
+y 7
 end
-arch table_4
-x 1
+arch woodwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodwall_win1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch woodwall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch woodwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch woodwall_2_2_1
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch cobblestones2
+x 2
+y 13
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
 y 1
 end
 arch woodfloor
-x 1
+x 3
+y 2
+end
+arch woodwall_win2
+x 3
 y 2
 end
 arch woodfloor
-x 1
+x 3
+y 3
+end
+arch woodfloor
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch woodfloor
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch chair_1.1
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch table_1x2
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch woodfloor
+x 3
+y 11
+end
+arch woodwall_2_1_2
+x 3
+y 11
+end
+arch grass_only
+x 3
+y 12
+end
+arch cobblestones2
+x 3
+y 13
+end
+arch cobblestones2
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch woodfloor
+x 4
+y 2
+end
+arch woodwall_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 4
+y 11
+end
+arch woodwall_2_1_2
+x 4
+y 11
+end
+arch grass_only
+x 4
+y 12
+end
+arch cobblestones2
+x 4
+y 13
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
+end
+arch woodwall_3_3
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch woodwall_1_2
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch door_1
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch woodwall_1_1
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch woodwall_2_1_1
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodwall_2_2_1
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodwall_0
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch woodwall_win2
+x 5
+y 11
+end
+arch grass_only
+x 5
+y 12
+end
+arch cobblestones2
+x 5
+y 13
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch woodwall_2_1_2
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch bookshelf
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch table_4
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch woodwall_2_1_2
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch desk
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch chair_1.3
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch woodfloor
+x 6
+y 11
+end
+arch woodwall_2_1_2
+x 6
+y 11
+end
+arch grass_only
+x 6
+y 12
+end
+arch cobblestones2
+x 6
+y 13
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch woodwall_2_1_2
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
+arch woodfloor
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 6
+end
+arch chair_1.1
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch woodwall_2_1_2
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch bookshelf
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch woodwall_2_1_2
+x 7
+y 11
+end
+arch grass_only
+x 7
+y 12
+end
+arch cobblestones2
+x 7
+y 13
+end
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch woodfloor
+x 8
+y 2
+end
+arch woodwall_2_1_2
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch woodfloor
+x 8
 y 3
 end
 arch bed_1
-x 1
+x 8
 y 3
 end
 arch woodfloor
-x 1
+x 8
 y 4
 end
-arch wwall_2_1_2
-x 1
-y 4
-end
-arch blocked
-x 1
+arch woodfloor
+x 8
 y 5
 end
 arch woodfloor
-x 2
-end
-arch wwall_2_1_2
-x 2
+x 8
+y 6
 end
 arch woodfloor
-x 2
-y 1
+x 8
+y 7
 end
-arch chair_1.1
-x 2
+arch woodwall_2_1_2
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch bookshelf
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodwall_2_1_2
+x 8
+y 11
+end
+arch grass_only
+x 8
+y 12
+end
+arch cobblestones2
+x 8
+y 13
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
 arch woodfloor
-x 2
+x 9
+y 2
+end
+arch woodwall_2_1_2
+x 9
 y 2
 end
 arch woodfloor
-x 2
+x 9
 y 3
 end
 arch woodfloor
-x 2
+x 9
 y 4
 end
-arch wwall_2_1_2
-x 2
-y 4
-end
-arch blocked
-x 2
+arch woodfloor
+x 9
 y 5
 end
 arch woodfloor
-x 3
-end
-arch wwall_2_1_2
-x 3
+x 9
+y 6
 end
 arch woodfloor
-x 3
+x 9
+y 7
+end
+arch woodwall_2_1_2
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch bookshelf
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodwall_win2
+x 9
+y 11
+end
+arch grass_only
+x 9
+y 12
+end
+arch cobblestones2
+x 9
+y 13
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
+arch woodfloor
+x 10
+y 2
+end
+arch woodwall_2_1_2
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch dresser
+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 chest
-x 3
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodwall_2_1_2
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch desk
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch chair_1.3
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
+arch woodwall_2_1_2
+x 10
+y 11
+end
+arch grass_only
+x 10
+y 12
+end
+arch cobblestones2
+x 10
+y 13
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch woodfloor
-x 3
+x 11
+y 2
+end
+arch woodwall_3_3
+x 11
 y 2
 end
 arch woodfloor
-x 3
+x 11
 y 3
 end
-arch oakdoor
+arch woodwall_2_1_1
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch woodwall_2_1_1
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
+arch woodwall_2_1_1
+x 11
+y 5
+end
+arch woodfloor
+x 11
+y 6
+end
+arch woodwall_2_1_1
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch woodwall_3_1
+x 11
+y 7
+end
+arch woodfloor
+x 11
+y 8
+end
+arch woodwall_0
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
+arch woodwall_1_3
+x 11
+y 11
+end
+arch dungeon_magic
+x 11
+y 12
+end
+arch grass_only
+x 11
+y 12
+move_block all
+end
+arch cobblestones2
+x 11
+y 13
+end
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch woodfloor
+x 12
+y 2
+end
+arch woodwall_2_1_2
+x 12
+y 2
+end
+arch woodfloor
+x 12
+y 3
+end
+arch barrel
+x 12
+y 3
+end
+arch woodfloor
+x 12
+y 4
+end
+arch barrel
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
+arch table
+x 12
+y 6
+end
+arch woodfloor
+x 12
+y 7
+end
+arch woodwall_1_3
+x 12
+y 7
+end
+arch woodfloor
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 9
+end
+arch woodfloor
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch oakdoor_2
 slaying /world/world_121_116
 hp 49
 sp 42
-x 3
-y 3
+x 12
+y 11
 end
-arch woodfloor
-x 3
-y 4
+arch dungeon_magic
+x 12
+y 12
 end
-arch wwall_2_1_2
-x 3
-y 4
+arch grass_only
+x 12
+y 12
+move_block all
 end
-arch blocked
-x 3
-y 5
+arch cobblestones2
+x 12
+y 13
 end
-arch woodfloor
-x 4
+arch cobblestones2
+x 13
 end
-arch wwall_2_2_3
-x 4
-end
-arch woodfloor
-x 4
-y 1
-end
-arch wwall_2_1_1
-x 4
+arch grass_only
+x 13
 y 1
 end
 arch woodfloor
-x 4
+x 13
 y 2
 end
-arch wwall_2_1_1
-x 4
+arch woodwall_win2
+x 13
 y 2
 end
 arch woodfloor
-x 4
-y 3
-end
-arch wwall_2_1_1
-x 4
+x 13
 y 3
 end
 arch woodfloor
-x 4
+x 13
 y 4
 end
-arch wwall_2_2_4
-x 4
-y 4
-end
-arch blocked
-x 4
+arch woodfloor
+x 13
 y 5
 end
-arch blocked
-x 5
+arch woodfloor
+x 13
+y 6
 end
-arch blocked
-x 5
+arch woodfloor
+x 13
+y 7
+end
+arch door_2
+x 13
+y 7
+end
+arch woodfloor
+x 13
+y 8
+end
+arch woodfloor
+x 13
+y 9
+end
+arch woodfloor
+x 13
+y 10
+end
+arch woodfloor
+x 13
+y 11
+end
+arch woodwall_1_4
+x 13
+y 11
+end
+arch dungeon_magic
+x 13
+y 12
+end
+arch grass_only
+x 13
+y 12
+move_block all
+end
+arch cobblestones2
+x 13
+y 13
+end
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch blocked
-x 5
+arch woodfloor
+x 14
 y 2
 end
-arch blocked
-x 5
+arch woodwall_2_2_3
+x 14
+y 2
+end
+arch woodfloor
+x 14
 y 3
 end
-arch blocked
-x 5
+arch woodwall_2_1_1
+x 14
+y 3
+end
+arch woodfloor
+x 14
 y 4
 end
-arch blocked
-x 5
+arch woodwall_2_1_1
+x 14
+y 4
+end
+arch woodfloor
+x 14
 y 5
 end
+arch woodwall_win1
+x 14
+y 5
+end
+arch woodfloor
+x 14
+y 6
+end
+arch woodwall_2_1_1
+x 14
+y 6
+end
+arch woodfloor
+x 14
+y 7
+end
+arch woodwall_2_1_1
+x 14
+y 7
+end
+arch woodfloor
+x 14
+y 8
+end
+arch woodwall_win1
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
+arch woodwall_2_1_1
+x 14
+y 9
+end
+arch woodfloor
+x 14
+y 10
+end
+arch woodwall_2_1_1
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch woodwall_2_2_4
+x 14
+y 11
+end
+arch grass_only
+x 14
+y 12
+end
+arch cobblestones2
+x 14
+y 13
+end
+arch cobblestones2
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
+y 2
+end
+arch grass_only
+x 15
+y 3
+end
+arch grass_only
+x 15
+y 4
+end
+arch grass_only
+x 15
+y 5
+end
+arch grass_only
+x 15
+y 6
+end
+arch grass_only
+x 15
+y 7
+end
+arch grass_only
+x 15
+y 8
+end
+arch grass_only
+x 15
+y 9
+end
+arch grass_only
+x 15
+y 10
+end
+arch grass_only
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 12
+end
+arch cobblestones2
+x 15
+y 13
+end
+arch cobblestones2
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch grass_only
+x 16
+y 2
+end
+arch grass_only
+x 16
+y 3
+end
+arch grass_only
+x 16
+y 4
+end
+arch grass_only
+x 16
+y 5
+end
+arch grass_only
+x 16
+y 6
+end
+arch grass_only
+x 16
+y 7
+end
+arch grass_only
+x 16
+y 8
+end
+arch grass_only
+x 16
+y 9
+end
+arch grass_only
+x 16
+y 10
+end
+arch grass_only
+x 16
+y 11
+end
+arch grass_only
+x 16
+y 12
+end
+arch cobblestones2
+x 16
+y 13
+end
diff --git a/world/world_121_116 b/world/world_121_116
index e7b3715e4..41e5dccfc 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2012-07-31 Rick Tanner
+Modified: 2012-08-02 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_115
@@ -15128,8 +15128,8 @@ end
 arch house_1
 name Mason's House
 slaying ../navar_city/houses/masonshouse
-hp 3
-sp 3
+hp 12
+sp 10
 x 49
 y 42
 end