From 2e5acf2b77fd7a56aaac0d748cbdd0f67d4c79a3 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 9 Jul 2012 07:36:56 +0000
Subject: [PATCH] Cosmetic and layout changes to Angel's Abode
 (navar_city/houses/angelsabode) in Navar.  Enlarged the map to include area
 surrounding the house, made the house larger and included furniture and
 rooms. 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@18356 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/houses/angelsabode | 1992 +++++++++++++++++++++++++++------
 world/world_121_116           |    6 +-
 2 files changed, 1631 insertions(+), 367 deletions(-)

diff --git a/navar_city/houses/angelsabode b/navar_city/houses/angelsabode
index b3e26d373..7b0045a69 100644
--- a/navar_city/houses/angelsabode
+++ b/navar_city/houses/angelsabode
@@ -2,93 +2,150 @@ arch map
 name Angel's Abode
 difficulty 5
 region navar
-width 15
-height 8
-enter_x 12
-enter_y 5
+width 19
+height 19
+enter_x 14
+enter_y 15
 msg
 Created:  2012-05-17 Rick Tanner
-Modified: 2012-05-17 Rick Tanner
+Modified: 2012-07-09 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 blocked
+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
+y 18
+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_2_1
-x 1
-y 4
-end
-arch blocked
+arch grass_only
 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 blocked
+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 1
+y 18
+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
@@ -96,144 +153,368 @@ 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_2_1_1
+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_win1
+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_1_1
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch wwall_2_1_1
+x 2
+y 14
+end
+arch woodfloor
+x 2
+y 15
+end
+arch wwall_2_1_1
+x 2
+y 15
+end
+arch woodfloor
+x 2
+y 16
+end
+arch wwall_2_2_1
+x 2
+y 16
+end
+arch grass_only
+x 2
+y 17
+end
+arch cobblestones2
+x 2
+y 18
+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 random_scroll
-x 2
-y 2
+x 3
+y 3
 end
 arch woodfloor
-x 2
-y 3
+x 3
+y 4
 end
 arch pedestal
-x 2
-y 3
+x 3
+y 4
 invisible 1
 connected 11
 end
 arch chest
-x 2
-y 3
+x 3
+y 4
 end
 arch woodfloor
-x 2
-y 4
-end
-arch wall_2_1_2
-x 2
-y 4
-end
-arch blocked
-x 2
+x 3
 y 5
 end
-arch blocked
-x 2
+arch woodfloor
+x 3
 y 6
 end
-arch blocked
-x 2
+arch wwall_2_1_2
+x 3
+y 6
+end
+arch woodfloor
+x 3
 y 7
 end
-arch blocked
+arch desk
 x 3
+y 7
 end
 arch woodfloor
 x 3
-y 1
-end
-arch wall_2_1_2
-x 3
-y 1
+y 8
 end
 arch woodfloor
 x 3
+y 9
+end
+arch chair_2.4
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch chair_2.4
+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 chair_2.4
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
+end
+arch chair_2.4
+x 3
+y 14
+end
+arch woodfloor
+x 3
+y 15
+end
+arch woodfloor
+x 3
+y 16
+end
+arch wwall_2_1_2
+x 3
+y 16
+end
+arch grass_only
+x 3
+y 17
+end
+arch cobblestones2
+x 3
+y 18
+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 4
+y 3
+end
 arch random_wealth
-x 3
-y 2
+x 4
+y 3
 end
 arch woodfloor
-x 3
-y 3
+x 4
+y 4
 end
 arch pedestal
-x 3
-y 3
+x 4
+y 4
 invisible 1
 connected 11
 end
 arch random_treasure
-x 3
-y 3
-end
-arch woodfloor
-x 3
-y 4
-end
-arch wall_2_1_2
-x 3
-y 4
-end
-arch blocked
-x 3
-y 5
-end
-arch blocked
-x 3
-y 6
-end
-arch blocked
-x 3
-y 7
-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 woodfloor
-x 4
-y 3
-end
-arch woodfloor
 x 4
 y 4
 end
