From 5f840a1bca074b5c30f6074fa435b90b59c9d9b2 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 30 Jul 2012 02:21:27 +0000
Subject: [PATCH] Cosmetic and layout changes to Jordan's House
 (navar_city/houses/jordanshouse) 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@18383 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/houses/jordanshouse | 2404 ++++++++++++++++++++++++--------
 world/world_121_116            |    4 +-
 2 files changed, 1822 insertions(+), 586 deletions(-)

diff --git a/navar_city/houses/jordanshouse b/navar_city/houses/jordanshouse
index a69f2af81..dc56a62cd 100644
--- a/navar_city/houses/jordanshouse
+++ b/navar_city/houses/jordanshouse
@@ -2,123 +2,108 @@ arch map
 name Jordan's House
 difficulty 1
 region navar
-width 14
-height 10
-enter_x 11
-enter_y 2
+width 29
+height 13
+enter_x 14
+enter_y 9
 msg
 Created:  2012-03-20 Rick Tanner
-Modified: 2012-05-16 Rick Tanner
+Modified: 2012-07-29 Rick Tanner
 endmsg
 end
-arch blocked
+arch cobblestones2
 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 blocked
+arch grass_only
 y 9
 end
-arch blocked
+arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
 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_1_1
-x 1
-y 5
-end
-arch woodfloor
+arch grass_only
 x 1
 y 6
 end
-arch wall_2_1_1
-x 1
-y 6
-end
-arch woodfloor
+arch grass_only
 x 1
 y 7
 end
-arch wall_2_1_1
-x 1
-y 7
-end
-arch woodfloor
+arch grass_only
 x 1
 y 8
 end
-arch wall_2_2_1
-x 1
-y 8
-end
-arch blocked
+arch grass_only
 x 1
 y 9
 end
-arch blocked
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
 x 2
 end
-arch woodfloor
-x 2
-y 1
-end
-arch wall_2_1_2
+arch grass_only
 x 2
 y 1
 end
@@ -126,683 +111,1934 @@ arch woodfloor
 x 2
 y 2
 end
+arch woodwall_2_2_2
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 3
+end
+arch woodwall_2_1_1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch woodwall_2_1_1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch woodwall_3_2
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch woodwall_2_1_1
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch woodwall_3_2
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodwall_2_1_1
+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_2_1
+x 2
+y 10
+end
+arch grass_only
+x 2
+y 11
+end
+arch cobblestones2
+x 2
+y 12
+end
+arch cobblestones2
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch woodfloor
+x 3
+y 2
+end
+arch woodwall_2_1_2
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
+arch bed_1
+x 3
+y 3
+end
+arch woodfloor
+x 3
+y 4
+end
 arch chest
-x 2
-y 2
-end
-arch woodfloor
-x 2
-y 3
-end
-arch woodfloor
-x 2
+x 3
 y 4
 end
 arch woodfloor
-x 2
+x 3
+y 5
+end
+arch woodwall_2_1_2
+x 3
 y 5
 end
 arch woodfloor
-x 2
+x 3
+y 6
+end
+arch dog
+x 3
 y 6
 end
 arch woodfloor
-x 2
+x 3
 y 7
 end
