From 9accf740958ecbfd8b86459f82a44605c110ff3d Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 20 Jul 2012 07:52:32 +0000
Subject: [PATCH] Cosmetic and layout changes to Destitue House
 (navar_city/houses/destitutehouse) in Navar.  Enlarged the map to include
 area surrounding the house, made the house larger, added rooms with furniture
 and included a few windows. Updated world map (world/world_121_117) for map
 entrance coordinate changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18371 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/houses/destitutehouse | 1367 ++++++++++++++++++++++--------
 world/world_121_117              |    4 +-
 2 files changed, 1028 insertions(+), 343 deletions(-)

diff --git a/navar_city/houses/destitutehouse b/navar_city/houses/destitutehouse
index 26fae8364..c4055bd9f 100644
--- a/navar_city/houses/destitutehouse
+++ b/navar_city/houses/destitutehouse
@@ -2,90 +2,122 @@ arch map
 name Destitute House
 difficulty 3
 region navar
-width 13
-height 7
+width 15
+height 15
 enter_x 10
-enter_y 2
+enter_y 11
 msg
 Created:  2012-05-17 Rick Tanner
-Modified: 2012-05-17 Rick Tanner
+Modified: 2012-07-20 Rick Tanner
 endmsg
 end
-arch blocked
+arch grass_only
 end
-arch blocked
+arch grass_only
 y 1
 end
-arch blocked
+arch grass_only
 y 2
 end
-arch blocked
+arch grass_only
 y 3
 end
-arch blocked
+arch grass_only
 y 4
 end
-arch blocked
+arch grass_only
 y 5
 end
-arch blocked
+arch grass_only
 y 6
 end
-arch blocked
+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 cobblestones2
+y 14
+end
+arch grass_only
 x 1
 end
-arch woodfloor
+arch grass_only
 x 1
 y 1
 end
-arch wall_2_2_2
-x 1
-y 1
-end
-arch woodfloor
+arch grass_only
 x 1
 y 2
 end
-arch wall_2_1_1
-x 1
-y 2
-end
-arch woodfloor
+arch grass_only
 x 1
 y 3
 end
-arch wall_2_1_1
-x 1
-y 3
-end
-arch woodfloor
+arch grass_only
 x 1
 y 4
 end
-arch wall_2_1_1
-x 1
-y 4
-end
-arch woodfloor
+arch grass_only
 x 1
 y 5
 end
-arch wall_2_2_1
-x 1
-y 5
-end
-arch blocked
+arch grass_only
 x 1
 y 6
 end
-arch blocked
+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 cobblestones2
+x 1
+y 14
+end
+arch grass_only
 x 2
 end
-arch woodfloor
-x 2
-y 1
-end
-arch wall_2_1_2
+arch grass_only
 x 2
 y 1
 end
@@ -93,273 +125,529 @@ arch woodfloor
 x 2
 y 2
 end
+arch wwall_2_2_2
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 3
+end
+arch wwall_2_1_1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch wwall_2_1_1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch wwall_2_1_1
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch wwall_3_2
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch wwall_win1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch wwall_2_1_1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch wwall_3_2
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch wwall_2_1_1
+x 2
+y 11
+end
+arch woodfloor
+x 2
+y 12
+end
+arch wwall_2_2_1
+x 2
+y 12
+end
+arch grass_only
+x 2
+y 13
+end
+arch cobblestones2
+x 2
+y 14
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch woodfloor
+x 3
+y 2
+end
+arch wwall_2_1_2
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
+arch bookshelf
+x 3
+y 3
+end
+arch woodfloor
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
 arch generate_ant
-x 2
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch wwall_2_1_2
+x 3
+y 6
+end
+arch woodfloor
+x 3
+y 7
+end
+arch chair_1.1
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch table_4
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch wwall_2_1_2
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch clock
+x 3
+y 10
+end
+arch woodfloor
+x 3
+y 11
+end
+arch ant
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
+arch wwall_2_1_2
+x 3
+y 12
+end
+arch grass_only
+x 3
+y 13
+end
+arch cobblestones2
+x 3
+y 14
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch woodfloor
+x 4
+y 2
+end
+arch wwall_2_1_2
+x 4
 y 2
 end
 arch woodfloor
-x 2
+x 4
 y 3
 end
 arch ant
-x 2
+x 4
 y 3
 end
 arch woodfloor
-x 2
+x 4
 y 4
 end
+arch woodfloor
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch wwall_1_3
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch ant
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch ant
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch wwall_2_1_2
+x 4
+y 9
+end
+arch woodfloor
+x 4
+y 10
+end
+arch ant
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch woodfloor
+x 4
+y 12
+end
+arch wwall_2_1_2
+x 4
+y 12
+end
+arch grass_only
+x 4
+y 13
+end
+arch cobblestones2
+x 4
+y 14
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
+end
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch bed_1
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch wwall_2_1_2
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch wwall_2_1_2
+x 5
+y 12
+end
+arch grass_only
+x 5
+y 13
+end
+arch cobblestones2
+x 5
+y 14
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch wwall_win2
+x 6
+y 2
+end
+arch woodfloor
+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 wwall_1_4
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch wwall_1_3
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch woodfloor
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 12
+end
+arch wwall_win2
+x 6
+y 12
+end
+arch grass_only
+x 6
+y 13
+end
+arch cobblestones2
+x 6
+y 14
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch dresser
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
 arch chest