-arch wall_2_1_2
-x 4
-y 4
-end
-arch blocked
+arch woodfloor
 x 4
 y 5
 end
-arch blocked
+arch woodfloor
 x 4
 y 6
 end
-arch blocked
+arch wwall_2_1_2
+x 4
+y 6
+end
+arch woodfloor
 x 4
 y 7
 end
-arch blocked
-x 5
+arch woodfloor
+x 4
+y 8
+end
+arch chair_2.1
+x 4
+y 8
 end
 arch woodfloor
-x 5
-y 1
+x 4
+y 9
 end
-arch wall_2_1_2
+arch table_1x2
+x 4
+y 9
+end
+arch woodfloor
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch woodfloor
+x 4
+y 12
+end
+arch woodfloor
+x 4
+y 13
+end
+arch table_1x2
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 14
+end
+arch woodfloor
+x 4
+y 15
+end
+arch woodfloor
+x 4
+y 16
+end
+arch wwall_2_1_2
+x 4
+y 16
+end
+arch grass_only
+x 4
+y 17
+end
+arch cobblestones2
+x 4
+y 18
+end
+arch grass_only
+x 5
+end
+arch grass_only
 x 5
 y 1
 end
@@ -241,11 +522,11 @@ arch woodfloor
 x 5
 y 2
 end
-arch woodfloor
+arch wwall_2_1_2
 x 5
-y 3
+y 2
 end
-arch chair_1.1
+arch woodfloor
 x 5
 y 3
 end
@@ -253,30 +534,90 @@ arch woodfloor
 x 5
 y 4
 end
-arch wall_2_1_2
-x 5
-y 4
-end
-arch blocked
+arch woodfloor
 x 5
 y 5
 end
-arch blocked
+arch woodfloor
 x 5
 y 6
 end
-arch blocked
+arch wwall_2_1_2
+x 5
+y 6
+end
+arch woodfloor
 x 5
 y 7
 end
-arch blocked
-x 6
+arch woodfloor
+x 5
+y 8
 end
 arch woodfloor
-x 6
-y 1
+x 5
+y 9
 end
-arch wall_2_1_2
+arch chair_2.2
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch chair_2.2
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch chair_2.2
+x 5
+y 13
+end
+arch woodfloor
+x 5
+y 14
+end
+arch chair_2.2
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 15
+end
+arch woodfloor
+x 5
+y 16
+end
+arch wwall_win2
+x 5
+y 16
+end
+arch grass_only
+x 5
+y 17
+end
+arch cobblestones2
+x 5
+y 18
+end
+arch grass_only
+x 6
+end
+arch grass_only
 x 6
 y 1
 end
@@ -284,7 +625,7 @@ arch woodfloor
 x 6
 y 2
 end
-arch chair_1.1
+arch wwall_win2
 x 6
 y 2
 end
@@ -292,38 +633,78 @@ arch woodfloor
 x 6
 y 3
 end
-arch table_4
-x 6
-y 3
-end
 arch woodfloor
 x 6
 y 4
 end
-arch wall_2_1_2
-x 6
-y 4
-end
-arch blocked
+arch woodfloor
 x 6
 y 5
 end
-arch blocked
+arch woodfloor
 x 6
 y 6
 end
-arch blocked
+arch wwall_2_1_2
+x 6
+y 6
+end
+arch woodfloor
 x 6
 y 7
 end
-arch blocked
-x 7
+arch woodfloor
+x 6
+y 8
 end
 arch woodfloor
-x 7
-y 1
+x 6
+y 9
 end
-arch wall_2_1_2
+arch woodfloor
+x 6
+y 10
+end
+arch woodfloor
+x 6
+y 11
+end
+arch woodfloor
+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 woodfloor
+x 6
+y 16
+end
+arch wwall_2_1_2
+x 6
+y 16
+end
+arch grass_only
+x 6
+y 17
+end
+arch cobblestones2
+x 6
+y 18
+end
+arch grass_only
+x 7
+end
+arch grass_only
 x 7
 y 1
 end
@@ -331,11 +712,15 @@ 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 chair_1.1
+arch bed_1
 x 7
 y 3
 end