+arch woodwall_1_3
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch chair_2.4
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch woodwall_2_1_2
+x 3
+y 10
+end
+arch grass_only
+x 3
+y 11
+end
+arch cobblestones2
+x 3
+y 12
+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 woodwall_1_3
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch door_2
+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 woodwall_2_1_2
+x 4
+y 10
+end
+arch grass_only
+x 4
+y 11
+end
+arch cobblestones2
+x 4
+y 12
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
+end
+arch woodwall_win2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch door_2
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodwall_1_4
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch woodwall_win2
+x 5
+y 10
+end
+arch grass_only
+x 5
+y 11
+end
+arch cobblestones2
+x 5
+y 12
+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 dog
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch woodwall_1_4
+x 6
+y 5
+end
+arch woodfloor
+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 woodfloor
+x 6
+y 9
+end
+arch bed_1
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch woodwall_2_1_2
+x 6
+y 10
+end
+arch grass_only
+x 6
+y 11
+end
+arch cobblestones2
+x 6
+y 12
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch woodwall_3_3
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch woodwall_2_1_1
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch woodwall_2_1_1
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
+arch woodwall_2_2_4
+x 7
+y 5
+end
+arch woodfloor
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch woodwall_3_3
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch woodwall_2_1_1
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch woodwall_2_1_1
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch woodwall_3_1
+x 7
+y 10
+end
+arch grass_only
+x 7
+y 11
+end
+arch cobblestones2
+x 7
+y 12
+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 clock
-x 2
-y 7
-end
-arch woodfloor
-x 2
-y 8
-end
-arch wall_2_1_2
-x 2
-y 8
-end
-arch blocked
-x 2
-y 9
-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 chest
-x 3
-y 2
-end
-arch woodfloor
-x 3
-y 3
-end
-arch chair
-x 3
-y 3
-end
-arch woodfloor
-x 3
-y 4
-end
-arch table_3
-x 3
-y 4
-end
-arch woodfloor
-x 3
-y 5
-end
-arch chair
-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 wall_2_1_2
-x 3
-y 8
-end
-arch blocked
-x 3
-y 9
-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 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 wall_2_1_2
-x 4
-y 8
-end
-arch blocked
-x 4
-y 9
-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 bed_1
-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 bed_1
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 5
-end
-arch bed_1
-x 5
-y 5
-end
-arch woodfloor
-x 5
-y 6
-end
-arch bed_1
-x 5
-y 6
-end
-arch woodfloor
-x 5
-y 7
-end
-arch woodfloor
-x 5
-y 8
-end
-arch wall_2_1_2
-x 5
-y 8
-end
-arch blocked
-x 5
-y 9
-end
-arch blocked
-x 6
-end
-arch woodfloor
-x 6
-y 1
-end
-arch wall_3_3
-x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch wall_2_1_1
-x 6
-y 2
-end
-arch woodfloor
-x 6
-y 3
-end
-arch wall_2_1_1
-x 6
-y 3
-end
-arch woodfloor
-x 6
-y 4
-end
-arch wall_2_1_1
-x 6
-y 4
-end
-arch woodfloor
-x 6
-y 5
-end
-arch wall_2_1_1
-x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch wall_2_2_1
-x 6
-y 6
-end
-arch woodfloor
-x 6
-y 7
-end
-arch dog
-x 6
-y 7
-end
-arch woodfloor
-x 6
-y 8
-end
-arch wall_2_1_2
-x 6
-y 8
-end
-arch blocked
-x 6
-y 9
-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 chair
-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 wall_2_1_2
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch wall_2_1_2
-x 7
-y 8
-end
-arch blocked
-x 7
-y 9
-end
-arch blocked
 x 8
+y 3
 end
 arch woodfloor
 x 8
-y 1
-end
-arch wall_2_1_2
-x 8
-y 1
+y 4
 end
 arch woodfloor
 x 8
+y 5
+end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch woodwall_1_3
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch bed_1
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch woodwall_2_1_2
+x 8
+y 10
+end
+arch grass_only
+x 8
+y 11
+end
+arch cobblestones2
+x 8
+y 12
+end
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch woodwall_win2
+x 9
 y 2
 end
 arch woodfloor
-x 8
+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 woodfloor
+x 9
+y 7
+end
+arch door_2
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodwall_2_1_2
+x 9
+y 10
+end
+arch grass_only
+x 9
+y 11
+end
+arch cobblestones2
+x 9
+y 12
+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 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 woodwall_1_4
+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 woodwall_win2
+x 10
+y 10
+end
+arch grass_only
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 12
+end
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch woodfloor
+x 11
+y 2
+end
+arch woodwall_2_1_2
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 3
+end
+arch chair_1.4
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
+arch woodwall_0
+x 11
+y 5
+end
+arch woodfloor
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch woodwall_2_1_2
+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 woodwall_2_1_2
+x 11
+y 10
+end
+arch grass_only
+x 11
+y 11
+end
+arch cobblestones2
+x 11
+y 12
+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 woodfloor
+x 12
 y 3
 end
 arch table_3
-x 8
+x 12
 y 3
 end
 arch woodfloor
-x 8
-y 4
-end
-arch chair
-x 8
+x 12
 y 4
 end
 arch woodfloor
-x 8
+x 12
 y 5
 end
+arch woodwall_0
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
 arch dog
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch wall_2_1_2
-x 8
+x 12
 y 6
 end
 arch woodfloor
-x 8
+x 12
+y 7
+end
+arch woodwall_2_2_3
+x 12
 y 7
 end
 arch woodfloor
-x 8
+x 12
 y 8
 end
-arch wall_2_1_2
-x 8
+arch woodwall_2_1_1
+x 12
 y 8
 end
-arch blocked
-x 8
+arch woodfloor
+x 12
 y 9
 end
