From a49d86b2bb252da662935af61543823dcd3c2c1a Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 31 Jul 2020 21:46:25 +0000
Subject: [PATCH] Cosmetic changes to Iscar's house (navar_city/iscar) to add
 more visual space on the map perimeter. Update world map
 (world/world_122_117) for entrance coordinate changes

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21248 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/iscar    | 1037 ++++++++++++++++++++++++++++++-------------
 world/world_122_117 |    6 +-
 2 files changed, 721 insertions(+), 322 deletions(-)

diff --git a/navar_city/iscar b/navar_city/iscar
index cf675dd47..108949da3 100644
--- a/navar_city/iscar
+++ b/navar_city/iscar
@@ -2,227 +2,405 @@ arch map
 name Iscar's house
 difficulty 1
 region navar
-width 10
-height 10
-enter_x 2
-enter_y 9
+width 14
+height 14
+enter_x 4
+enter_y 10
 msg
 Created:  2008-02-09 Nicolas Weeger
-Modified: 2012-07-08 Nicolas Weeger
+Modified: 2020-07-31 Rick Tanner
 endmsg
 end
+arch grass
+end
+arch grass
+y 1
+end
+arch grass
+y 2
+end
+arch grass
+y 3
+end
+arch grass
+y 4
+end
+arch grass
+y 5
+end
+arch grass
+y 6
+end
+arch grass
+y 7
+end
+arch grass
+y 8
+end
+arch grass
+y 9
+end
+arch grass
+y 10
+end
+arch grass
+y 11
+end
+arch grass
+y 12
+end
+arch grass
+y 13
+end
+arch grass
+x 1
+end
+arch grass
+x 1
+y 1
+end
+arch grass
+x 1
+y 2
+end
+arch grass
+x 1
+y 3
+end
+arch grass
+x 1
+y 4
+end
+arch grass
+x 1
+y 5
+end
+arch grass
+x 1
+y 6
+end
+arch grass
+x 1
+y 7
+end
+arch grass
+x 1
+y 8
+end
+arch grass
+x 1
+y 9
+end
+arch grass
+x 1
+y 10
+end
+arch grass
+x 1
+y 11
+end
+arch grass
+x 1
+y 12
+end
+arch grass
+x 1
+y 13
+end
+arch grass
+x 2
+end
+arch grass
+x 2
+y 1
+end
 arch whiteslate
+x 2
+y 2
 end
 arch white_wall_2_2_2
-end
-arch whiteslate
-y 1
-end
-arch white_wall_2_1_1
-y 1
-end
-arch whiteslate
-y 2
-end
-arch white_wall_2_1_1
+x 2
 y 2
 end
 arch whiteslate
+x 2
 y 3
 end
 arch white_wall_2_1_1
+x 2
 y 3
 end
 arch whiteslate
+x 2
 y 4
 end
-arch white_wall_3_2
+arch white_wall_2_1_1
+x 2
 y 4
 end
 arch whiteslate
+x 2
 y 5
 end
 arch white_wall_2_1_1
+x 2
 y 5
 end
 arch whiteslate
+x 2
 y 6
 end
 arch white_wall_3_2
+x 2
 y 6
 end
 arch whiteslate
+x 2
 y 7
 end
 arch white_wall_2_1_1
+x 2
 y 7
 end
 arch whiteslate
+x 2
 y 8
 end
-arch white_wall_2_1_1
+arch white_wall_3_2
+x 2
 y 8
 end
 arch whiteslate
+x 2
 y 9
 end
+arch white_wall_2_1_1
+x 2
+y 9
+end
+arch whiteslate
+x 2
+y 10
+end
+arch white_wall_2_1_1
+x 2
+y 10
+end
+arch whiteslate
+x 2
+y 11
+end
 arch white_wall_2_2_1
-y 9
+x 2
+y 11
+end
+arch grass
+x 2
+y 12
+end
+arch grass
+x 2
+y 13
+end
+arch grass
+x 3
+end
+arch grass
+x 3
+y 1
 end
 arch whiteslate
-x 1
+x 3
+y 2
 end
 arch white_wall_2_1_2