@@ -343,38 +728,94 @@ arch woodfloor
 x 7
 y 4
 end
-arch wall_3_3
-x 7
-y 4
-end
 arch woodfloor
 x 7
 y 5
 end
-arch wall_2_1_1
-x 7
-y 5
-end
 arch woodfloor
 x 7
 y 6
 end
-arch wall_2_2_1
+arch wwall_2_1_2
 x 7
 y 6
 end
-arch blocked
+arch woodfloor
 x 7
 y 7
 end
-arch blocked
-x 8
+arch bookshelf
+x 7
+y 7
 end
 arch woodfloor
-x 8
-y 1
+x 7
+y 8
 end
-arch wall_2_1_2
+arch woodfloor
+x 7
+y 9
+end
+arch bookshelf_right
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch bookshelf_right
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch bookshelf_right
+x 7
+y 11
+end
+arch woodfloor
+x 7
+y 12
+end
+arch woodfloor
+x 7
+y 13
+end
+arch woodfloor
+x 7
+y 14
+end
+arch woodfloor
+x 7
+y 15
+end
+arch bookshelf_right
+x 7
+y 15
+end
+arch woodfloor
+x 7
+y 16
+end
+arch wwall_2_1_2
+x 7
+y 16
+end
+arch grass_only
+x 7
+y 17
+end
+arch cobblestones2
+x 7
+y 18
+end
+arch grass_only
+x 8
+end
+arch grass_only
 x 8
 y 1
 end
@@ -382,6 +823,10 @@ arch woodfloor
 x 8
 y 2
 end
+arch wwall_2_1_2
+x 8
+y 2
+end
 arch woodfloor
 x 8
 y 3
@@ -390,195 +835,447 @@ arch woodfloor
 x 8
 y 4
 end
-arch wall_2_1_2
-x 8
-y 4
-end
 arch woodfloor
 x 8
 y 5
 end
+arch woodfloor
+x 8
+y 6
+end
+arch wwall_3_3
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch wwall_2_1_1
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch wwall_2_1_1
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch wwall_2_1_1
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch wwall_2_1_1
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch wwall_2_1_1
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
+arch wwall_1_2
+x 8
+y 12
+end
+arch woodfloor
+x 8
+y 13
+end
+arch door_1
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch wwall_2_2_2
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
+arch wwall_2_1_1
+x 8
+y 15
+end
+arch woodfloor
+x 8
+y 16
+end
+arch wwall_3_1
+x 8
+y 16
+end
+arch grass_only
+x 8
+y 17
+end
+arch cobblestones2
+x 8
+y 18
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch dresser2
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch wwall_2_1_2
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch table_3
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch chair_2.3
+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 woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch wwall_2_1_2
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
 arch random_food
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch wall_2_1_2
-x 8
-y 6
-end
-arch blocked
-x 8
-y 7
-end
-arch blocked
 x 9
+y 15
 end
 arch woodfloor
 x 9
-y 1
+y 16
 end
-arch wall_2_1_2
+arch wwall_2_1_2
 x 9
+y 16
+end
+arch grass_only
+x 9
+y 17
+end
+arch cobblestones2
+x 9
+y 18
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
 arch woodfloor
-x 9
+x 10
+y 2
+end
+arch wwall_3_3
+x 10
 y 2
 end
 arch woodfloor
-x 9
+x 10
 y 3
 end
+arch wwall_1_2
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch door_1
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch wwall_1_1
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch wwall_3_1
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch chair_2.2
+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 creator
 other_arch angry_floor
-x 9
-y 3
+x 10
+y 13
 connected 11
 end
 arch angel
 name Angel
-x 9
-y 3
+x 10
+y 13
 unaggressive 1
 end
 arch woodfloor
-x 9
-y 4
-end
-arch wall_2_1_2
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch wall_2_1_2
-x 9
-y 6
-end
-arch blocked
-x 9
-y 7
-end
-arch blocked
 x 10