-arch blocked
-x 9
+arch woodwall_2_1_1
+x 12
+y 9
 end
 arch woodfloor
-x 9
-y 1
+x 12
+y 10
 end
-arch wall_2_1_2
-x 9
+arch woodwall_3_1
+x 12
+y 10
+end
+arch grass_only
+x 12
+y 11
+end
+arch cobblestones2
+x 12
+y 12
+end
+arch cobblestones2
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
 arch woodfloor
-x 9
+x 13
+y 2
+end
+arch woodwall_2_1_2
+x 13
 y 2
 end
 arch woodfloor
-x 9
+x 13
+y 3
+end
+arch chair_1.2
+x 13
 y 3
 end
 arch woodfloor
-x 9
+x 13
 y 4
 end
 arch woodfloor
-x 9
-y 5
-end
-arch dog
-x 9
+x 13
 y 5
 end
 arch woodfloor
-x 9
-y 6
-end
-arch wall_1_3
-x 9
+x 13
 y 6
 end
 arch woodfloor
-x 9
+x 13
 y 7
 end
 arch woodfloor
-x 9
+x 13
 y 8
 end
-arch wall_2_1_2
-x 9
-y 8
-end
-arch blocked
-x 9
+arch woodfloor
+x 13
 y 9
 end
-arch blocked
-x 10
-end
 arch woodfloor
-x 10
-y 1
+x 13
+y 10
 end
-arch wall_2_1_2
-x 10
+arch woodwall_1_3
+x 13
+y 10
+end
+arch dungeon_magic
+x 13
+y 11
+end
+arch grass_only
+x 13
+y 11
+move_block all
+end
+arch cobblestones2
+x 13
+y 12
+end
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
 arch woodfloor
-x 10
+x 14
+y 2
+end
+arch woodwall_win2
+x 14
 y 2
 end
 arch woodfloor
-x 10
+x 14
 y 3
 end
 arch woodfloor
-x 10
+x 14
 y 4
 end
 arch woodfloor
-x 10
-y 5
-end
-arch dog
-x 10
+x 14
 y 5
 end
 arch woodfloor
-x 10
+x 14
 y 6
 end
 arch woodfloor
-x 10
-y 7
-end
-arch dog
-x 10
+x 14
 y 7
 end
 arch woodfloor
-x 10
+x 14
 y 8
 end
-arch wall_2_1_2
-x 10
-y 8
-end
-arch blocked
-x 10
+arch magic_mouth
+msg
+Loud barking can be heard from a short distance away.
+endmsg
+x 14
 y 9
 end
-arch blocked
-x 11
+arch woodfloor
+x 14
+y 9
 end
 arch woodfloor
-x 11
-y 1
+x 14
+y 10
 end
-arch wall_2_1_2
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 2
-end
-arch oakdoor
+arch oakdoor_2
 slaying /world/world_121_116
 hp 46
 sp 42
-x 11
-y 2
+x 14
+y 10
 end
-arch woodfloor
-x 11
-y 3
+arch dungeon_magic
+x 14
+y 11
 end
-arch woodfloor
-x 11
-y 4
+arch grass_only
+x 14
+y 11
+move_block all
 end
-arch woodfloor
-x 11
-y 5
+arch cobblestones2
+x 14
+y 12
 end
-arch woodfloor
-x 11
-y 6
+arch cobblestones2
+x 15
 end
-arch woodfloor
-x 11
-y 7
-end
-arch woodfloor
-x 11
-y 8
-end
-arch wall_2_1_2
-x 11
-y 8
-end
-arch blocked
-x 11
-y 9
-end
-arch blocked
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch wall_2_2_3
-x 12
+arch grass_only
+x 15
 y 1
 end
 arch woodfloor
-x 12
+x 15
 y 2
 end
-arch wall_2_1_1
-x 12
+arch woodwall_2_1_2
+x 15
 y 2
 end
 arch woodfloor
-x 12
-y 3
-end
-arch wall_2_1_1
-x 12
+x 15
 y 3
 end
 arch woodfloor
-x 12
-y 4
-end
-arch wall_2_1_1
-x 12
+x 15
 y 4
 end
 arch woodfloor
-x 12
-y 5
-end
-arch wall_2_1_1
-x 12
+x 15
 y 5
 end
 arch woodfloor
-x 12
-y 6
-end
-arch wall_2_1_1
-x 12
+x 15
 y 6
 end
 arch woodfloor
-x 12
-y 7
-end
-arch wall_2_1_1
-x 12
+x 15
 y 7
 end
 arch woodfloor