-x 1
+x 3
+y 2
 end
 arch whiteslate
-x 1
-y 1
+x 3
+y 3
 end
 arch bookshelf
-x 1
-y 1
-end
-arch whiteslate
-x 1
-y 2
-end
-arch whiteslate
-x 1
+x 3
 y 3
 end
 arch whiteslate
-x 1
-y 4
-end
-arch white_wall_2_1_2
-x 1
+x 3
 y 4
 end
 arch whiteslate
-x 1
+x 3
 y 5
 end
 arch whiteslate
-x 1
+x 3
 y 6
 end
-arch white_wall_1_3
-x 1
+arch white_wall_2_1_2
+x 3
 y 6
 end
 arch whiteslate
-x 1
+x 3
 y 7
 end
 arch whiteslate
-x 1
+x 3
+y 8
+end
+arch white_wall_1_3
+x 3
 y 8
 end
 arch whiteslate
-x 1
+x 3
 y 9
 end
+arch whiteslate
+x 3
+y 10
+end
+arch whiteslate
+x 3
+y 11
+end
 arch white_wall_1_3
-x 1
-y 9
+x 3
+y 11
+end
+arch grass
+x 3
+y 12
+move_block all
+end
+arch grass
+x 3
+y 13
+end
+arch grass
+x 4
+end
+arch grass
+x 4
+y 1
 end
 arch whiteslate
-x 2
+x 4
+y 2
 end
 arch white_wall_2_1_2
-x 2
+x 4
+y 2
 end
 arch whiteslate
-x 2
-y 1
+x 4
+y 3
 end
 arch table_burl_3
-x 2
-y 1
-end
-arch whiteslate
-x 2
-y 2
-end
-arch chair_1.3
-x 2
-y 2
-end
-arch whiteslate
-x 2
+x 4
 y 3
 end
 arch whiteslate
-x 2
+x 4
 y 4
 end
-arch white_wall_2_1_2
-x 2
+arch chair_1.3
+x 4
 y 4
 end
 arch whiteslate
-x 2
+x 4
 y 5
 end
 arch whiteslate
-x 2
+x 4
+y 6
+end
+arch white_wall_2_1_2
+x 4
 y 6
 end
 arch whiteslate
-x 2
+x 4
 y 7
 end
 arch whiteslate
-x 2
+x 4
 y 8
 end
 arch whiteslate
+x 4
+y 9
+end
+arch whiteslate
+x 4
+y 10
+end
+arch whiteslate
 slaying /world/world_122_117
 sp 14
-x 2
-y 9
+x 4
+y 11
 end
 arch oakdoor_2
 slaying /world/world_122_117
 sp 14
-x 2
-y 9
+x 4
+y 11
+end
+arch grass
+x 4
+y 12
+move_block all
+end
+arch grass
+x 4
+y 13
+end
+arch grass
+x 5
+end
+arch grass
+x 5
+y 1
 end
 arch whiteslate
-x 3
+x 5
+y 2
 end
 arch white_wall_2_1_2
-x 3
-end
-arch whiteslate
-x 3
-y 1
-end
-arch bookshelf
-x 3
-y 1
-end
-arch whiteslate
-x 3
+x 5
 y 2
 end
 arch whiteslate
-x 3
+x 5
+y 3
+end
+arch bookshelf
+x 5
 y 3
 end
 arch whiteslate
-x 3
-y 4
-end
-arch white_wall_2_1_2
-x 3
+x 5
 y 4
 end
 arch whiteslate
-x 3
+x 5
 y 5
 end
+arch whiteslate
+x 5
+y 6
+end
+arch white_wall_2_1_2
+x 5
+y 6
+end
+arch whiteslate
+x 5
+y 7
+end
 arch child
 msg
 @match why
@@ -234,8 +412,8 @@ I'm a writer, I write books for children.  But I can't write now...
 @question job What are you doing?
 Hello.
 endmsg
-x 3
-y 5
+x 5
+y 7
 speed 0.1
 arch npc_dialog
 name /navar_city/iscar.msg
@@ -253,406 +431,627 @@ end
 end
 end
 arch whiteslate