+y 14
+end
+arch wwall_2_1_2
+x 10
+y 14
 end
 arch woodfloor
 x 10
-y 1
+y 15
 end
-arch wall_2_1_2
+arch woodfloor
 x 10
+y 16
+end
+arch wwall_2_1_2
+x 10
+y 16
+end
+arch grass_only
+x 10
+y 17
+end
+arch cobblestones2
+x 10
+y 18
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
 arch woodfloor
-x 10
+x 11
+y 2
+end
+arch wwall_2_1_2
+x 11
 y 2
 end
 arch woodfloor
-x 10
+x 11
 y 3
 end
 arch woodfloor
-x 10
+x 11
 y 4
 end
-arch wall_2_1_2
-x 10
-y 4
+arch woodfloor
+x 11
+y 5
+end
+arch barrel
+x 11
+y 5
+end
+arch woodfloor
+x 11
+y 6
+end
+arch wwall_2_1_2
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch woodfloor
+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 wwall_1_4
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
+arch woodfloor
+x 11
+y 14
+end
+arch wwall_2_1_2
+x 11
+y 14
 move_block 0
 end
 arch woodfloor
-x 10
-y 5
+x 11
+y 15
 end
 arch creator
 other_arch angry_floor
-x 10
-y 5
+x 11
+y 15
 connected 11
 end
 arch black_pudding
-x 10
-y 5
+x 11
+y 15
 unaggressive 1
 end
 arch woodfloor
-x 10
-y 6
-end
-arch wall_2_1_2
-x 10
-y 6
-end
-arch blocked
-x 10
-y 7
-end
-arch blocked
 x 11
+y 16
 end
-arch woodfloor
+arch wwall_2_1_2
 x 11
-y 1
+y 16
 end
-arch wall_2_1_2
+arch grass_only
 x 11
-y 1
+y 17
 end
-arch woodfloor
+arch cobblestones2
 x 11
-y 2
+y 18
 end
-arch woodfloor
-x 11
-y 3
-end
-arch woodfloor
-x 11
-y 4
-end
-arch wall_2_2_3
-x 11
-y 4
-end
-arch woodfloor
-x 11
-y 5
-end
-arch wall_2_1_1
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch wall_3_1
-x 11
-y 6
-end
-arch blocked
-x 11
-y 7
-end
-arch blocked
+arch grass_only
 x 12
 end
-arch woodfloor
-x 12
-y 1
-end
-arch wall_2_1_2
+arch grass_only
 x 12
 y 1
 end
@@ -586,128 +1283,695 @@ arch woodfloor
 x 12
 y 2
 end
+arch wwall_2_1_2
+x 12
+y 2
+end
 arch woodfloor
 x 12
 y 3
 end
+arch woodfloor
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
+arch wwall_1_3
+x 12
+y 6
+end
+arch woodfloor
+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 wwall_2_1_2
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
+arch woodfloor
+x 12
+y 13
+end
+arch woodfloor
+x 12
+y 14
+end
+arch wwall_2_2_3
+x 12
+y 14
+end
+arch woodfloor
+x 12
+y 15
+end
+arch wwall_2_1_1
+x 12
+y 15
+end
+arch woodfloor
+x 12
+y 16
+end
+arch wwall_3_1
+x 12
+y 16
+end
+arch grass_only
+x 12
+y 17
+end
+arch cobblestones2
+x 12
+y 18
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch woodfloor
+x 13
+y 2
+end
+arch wwall_win2
+x 13
+y 2
+end
+arch woodfloor
+x 13
+y 3
+end
+arch woodfloor
+x 13
+y 4
+end
+arch woodfloor
+x 13
+y 5
+end
+arch woodfloor
+x 13
+y 6
+end
+arch door_2
+x 13
+y 6
+end
+arch woodfloor
+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 wwall_2_1_2
+x 13
+y 11
+end
+arch woodfloor
+x 13
+y 12
+end
+arch woodfloor
+x 13
+y 13
+end
+arch woodfloor
+x 13
+y 14
+end
+arch woodfloor
+x 13
+y 15
+end
+arch woodfloor
+x 13
+y 16
+end
+arch wwall_1_3
+x 13
+y 16
+end
+arch dungeon_magic
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 17
+move_block all
+end
+arch cobblestones2
+x 13
+y 18
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch woodfloor
+x 14
+y 2
+end
+arch wwall_2_1_2
+x 14
+y 2
+end
+arch woodfloor
+x 14
+y 3
+end
+arch woodfloor
+x 14
+y 4
+end
+arch woodfloor
+x 14
+y 5
+end
 arch magic_mouth
 msg
 You see an Angel appear before you The Angle says:
 "Stop brave adventurer...do not take what is not your from this lonely hovel.  The owners have gone through great hardships.  So if you do feel the need to take anything YOU WILL DIE!"
 endmsg