-x 2
-y 4
-end
-arch ant
-x 2
-y 4
-end
-arch woodfloor
-x 2
-y 5
-end
-arch wall_2_1_2
-x 2
-y 5
-end
-arch blocked
-x 2
-y 6
-end
-arch blocked
-x 3
-end
-arch woodfloor
-x 3
-y 1
-end
-arch wall_2_1_2
-x 3
-y 1
-end
-arch woodfloor
-x 3
-y 2
-end
-arch ant
-x 3
-y 2
-end
-arch woodfloor
-x 3
-y 3
-end
-arch ant
-x 3
-y 3
-end
-arch woodfloor
-x 3
-y 4
-end
-arch ant
-x 3
-y 4
-end
-arch woodfloor
-x 3
-y 5
-end
-arch wall_2_1_2
-x 3
-y 5
-end
-arch blocked
-x 3
-y 6
-end
-arch blocked
-x 4
-end
-arch woodfloor
-x 4
-y 1
-end
-arch wall_2_1_2
-x 4
-y 1
-end
-arch woodfloor
-x 4
-y 2
-end
-arch ant
-x 4
-y 2
-end
-arch woodfloor
-x 4
-y 3
-end
-arch ant
-x 4
-y 3
-end
-arch woodfloor
-x 4
-y 4
-end
-arch ant
-x 4
-y 4
-end
-arch woodfloor
-x 4
-y 5
-end
-arch wall_2_1_2
-x 4
-y 5
-end
-arch blocked
-x 4
-y 6
-end
-arch blocked
-x 5
-end
-arch woodfloor
-x 5
-y 1
-end
-arch wall_2_1_2
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch ant
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch ant
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 4
-end
-arch ant
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 5
-end
-arch wall_2_1_2
-x 5
-y 5
-end
-arch blocked
-x 5
-y 6
-end
-arch blocked
-x 6
-end
-arch woodfloor
-x 6
-y 1
-end
-arch wall_2_1_2
-x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch ant
-x 6
-y 2
-end
-arch woodfloor
-x 6
-y 3
-end
-arch ant
-x 6
-y 3
-end
-arch woodfloor
-x 6
-y 4
-end
-arch ant
-x 6
-y 4
-end
-arch woodfloor
-x 6
-y 5
-end
-arch wall_2_1_2
-x 6
-y 5
-end
-arch blocked
-x 6
-y 6
-end
-arch blocked
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch wall_2_1_2
-x 7
-y 1
-end
-arch woodfloor
-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 wall_2_1_2
-x 7
-y 5
-end
-arch blocked
+arch woodfloor
 x 7
 y 6
 end
-arch blocked
-x 8
+arch wwall_2_1_2
+x 7
+y 6
 end
 arch woodfloor
-x 8
-y 1
+x 7
+y 7
 end
-arch wall_2_1_2
+arch ant
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch ant
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch woodfloor
+x 7
+y 12
+end
+arch wwall_2_1_2
+x 7
+y 12
+end
+arch grass_only
+x 7
+y 13
+end
+arch cobblestones2
+x 7
+y 14
+end
+arch grass_only
+x 8
+end
+arch grass_only
 x 8
 y 1
 end
@@ -367,34 +655,86 @@ arch woodfloor
 x 8
 y 2
 end
+arch wwall_3_3
+x 8
+y 2
+end
 arch woodfloor
 x 8
 y 3
 end
+arch wwall_2_1_1
+x 8
+y 3
+end
 arch woodfloor
 x 8
 y 4
 end
+arch wwall_2_1_1
+x 8
+y 4
+end
 arch woodfloor
 x 8
 y 5
 end
-arch wall_2_1_2
+arch wwall_2_1_1
 x 8
 y 5
 end
-arch blocked
+arch woodfloor
 x 8
 y 6
 end
-arch blocked
-x 9
+arch wwall_2_2_4
+x 8
+y 6
 end
 arch woodfloor
-x 9
-y 1
+x 8
+y 7
 end
-arch wall_2_1_2
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch wwall_1_4
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
+arch wwall_2_1_2
+x 8
+y 12
+end
+arch grass_only
+x 8
+y 13
+end
+arch cobblestones2
+x 8
+y 14
+end
+arch grass_only
+x 9
+end
+arch grass_only
 x 9
 y 1
 end
@@ -402,6 +742,10 @@ arch woodfloor
 x 9
 y 2
 end