-x 3
-y 6
+x 5
+y 8
 end
 arch white_wall_1_1
-x 3
-y 6
-end
-arch whiteslate
-x 3
-y 7
-end
-arch white_wall_2_1_1
-x 3
-y 7
-end
-arch whiteslate
-x 3
-y 8
-end
-arch white_wall_2_1_1
-x 3
+x 5
 y 8
 end
 arch whiteslate
-x 3
+x 5
 y 9
 end
+arch white_wall_2_1_1
+x 5
+y 9
+end
+arch whiteslate
+x 5
+y 10
+end
+arch white_wall_2_1_1
+x 5
+y 10
+end
+arch whiteslate
+x 5
+y 11
+end
 arch white_wall_2_2_1
-x 3
-y 9
+x 5
+y 11
+end
+arch grass
+x 5
+y 12
+move_block all
+end
+arch grass
+x 5
+y 13
+end
+arch grass
+x 6
+end
+arch grass
+x 6
+y 1
 end
 arch whiteslate
-x 4
+x 6
+y 2
 end
 arch white_wall_3_3
-x 4
+x 6
+y 2
 end
 arch whiteslate
-x 4
-y 1
+x 6
+y 3
 end
 arch white_wall_2_1_1
-x 4
-y 1
+x 6
+y 3
 end
 arch whiteslate
-x 4
-y 2
+x 6
+y 4
 end
 arch white_wall_1_2
-x 4
-y 2
-end
-arch whiteslate
-x 4
-y 3
-end
-arch whiteslate
-x 4
-y 4
-end
-arch white_wall_1_3
-x 4
+x 6
 y 4
 end
 arch whiteslate
-x 4
+x 6
 y 5
 end
 arch whiteslate
-x 4
+x 6
+y 6
+end
+arch white_wall_1_3
+x 6
 y 6
 end
 arch whiteslate
-x 4
+x 6
 y 7
 end
 arch whiteslate
-x 4
+x 6
 y 8
 end
 arch whiteslate
-x 4
-y 9
-end
-arch white_wall_2_1_2
-x 4
+x 6
 y 9
 end
 arch whiteslate
-x 5
-end
-arch white_wall_2_1_2
-x 5
+x 6
+y 10
 end
 arch whiteslate
-x 5
+x 6
+y 11
+end
+arch white_wall_2_1_2
+x 6
+y 11
+end
+arch grass
+x 6
+y 12
+end
+arch grass
+x 6
+y 13
+end
+arch grass
+x 7
+end
+arch grass
+x 7
 y 1
 end
 arch whiteslate
-x 5
+x 7
+y 2
+end
+arch white_wall_2_1_2
+x 7
 y 2
 end
 arch whiteslate
-x 5
+x 7
 y 3
 end
 arch whiteslate
-x 5
+x 7
 y 4
 end
 arch whiteslate
-x 5
+x 7
 y 5
 end
 arch whiteslate
-x 5
+x 7
 y 6
 end
+arch whiteslate
+x 7
+y 7
+end
+arch whiteslate
+x 7
+y 8
+end
 arch white_wall_1_4
-x 5
-y 6
-end
-arch whiteslate
-x 5
-y 7
-end
-arch whiteslate
-x 5
+x 7
 y 8
 end
 arch whiteslate
-x 5
-y 9
-end
-arch white_wall_2_1_2
-x 5
+x 7
 y 9
 end
 arch whiteslate
-x 6
+x 7
+y 10
+end
+arch whiteslate
+x 7
+y 11
+end
+arch white_wall_2_1_2
+x 7
+y 11
+end
+arch grass
+x 7
+y 12
+end
+arch grass
+x 7
+y 13
+end
+arch grass
+x 8
+end
+arch grass
+x 8
+y 1
+end
+arch whiteslate
+x 8
+y 2
 end
 arch white_wall_3_3
-x 6
-end
-arch whiteslate
-x 6
-y 1
-end
-arch white_wall_2_1_1
-x 6
-y 1
-end
-arch whiteslate
-x 6
-y 2
-end
-arch white_wall_2_1_1
-x 6
+x 8
 y 2
 end
 arch whiteslate