-x 12
-y 4
+x 14
+y 6
 end
 arch woodfloor
-x 12
-y 4
+x 14
+y 6
+end
+arch wwall_1_4
+x 14
+y 6
 end
 arch woodfloor
-x 12
-y 5
+x 14
+y 7
 end
-arch oakdoor
+arch woodfloor
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
+arch woodfloor
+x 14
+y 10
+end
+arch chair_2.4
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch wwall_2_1_2
+x 14
+y 11
+end
+arch woodfloor
+x 14
+y 12
+end
+arch woodfloor
+x 14
+y 13
+end
+arch woodfloor
+x 14
+y 14
+end
+arch woodfloor
+x 14
+y 15
+end
+arch woodfloor
+x 14
+y 16
+end
+arch oakdoor_2
 slaying /world/world_121_116
 hp 45
 sp 48
-x 12
-y 5
+x 14
+y 16
 end
-arch woodfloor
-x 12
-y 6
+arch dungeon_magic
+x 14
+y 17
 end
-arch wall_2_1_2
-x 12
-y 6
+arch grass_only
+x 14
+y 17
+move_block all
 end
-arch blocked
-x 12
-y 7
+arch cobblestones2
+x 14
+y 18
 end
-arch blocked
-x 13
+arch grass_only
+x 15
 end
-arch woodfloor
-x 13
-y 1
-end
-arch wall_2_2_3
-x 13
+arch grass_only
+x 15
 y 1
 end
 arch woodfloor
-x 13
+x 15
 y 2
 end
-arch wall_2_1_1
-x 13
+arch wwall_2_1_2
+x 15
 y 2
 end
 arch woodfloor
-x 13
+x 15
 y 3
 end
-arch wall_2_1_1
-x 13
+arch barrel
+x 15
 y 3
 end
 arch woodfloor
-x 13
-y 4
-end
-arch wall_2_1_1
-x 13
+x 15
 y 4
 end
 arch woodfloor
-x 13
-y 5
-end
-arch wall_2_1_1
-x 13
+x 15
 y 5
 end
 arch woodfloor
-x 13
+x 15
 y 6
 end
-arch wall_2_2_4
-x 13
+arch wwall_2_1_2
+x 15
 y 6
 end
-arch blocked
-x 13
+arch woodfloor
+x 15
 y 7
 end
-arch blocked
-x 14
+arch clock
+x 15
+y 7
 end
-arch blocked
-x 14
+arch woodfloor
+x 15
+y 8
+end
+arch woodfloor
+x 15
+y 9
+end
+arch chair_2.1
+x 15
+y 9
+end
+arch woodfloor
+x 15
+y 10
+end
+arch table_3
+x 15
+y 10
+end
+arch woodfloor
+x 15
+y 11
+end
+arch wwall_2_1_2
+x 15
+y 11
+end
+arch woodfloor
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch woodfloor
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 15
+end
+arch woodfloor
+x 15
+y 16
+end
+arch wwall_1_4
+x 15
+y 16
+end
+arch dungeon_magic
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 17
+move_block all
+end
+arch cobblestones2
+x 15
+y 18
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
 y 1
 end
-arch blocked
-x 14
+arch woodfloor
+x 16
 y 2
 end
-arch blocked
-x 14
+arch wwall_2_2_3
+x 16
+y 2
+end
+arch woodfloor
+x 16
 y 3
 end