-x 12
+x 15
 y 8
 end
-arch wall_2_2_4
-x 12
-y 8
-end
-arch blocked
-x 12
+arch woodfloor
+x 15
 y 9
 end
-arch blocked
-x 13
+arch woodfloor
+x 15
+y 10
 end
-arch blocked
-x 13
+arch woodwall_1_4
+x 15
+y 10
+end
+arch dungeon_magic
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 11
+move_block all
+end
+arch cobblestones2
+x 15
+y 12
+end
+arch cobblestones2
+x 16
+end
+arch grass_only
+x 16
 y 1
 end
-arch blocked
-x 13
+arch woodfloor
+x 16
 y 2
 end
-arch blocked
-x 13
+arch woodwall_2_1_2
+x 16
+y 2
+end
+arch woodfloor
+x 16
 y 3
 end
-arch blocked
-x 13
+arch woodfloor
+x 16
 y 4
 end
-arch blocked
-x 13
+arch dog
+x 16
+y 4
+end
+arch woodfloor
+x 16
 y 5
 end
-arch blocked
-x 13
+arch woodwall_0
+x 16
+y 5
+end
+arch woodfloor
+x 16
 y 6
 end
-arch blocked
-x 13
+arch woodfloor
+x 16
 y 7
 end
-arch blocked
-x 13
+arch woodwall_2_2_2
+x 16
+y 7
+end
+arch woodfloor
+x 16
 y 8
 end
-arch blocked
-x 13
+arch woodwall_2_1_1
+x 16
+y 8
+end
+arch woodfloor
+x 16
 y 9
 end