-x 6
+x 8
 y 3
 end
 arch white_wall_2_1_1
-x 6
+x 8
 y 3
 end
 arch whiteslate
-x 6
+x 8
 y 4
 end
+arch white_wall_2_1_1
+x 8
+y 4
+end
+arch whiteslate
+x 8
+y 5
+end
+arch white_wall_2_1_1
+x 8
+y 5
+end
+arch whiteslate
+x 8
+y 6
+end
 arch white_wall_2_2_1
-x 6
-y 4
-end
-arch whiteslate
-x 6
-y 5
-end
-arch whiteslate
-x 6
-y 6
-end
-arch white_wall_2_1_2
-x 6
+x 8
 y 6
 end
 arch whiteslate
-x 6
+x 8
 y 7
 end
 arch whiteslate
-x 6
+x 8
+y 8
+end
+arch white_wall_2_1_2
+x 8
 y 8
 end
 arch whiteslate
-x 6
-y 9
-end
-arch white_wall_2_1_2
-x 6
+x 8
 y 9
 end
 arch whiteslate
-x 7
-end
-arch white_wall_2_1_2
-x 7
+x 8
+y 10
 end
 arch whiteslate
-x 7
+x 8
+y 11
+end
+arch white_wall_2_1_2
+x 8
+y 11
+end
+arch grass
+x 8
+y 12
+end
+arch grass
+x 8
+y 13
+end
+arch grass
+x 9
+end
+arch grass
+x 9
 y 1
 end
+arch whiteslate
+x 9
+y 2
+end
+arch white_wall_2_1_2
+x 9
+y 2
+end
+arch whiteslate
+x 9
+y 3
+end
 arch chair_1.1
-x 7
-y 1
+x 9
+y 3
 end
 arch whiteslate
-x 7
-y 2
+x 9
+y 4
 end
 arch table_2
-x 7
-y 2
-end
-arch whiteslate
-x 7
-y 3
-end
-arch whiteslate
-x 7
+x 9
 y 4
 end
+arch whiteslate
+x 9
+y 5
+end
+arch whiteslate
+x 9
+y 6
+end
 arch white_wall_1_3
-x 7
-y 4
-end
-arch whiteslate
-x 7
-y 5
-end
-arch whiteslate
-x 7
-y 6
-end
-arch white_wall_2_1_2
-x 7
+x 9
 y 6
 end
 arch whiteslate
-x 7
+x 9
 y 7
 end
 arch whiteslate
-x 7
+x 9
+y 8
+end
+arch white_wall_2_1_2
+x 9
 y 8
 end
 arch whiteslate
-x 7
+x 9
 y 9
 end
+arch whiteslate
+x 9
+y 10
+end
+arch whiteslate
+x 9
+y 11
+end
 arch white_wall_win2
-x 7
-y 9
+x 9
+y 11
+end
+arch grass
+x 9
+y 12
+end
+arch grass
+x 9
+y 13
+end
+arch grass
+x 10
+end
+arch grass
+x 10
+y 1
 end
 arch whiteslate
-x 8
+x 10
+y 2
 end
 arch white_wall_2_1_2
-x 8
+x 10
+y 2
 end
 arch whiteslate
-x 8
-y 1
+x 10
+y 3
 end
 arch bookshelf_right
-x 8
-y 1
-end
-arch whiteslate
-x 8
-y 2
-end
-arch whiteslate
-x 8
+x 10
 y 3
 end
 arch whiteslate
-x 8
+x 10
 y 4
 end
 arch whiteslate
-x 8
+x 10
 y 5
 end
 arch whiteslate
-x 8
-y 6
-end
-arch white_wall_2_1_2
-x 8
+x 10
 y 6
 end
 arch whiteslate
-x 8
+x 10
 y 7
 end
 arch whiteslate
-x 8
+x 10
 y 8
 end
+arch white_wall_2_1_2
+x 10
+y 8
+end
+arch whiteslate
+x 10
+y 9
+end
+arch whiteslate
+x 10
+y 10
+end
 arch bed_1
-x 8
-y 8
+x 10
+y 10
 end
 arch whiteslate