-arch blocked
-x 14
+arch wwall_2_1_1
+x 16
+y 3
+end
+arch woodfloor
+x 16
 y 4
 end
-arch blocked
-x 14
+arch wwall_2_1_1
+x 16
+y 4
+end
+arch woodfloor
+x 16
 y 5
 end
-arch blocked
-x 14
+arch wwall_2_1_1
+x 16
+y 5
+end
+arch woodfloor
+x 16
 y 6
 end
-arch blocked
-x 14
+arch wwall_3_4
+x 16
+y 6
+end
+arch woodfloor
+x 16
 y 7
 end
+arch wwall_2_1_1
+x 16
+y 7
+end
+arch woodfloor
+x 16
+y 8
+end
+arch wwall_2_1_1
+x 16
+y 8
+end
+arch woodfloor
+x 16
+y 9
+end
+arch wwall_win1
+x 16
+y 9
+end
+arch woodfloor
+x 16
+y 10
+end
+arch wwall_2_1_1
+x 16
+y 10
+end
+arch woodfloor
+x 16
+y 11
+end
+arch wwall_3_4
+x 16
+y 11
+end
+arch woodfloor
+x 16
+y 12
+end
+arch wwall_2_1_1
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 13
+end
+arch wwall_2_1_1
+x 16
+y 13
+end
+arch woodfloor
+x 16
+y 14
+end
+arch wwall_2_1_1
+x 16
+y 14
+end
+arch woodfloor
+x 16
+y 15
+end
+arch wwall_2_1_1
+x 16
+y 15
+end
+arch woodfloor
+x 16
+y 16
+end
+arch wwall_2_2_4
+x 16
+y 16
+end
+arch grass_only
+x 16
+y 17
+end
+arch cobblestones2
+x 16
+y 18
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch grass_only
+x 17
+y 2
+end
+arch grass_only
+x 17
+y 3
+end
+arch grass_only
+x 17
+y 4
+end
+arch grass_only
+x 17
+y 5
+end
+arch grass_only
+x 17
+y 6
+end
+arch grass_only
+x 17
+y 7
+end
+arch grass_only
+x 17
+y 8
+end
+arch grass_only
+x 17
+y 9
+end
+arch grass_only
+x 17
+y 10
+end
+arch grass_only
+x 17
+y 11
+end
+arch grass_only
+x 17
+y 12
+end
+arch grass_only
+x 17
+y 13
+end
+arch grass_only
+x 17
+y 14
+end
+arch grass_only
+x 17
+y 15
+end
+arch grass_only
+x 17
+y 16
+end
+arch grass_only
+x 17
+y 17
+end
+arch cobblestones2
+x 17
+y 18
+end
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
+y 1
+end
+arch cobblestones2
+x 18
+y 2
+end
+arch cobblestones2
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 4
+end
+arch cobblestones2
+x 18
+y 5
+end
+arch cobblestones2
+x 18
+y 6
+end
+arch cobblestones2
+x 18
+y 7
+end
+arch cobblestones2
+x 18
+y 8
+end
+arch cobblestones2
+x 18
+y 9
+end
+arch cobblestones2
+x 18
+y 10
+end
+arch cobblestones2
+x 18
+y 11
+end
+arch cobblestones2
+x 18
+y 12
+end
+arch cobblestones2
+x 18
+y 13
+end
+arch cobblestones2
+x 18
+y 14
+end
+arch cobblestones2
+x 18
+y 15
+end
+arch cobblestones2
+x 18
+y 16
+end
+arch cobblestones2
+x 18
+y 17
+end
+arch cobblestones2
+x 18
+y 18
+end
diff --git a/world/world_121_116 b/world/world_121_116
index ea5443073..46461e3b0 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-05-17 Rick Tanner
+Modified: 2012-07-09 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_121_115
@@ -13713,8 +13713,8 @@ end
 arch minihouse
 name Angel's Abode
 slaying ../navar_city/houses/angelsabode
-hp 12
-sp 5
+hp 14
+sp 15
 x 45
 y 48
 end