+arch wwall_2_1_2
+x 9
+y 2
+end
 arch woodfloor
 x 9
 y 3
@@ -410,26 +754,79 @@ arch woodfloor
 x 9
 y 4
 end
+arch chair_1.4
+x 9
+y 4
+end
 arch woodfloor
 x 9
 y 5
 end
-arch wall_2_1_2
+arch chair_1.4
 x 9
 y 5
 end
-arch blocked
+arch woodfloor
 x 9
 y 6
 end
-arch blocked
+arch ant
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch ant
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch wwall_1_3
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch wwall_1_3
+x 9
+y 12
+end
+arch dungeon_magic
+x 9
+y 13
+end
+arch grass_only
+x 9
+y 13
+move_block all
+end
+arch cobblestones2
+x 9
+y 14
+end
+arch grass_only
 x 10
 end
-arch woodfloor
-x 10
-y 1
-end
-arch wall_2_1_2
+arch grass_only
 x 10
 y 1
 end
@@ -437,41 +834,86 @@ arch woodfloor
 x 10
 y 2
 end
-arch oakdoor
+arch wwall_win2
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch chair_1.1
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch table_1x2
+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 wwall_0
+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 oakdoor_2
 slaying /world/world_121_117
 hp 41
 sp 2
 x 10
-y 2
+y 12
 end
-arch woodfloor
+arch dungeon_magic
 x 10
-y 3
+y 13
 end
-arch woodfloor
+arch grass_only
 x 10
-y 4
+y 13
+move_block all
 end
-arch woodfloor
+arch cobblestones2
 x 10
-y 5
+y 14
 end
-arch wall_2_1_2
-x 10
-y 5
-end
-arch blocked
-x 10
-y 6
-end
-arch blocked
+arch grass_only
 x 11
 end
-arch woodfloor
-x 11
-y 1
-end
-arch wall_2_2_3
+arch grass_only
 x 11
 y 1
 end
@@ -479,7 +921,7 @@ arch woodfloor
 x 11
 y 2
 end
-arch wall_2_1_1
+arch wwall_2_1_2
 x 11
 y 2
 end
@@ -487,15 +929,11 @@ arch woodfloor
 x 11
 y 3
 end
-arch wall_2_1_1
-x 11
-y 3
-end
 arch woodfloor
 x 11
 y 4
 end
-arch wall_2_1_1
+arch chair_1.2
 x 11
 y 4
 end
@@ -503,38 +941,285 @@ arch woodfloor
 x 11
 y 5
 end
-arch wall_2_2_4
+arch chair_1.2
 x 11
 y 5
 end
-arch blocked
+arch woodfloor
 x 11
 y 6
 end
-arch blocked
+arch ant
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch woodfloor
+x 11
+y 8
+end
+arch ant
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
+arch wwall_0
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch wwall_1_4
+x 11
+y 12
+end
+arch dungeon_magic
+x 11
+y 13
+end
+arch grass_only
+x 11
+y 13
+move_block all
+end
+arch cobblestones2
+x 11
+y 14
+end
+arch grass_only
 x 12
 end
-arch blocked
+arch grass_only
 x 12
 y 1
 end
-arch blocked
+arch woodfloor
 x 12
 y 2
 end
-arch blocked
+arch wwall_2_2_3
+x 12
+y 2
+end
+arch woodfloor
 x 12
 y 3
 end
-arch blocked
+arch wwall_2_1_1
+x 12
+y 3
+end
+arch woodfloor
 x 12
 y 4
 end
-arch blocked
+arch wwall_2_1_1
+x 12
+y 4
+end
+arch woodfloor
 x 12
 y 5
 end
-arch blocked
+arch wwall_2_1_1
+x 12
+y 5
+end
+arch woodfloor
 x 12
 y 6
 end
+arch wwall_2_1_1
+x 12
+y 6
+end
+arch woodfloor
+x 12
+y 7
+end
+arch wwall_win1
+x 12
+y 7
+end
+arch woodfloor
+x 12
+y 8
+end
+arch wwall_2_1_1
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 9
+end
+arch wwall_2_1_1
+x 12
+y 9
+end
+arch woodfloor
+x 12
+y 10
+end
+arch wwall_2_1_1
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch wwall_2_1_1
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
+arch wwall_2_2_4
+x 12
+y 12
+end
+arch grass_only
+x 12
+y 13
+end
+arch cobblestones2
+x 12
+y 14
+end
+arch grass_only
+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 cobblestones2
+x 13
+y 14
+end
+arch grass_only
+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 cobblestones2
+x 14
+y 14
+end
diff --git a/world/world_121_117 b/world/world_121_117
index d6699236a..c30dcfce0 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-07-19 Rick Tanner
+Modified: 2012-07-20 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -11503,7 +11503,7 @@ arch minihouse
 name Destitute House
 slaying ../navar_city/houses/destitutehouse
 hp 10
-sp 2
+sp 11
 x 41
 y 2
 end