-x 8
-y 9
+x 10
+y 11
 end
 arch white_wall_2_1_2
-x 8
-y 9
+x 10
+y 11
+end
+arch grass
+x 10
+y 12
+end
+arch grass
+x 10
+y 13
+end
+arch grass
+x 11
+end
+arch grass
+x 11
+y 1
 end
 arch whiteslate
-x 9
+x 11
+y 2
 end
 arch white_wall_2_2_3
-x 9
-end
-arch whiteslate
-x 9
-y 1
-end
-arch white_wall_2_1_1
-x 9
-y 1
-end
-arch whiteslate
-x 9
-y 2
-end
-arch white_wall_2_1_1
-x 9
+x 11
 y 2
 end
 arch whiteslate
-x 9
+x 11
 y 3
 end
 arch white_wall_2_1_1
-x 9
+x 11
 y 3
 end
 arch whiteslate
-x 9
+x 11
 y 4
 end
 arch white_wall_2_1_1
-x 9
+x 11
 y 4
 end
 arch whiteslate
-x 9
+x 11
 y 5
 end
 arch white_wall_2_1_1
-x 9
+x 11
 y 5
 end
 arch whiteslate
-x 9
+x 11
 y 6
 end
+arch white_wall_2_1_1
+x 11
+y 6
+end
+arch whiteslate
+x 11
+y 7
+end
+arch white_wall_2_1_1
+x 11
+y 7
+end
+arch whiteslate
+x 11
+y 8
+end
 arch white_wall_3_4
-x 9
-y 6
-end
-arch whiteslate
-x 9
-y 7
-end
-arch white_wall_2_1_1
-x 9
-y 7
-end
-arch whiteslate
-x 9
-y 8
-end
-arch white_wall_2_1_1
-x 9
+x 11
 y 8
 end
 arch whiteslate
-x 9
+x 11
 y 9
 end
+arch white_wall_2_1_1
+x 11
+y 9
+end
+arch whiteslate
+x 11
+y 10
+end
+arch white_wall_2_1_1
+x 11
+y 10
+end
+arch whiteslate
+x 11
+y 11
+end
 arch white_wall_2_2_4
-x 9
+x 11
+y 11
+end
+arch grass
+x 11
+y 12
+end
+arch grass
+x 11
+y 13
+end
+arch grass
+x 12
+end
+arch grass
+x 12
+y 1
+end
+arch grass
+x 12
+y 2
+end
+arch grass
+x 12
+y 3
+end
+arch grass
+x 12
+y 4
+end
+arch grass
+x 12
+y 5
+end
+arch grass
+x 12
+y 6
+end
+arch grass
+x 12
+y 7
+end
+arch grass
+x 12
+y 8
+end
+arch grass
+x 12
 y 9
 end
+arch grass
+x 12
+y 10
+end
+arch grass
+x 12
+y 11
+end
+arch grass
+x 12
+y 12
+end
+arch grass
+x 12
+y 13
+end
+arch cobblestones2
+x 13
+end
+arch cobblestones2
+x 13
+y 1
+end
+arch cobblestones2
+x 13
+y 2
+end
+arch cobblestones2
+x 13
+y 3
+end
+arch cobblestones2
+x 13
+y 4
+end
+arch cobblestones2
+x 13
+y 5
+end
+arch cobblestones2
+x 13
+y 6
+end
+arch cobblestones2
+x 13
+y 7
+end
+arch cobblestones2
+x 13
+y 8
+end
+arch cobblestones2
+x 13
+y 9
+end
+arch cobblestones2
+x 13
+y 10
+end
+arch cobblestones2
+x 13
+y 11
+end
+arch cobblestones2
+x 13
+y 12
+end
+arch cobblestones2
+x 13
+y 13
+end
diff --git a/world/world_122_117 b/world/world_122_117
index 055559a48..3b0670041 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2019-01-01 Jason Zheng
+Modified: 2020-07-31 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -149,8 +149,8 @@ end
 arch s_house1
 name Iscar's House
 slaying /navar_city/iscar
-hp 2
-sp 9
+hp 4
+sp 10
 y 14
 end
 arch dungeon_magic