+arch woodwall_2_1_1
+x 16
+y 9
+end
+arch woodfloor
+x 16
+y 10
+end
+arch woodwall_3_1
+x 16
+y 10
+end
+arch grass_only
+x 16
+y 11
+end
+arch cobblestones2
+x 16
+y 12
+end
+arch cobblestones2
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch woodfloor
+x 17
+y 2
+end
+arch woodwall_2_1_2
+x 17
+y 2
+end
+arch woodfloor
+x 17
+y 3
+end
+arch woodfloor
+x 17
+y 4
+end
+arch woodfloor
+x 17
+y 5
+end
+arch woodwall_0
+x 17
+y 5
+end
+arch woodfloor
+x 17
+y 6
+end
+arch woodfloor
+x 17
+y 7
+end
+arch woodwall_2_1_2
+x 17
+y 7
+end
+arch woodfloor
+x 17
+y 8
+end
+arch bed_1
+x 17
+y 8
+end
+arch woodfloor
+x 17
+y 9
+end
+arch woodfloor
+x 17
+y 10
+end
+arch woodwall_2_1_2
+x 17
+y 10
+end
+arch grass_only
+x 17
+y 11
+end
+arch cobblestones2
+x 17
+y 12
+end
+arch cobblestones2
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch woodfloor
+x 18
+y 2
+end
+arch woodwall_2_1_2
+x 18
+y 2
+end
+arch woodfloor
+x 18
+y 3
+end
+arch woodfloor
+x 18
+y 4
+end
+arch woodfloor
+x 18
+y 5
+end
+arch woodfloor
+x 18
+y 6
+end
+arch woodfloor
+x 18
+y 7
+end
+arch woodwall_1_3
+x 18
+y 7
+end
+arch woodfloor
+x 18
+y 8
+end
+arch woodfloor
+x 18
+y 9
+end
+arch woodfloor
+x 18
+y 10
+end
+arch woodwall_win2
+x 18
+y 10
+end
+arch grass_only
+x 18
+y 11
+end
+arch cobblestones2
+x 18
+y 12
+end
+arch cobblestones2
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch woodfloor
+x 19
+y 2
+end
+arch woodwall_win2
+x 19
+y 2
+end
+arch woodfloor
+x 19
+y 3
+end
+arch chair_1.4
+x 19
+y 3
+end
+arch woodfloor
+x 19
+y 4
+end
+arch woodfloor
+x 19
+y 5
+end
+arch woodfloor
+x 19
+y 6
+end
+arch woodfloor
+x 19
+y 7
+end
+arch door_2
+x 19
+y 7
+end
+arch woodfloor
+x 19
+y 8
+end
+arch woodfloor
+x 19
+y 9
+end
+arch woodfloor
+x 19
+y 10
+end
+arch woodwall_2_1_2
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch cobblestones2
+x 19
+y 12
+end
+arch cobblestones2
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch woodfloor
+x 20
+y 2
+end
+arch woodwall_2_1_2
+x 20
+y 2
+end
+arch woodfloor
+x 20
+y 3
+end
+arch table_3
+x 20
+y 3
+end
+arch woodfloor
+x 20
+y 4
+end
+arch chair_1.3
+x 20
+y 4
+end
+arch woodfloor
+x 20
+y 5
+end
+arch woodfloor
+x 20
+y 6
+end
+arch woodfloor
+x 20
+y 7
+end
+arch woodwall_1_4
+x 20
+y 7
+end
+arch woodfloor
+x 20
+y 8
+end
+arch woodfloor
+x 20
+y 9
+end
+arch woodfloor
+x 20
+y 10
+end
+arch woodwall_2_1_2
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch cobblestones2
+x 20
+y 12
+end
+arch cobblestones2
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch woodfloor
+x 21
+y 2
+end
+arch woodwall_3_3
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch woodwall_2_1_1
+x 21
+y 3
+end
+arch woodfloor
+x 21
+y 4
+end
+arch woodwall_2_1_1
+x 21
+y 4
+end
+arch woodfloor
+x 21
+y 5
+end
+arch woodwall_2_2_1
+x 21
+y 5
+end
+arch woodfloor
+x 21
+y 6
+end
+arch woodfloor
+x 21
+y 7
+end
+arch woodwall_3_3
+x 21
+y 7
+end
+arch woodfloor
+x 21
+y 8
+end
+arch woodwall_2_1_1
+x 21
+y 8
+end
+arch woodfloor
+x 21
+y 9
+end
+arch woodwall_2_1_1
+x 21
+y 9
+end
+arch woodfloor
+x 21
+y 10
+end
+arch woodwall_3_1
+x 21
+y 10
+end
+arch grass_only
+x 21
+y 11
+end
+arch cobblestones2
+x 21
+y 12
+end
+arch cobblestones2
+x 22
+end
+arch grass_only
+x 22
+y 1
+end
+arch woodfloor
+x 22
+y 2
+end
+arch woodwall_2_1_2
+x 22
+y 2
+end
+arch woodfloor
+x 22
+y 3
+end
+arch bed_1
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 4
+end
+arch woodfloor
+x 22
+y 5
+end
+arch woodwall_2_1_2
+x 22
+y 5
+end
+arch woodfloor
+x 22
+y 6
+end
+arch woodfloor
+x 22
+y 7
+end
+arch woodwall_1_3
+x 22
+y 7
+end
+arch woodfloor
+x 22
+y 8
+end
+arch chair_2.1
+x 22
+y 8
+end
+arch woodfloor
+x 22
+y 9
+end
+arch woodfloor
+x 22
+y 10
+end
+arch woodwall_2_1_2
+x 22
+y 10
+end
+arch grass_only
+x 22
+y 11
+end
+arch cobblestones2
+x 22
+y 12
+end
+arch cobblestones2
+x 23
+end
+arch grass_only
+x 23
+y 1
+end
+arch woodfloor
+x 23
+y 2
+end
+arch woodwall_win2
+x 23
+y 2
+end
+arch woodfloor
+x 23
+y 3
+end
+arch dog
+x 23
+y 3
+end
+arch woodfloor
+x 23
+y 4
+end
+arch woodfloor
+x 23
+y 5
+end
+arch woodwall_1_3
+x 23
+y 5
+end
+arch woodfloor
+x 23
+y 6
+end
+arch woodfloor
+x 23
+y 7
+end
+arch door_2
+x 23
+y 7
+end
+arch woodfloor
+x 23
+y 8
+end
+arch woodfloor
+x 23
+y 9
+end
+arch woodfloor
+x 23
+y 10
+end
+arch woodwall_win2
+x 23
+y 10
+end
+arch grass_only
+x 23
+y 11
+end
+arch cobblestones2
+x 23
+y 12
+end
+arch cobblestones2
+x 24
+end
+arch grass_only
+x 24
+y 1
+end
+arch woodfloor
+x 24
+y 2
+end
+arch woodwall_2_1_2
+x 24
+y 2
+end
+arch woodfloor
+x 24
+y 3
+end
+arch woodfloor
+x 24
+y 4
+end
+arch woodfloor
+x 24
+y 5
+end
+arch door_2
+x 24
+y 5
+end
+arch woodfloor
+x 24
+y 6
+end
+arch dog
+x 24
+y 6
+end
+arch woodfloor
+x 24
+y 7
+end
+arch woodwall_1_4
+x 24
+y 7
+end
+arch woodfloor
+x 24
+y 8
+end
+arch woodfloor
+x 24
+y 9
+end
+arch woodfloor
+x 24
+y 10
+end
+arch woodwall_2_1_2
+x 24
+y 10
+end
+arch grass_only
+x 24
+y 11
+end
+arch cobblestones2
+x 24
+y 12
+end
+arch cobblestones2
+x 25
+end
+arch grass_only
+x 25
+y 1
+end
+arch woodfloor
+x 25
+y 2
+end
+arch woodwall_2_1_2
+x 25
+y 2
+end
+arch woodfloor
+x 25
+y 3
+end
+arch chest
+x 25
+y 3
+end
+arch woodfloor
+x 25
+y 4
+end
+arch woodfloor
+x 25
+y 5
+end
+arch woodwall_1_4
+x 25
+y 5
+end
+arch woodfloor
+x 25
+y 6
+end
+arch woodfloor
+x 25
+y 7
+end
+arch woodwall_2_1_2
+x 25
+y 7
+end
+arch woodfloor
+x 25
+y 8
+end
+arch bed_1
+x 25
+y 8
+end
+arch woodfloor
+x 25
+y 9
+end
+arch woodfloor
+x 25
+y 10
+end
+arch woodwall_2_1_2
+x 25
+y 10
+end
+arch grass_only
+x 25
+y 11
+end
+arch cobblestones2
+x 25
+y 12
+end
+arch cobblestones2
+x 26
+end
+arch grass_only
+x 26
+y 1
+end
+arch woodfloor
+x 26
+y 2
+end
+arch woodwall_2_2_3
+x 26
+y 2
+end
+arch woodfloor
+x 26
+y 3
+end
+arch woodwall_2_1_1
+x 26
+y 3
+end
+arch woodfloor
+x 26
+y 4
+end
+arch woodwall_win1
+x 26
+y 4
+end
+arch woodfloor
+x 26
+y 5
+end
+arch woodwall_3_4
+x 26
+y 5
+end
+arch woodfloor
+x 26
+y 6
+end
+arch woodwall_2_1_1
+x 26
+y 6
+end
+arch woodfloor
+x 26
+y 7
+end
+arch woodwall_3_4
+x 26
+y 7
+end
+arch woodfloor
+x 26
+y 8
+end
+arch woodwall_win1
+x 26
+y 8
+end
+arch woodfloor
+x 26
+y 9
+end
+arch woodwall_2_1_1
+x 26
+y 9
+end
+arch woodfloor
+x 26
+y 10
+end
+arch woodwall_2_2_4
+x 26
+y 10
+end
+arch grass_only
+x 26
+y 11
+end
+arch cobblestones2
+x 26
+y 12
+end
+arch cobblestones2
+x 27
+end
+arch grass_only
+x 27
+y 1
+end
+arch grass_only
+x 27
+y 2
+end
+arch grass_only
+x 27
+y 3
+end
+arch grass_only
+x 27
+y 4
+end
+arch grass_only
+x 27
+y 5
+end
+arch grass_only
+x 27
+y 6
+end
+arch grass_only
+x 27
+y 7
+end
+arch grass_only
+x 27
+y 8
+end
+arch grass_only
+x 27
+y 9
+end
+arch grass_only
+x 27
+y 10
+end
+arch grass_only
+x 27
+y 11
+end
+arch cobblestones2
+x 27
+y 12
+end
+arch cobblestones2
+x 28
+end
+arch cobblestones2
+x 28
+y 1
+end
+arch cobblestones2
+x 28
+y 2
+end
+arch cobblestones2
+x 28
+y 3
+end
+arch cobblestones2
+x 28
+y 4
+end
+arch cobblestones2
+x 28
+y 5
+end
+arch cobblestones2
+x 28
+y 6
+end
+arch cobblestones2
+x 28
+y 7
+end
+arch cobblestones2
+x 28
+y 8
+end
+arch cobblestones2
+x 28
+y 9
+end
+arch cobblestones2
+x 28
+y 10
+end
+arch cobblestones2
+x 28
+y 11
+end
+arch cobblestones2
+x 28
+y 12
+end
diff --git a/world/world_121_116 b/world/world_121_116
index fd550199a..3e270df27 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -13642,8 +13642,8 @@ end
 arch house_long
 name Jordan's House
 slaying ../navar_city/houses/jordanshouse
-hp 11
-sp 2
+hp 14
+sp 9
 x 45
 y 42
 end