From 4e11ff699896754163d3ad13a04335f52f0ee5ea Mon Sep 17 00:00:00 2001 From: rjtanner Date: Thu, 9 Aug 2012 06:20:57 +0000 Subject: [PATCH] Cosmetic and layout changes to Smokey House (navar_city/houses/smokeyhouse) in Navar. Enlarged the map to include the area surrounding the house, made the house larger and with 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@18395 282e977c-c81d-0410-88c4-b93c2d0d6712 --- navar_city/houses/smokeyhouse | 1415 ++++++++++++++++++++++++++++----- world/world_121_117 | 6 +- 2 files changed, 1237 insertions(+), 184 deletions(-) diff --git a/navar_city/houses/smokeyhouse b/navar_city/houses/smokeyhouse index a843c4ec1..da6d34092 100644 --- a/navar_city/houses/smokeyhouse +++ b/navar_city/houses/smokeyhouse @@ -2,90 +2,122 @@ arch map name Smokey House difficulty 1 region navar -width 9 -height 7 -enter_x 6 -enter_y 2 +width 19 +height 15 +enter_x 14 +enter_y 11 msg Created: 2012-05-19 Rick Tanner -Modified: 2012-05-19 Rick Tanner +Modified: 2012-08-09 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 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 cobblestones2 x 1 end -arch woodfloor2 +arch grass_only x 1 y 1 end -arch wall_2_2_2 -x 1 -y 1 -end -arch woodfloor2 +arch grass_only x 1 y 2 end -arch wall_2_1_1 -x 1 -y 2 -end -arch woodfloor2 +arch grass_only x 1 y 3 end -arch wall_2_1_1 -x 1 -y 3 -end -arch woodfloor2 +arch grass_only x 1 y 4 end -arch wall_2_1_1 -x 1 -y 4 -end -arch woodfloor2 +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 grass_only +x 1 +y 14 +end +arch cobblestones2 x 2 end -arch woodfloor2 -x 2 -y 1 -end -arch wall_2_1_2 +arch grass_only x 2 y 1 end @@ -93,7 +125,7 @@ arch woodfloor2 x 2 y 2 end -arch fireplace +arch woodwall_2_2_2 x 2 y 2 end @@ -101,46 +133,110 @@ arch woodfloor2 x 2 y 3 end +arch woodwall_2_1_1 +x 2 +y 3 +end arch woodfloor2 x 2 y 4 end +arch woodwall_2_1_1 +x 2 +y 4 +end +arch woodfloor2 +x 2 +y 5 +end +arch woodwall_2_1_1 +x 2 +y 5 +end +arch woodfloor2 +x 2 +y 6 +end +arch woodwall_win1 +x 2 +y 6 +end +arch woodfloor2 +x 2 +y 7 +end +arch woodwall_2_1_1 +x 2 +y 7 +end +arch woodfloor2 +x 2 +y 8 +end +arch woodwall_win1 +x 2 +y 8 +end +arch woodfloor2 +x 2 +y 9 +end +arch woodwall_2_1_1 +x 2 +y 9 +end +arch woodfloor2 +x 2 +y 10 +end +arch woodwall_2_1_1 +x 2 +y 10 +end +arch woodfloor2 +x 2 +y 11 +end +arch woodwall_2_1_1 +x 2 +y 11 +end +arch woodfloor2 +x 2 +y 12 +end +arch woodwall_2_2_1 +x 2 +y 12 +end +arch grass_only +x 2 +y 13 +end +arch grass_only +x 2 +y 14 +end +arch cobblestones2 +x 3 +end +arch grass_only +x 3 +y 1 +end +arch woodfloor2 +x 3 +y 2 +end +arch woodwall_2_1_2 +x 3 +y 2 +end +arch woodfloor2 +x 3 +y 3 +end arch clock -x 2 -y 4 -end -arch woodfloor2 -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 woodfloor2 -x 3 -y 1 -end -arch wall_2_1_2 -x 3 -y 1 -end -arch woodfloor2 -x 3 -y 2 -end -arch fireplace -x 3 -y 2 -end -arch woodfloor2 x 3 y 3 end @@ -148,30 +244,54 @@ arch woodfloor2 x 3 y 4 end -arch chair -x 3 -y 4 -end arch woodfloor2 x 3 y 5 end -arch wall_2_1_2 -x 3 -y 5 -end -arch blocked +arch woodfloor2 x 3 y 6 end -arch blocked -x 4 +arch woodfloor2 +x 3 +y 7 end arch woodfloor2 -x 4 -y 1 +x 3 +y 8 end -arch wall_3_3 +arch woodfloor2 +x 3 +y 9 +end +arch woodfloor2 +x 3 +y 10 +end +arch woodfloor2 +x 3 +y 11 +end +arch woodfloor2 +x 3 +y 12 +end +arch woodwall_2_1_2 +x 3 +y 12 +end +arch grass_only +x 3 +y 13 +end +arch grass_only +x 3 +y 14 +end +arch cobblestones2 +x 4 +end +arch grass_only x 4 y 1 end @@ -179,7 +299,7 @@ arch woodfloor2 x 4 y 2 end -arch wall_1_2 +arch woodwall_win2 x 4 y 2 end @@ -191,30 +311,58 @@ arch woodfloor2 x 4 y 4 end +arch woodfloor2 +x 4 +y 5 +end +arch woodfloor2 +x 4 +y 6 +end +arch woodfloor2 +x 4 +y 7 +end +arch woodfloor2 +x 4 +y 8 +end +arch woodfloor2 +x 4 +y 9 +end +arch woodfloor2 +x 4 +y 10 +end arch table_4 x 4 -y 4 +y 10 end arch woodfloor2 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 +y 11 end arch woodfloor2 -x 5 -y 1 +x 4 +y 12 end -arch wall_2_1_2 +arch woodwall_win2 +x 4 +y 12 +end +arch grass_only +x 4 +y 13 +end +arch grass_only +x 4 +y 14 +end +arch cobblestones2 +x 5 +end +arch grass_only x 5 y 1 end @@ -222,6 +370,10 @@ arch woodfloor2 x 5 y 2 end +arch woodwall_2_1_2 +x 5 +y 2 +end arch woodfloor2 x 5 y 3 @@ -230,30 +382,70 @@ arch woodfloor2 x 5 y 4 end +arch woodfloor2 +x 5 +y 5 +end +arch woodwall_0 +x 5 +y 5 +end +arch woodfloor2 +x 5 +y 6 +end +arch woodfloor2 +x 5 +y 7 +end +arch woodwall_1_4 +x 5 +y 7 +end +arch woodfloor2 +x 5 +y 8 +end +arch woodwall_0 +x 5 +y 8 +end +arch woodfloor2 +x 5 +y 9 +end +arch woodfloor2 +x 5 +y 10 +end arch chair_1.1 x 5 -y 4 +y 10 end arch woodfloor2 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 +y 11 end arch woodfloor2 -x 6 -y 1 +x 5 +y 12 end -arch wall_2_1_2 +arch woodwall_2_1_2 +x 5 +y 12 +end +arch grass_only +x 5 +y 13 +end +arch grass_only +x 5 +y 14 +end +arch cobblestones2 +x 6 +end +arch grass_only x 6 y 1 end @@ -261,10 +453,7 @@ arch woodfloor2 x 6 y 2 end -arch oakdoor -slaying /world/world_121_117 -hp 41 -sp 0 +arch woodwall_2_1_2 x 6 y 2 end @@ -272,102 +461,966 @@ arch woodfloor2 x 6 y 3 end +arch fireplace +x 6 +y 3 +end arch woodfloor2 x 6 y 4 end +arch woodfloor2 +x 6 +y 5 +end +arch woodfloor2 +x 6 +y 6 +end +arch woodfloor2 +x 6 +y 7 +end +arch woodwall_2_2_3 +x 6 +y 7 +end +arch woodfloor2 +x 6 +y 8 +end +arch woodwall_2_1_1 +x 6 +y 8 +end +arch woodfloor2 +x 6 +y 9 +end +arch woodwall_2_2_1 +x 6 +y 9 +end +arch woodfloor2 +x 6 +y 10 +end +arch woodfloor2 +x 6 +y 11 +end +arch woodfloor2 +x 6 +y 12 +end +arch woodwall_2_1_2 +x 6 +y 12 +end +arch grass_only +x 6 +y 13 +end +arch grass_only +x 6 +y 14 +end +arch cobblestones2 +x 7 +end +arch grass_only +x 7 +y 1 +end +arch woodfloor2 +x 7 +y 2 +end +arch woodwall_2_1_2 +x 7 +y 2 +end +arch woodfloor2 +x 7 +y 3 +end +arch woodfloor2 +x 7 +y 4 +end +arch woodfloor2 +x 7 +y 5 +end +arch woodfloor2 +x 7 +y 6 +end +arch woodfloor2 +x 7 +y 7 +end +arch woodfloor2 +x 7 +y 8 +end +arch woodwall_0 +x 7 +y 8 +end +arch woodfloor2 +x 7 +y 9 +end +arch woodwall_2_1_2 +x 7 +y 9 +end +arch woodfloor2 +x 7 +y 10 +end +arch woodfloor2 +x 7 +y 11 +end +arch woodfloor2 +x 7 +y 12 +end +arch woodwall_2_1_2 +x 7 +y 12 +end +arch grass_only +x 7 +y 13 +end +arch grass_only +x 7 +y 14 +end +arch cobblestones2 +x 8 +end +arch grass_only +x 8 +y 1 +end +arch woodfloor2 +x 8 +y 2 +end +arch woodwall_2_1_2 +x 8 +y 2 +end +arch woodfloor2 +x 8 +y 3 +end +arch woodfloor2 +x 8 +y 4 +end +arch woodfloor2 +x 8 +y 5 +end +arch woodfloor2 +x 8 +y 6 +end +arch woodfloor2 +x 8 +y 7 +end +arch woodfloor2 +x 8 +y 8 +end +arch woodfloor2 +x 8 +y 9 +end +arch woodwall_2_1_2 +x 8 +y 9 +end +arch woodfloor2 +x 8 +y 10 +end +arch woodfloor2 +x 8 +y 11 +end +arch woodfloor2 +x 8 +y 12 +end +arch woodwall_2_1_2 +x 8 +y 12 +end +arch grass_only +x 8 +y 13 +end +arch grass_only +x 8 +y 14 +end +arch cobblestones2 +x 9 +end +arch grass_only +x 9 +y 1 +end +arch woodfloor2 +x 9 +y 2 +end +arch woodwall_win2 +x 9 +y 2 +end +arch woodfloor2 +x 9 +y 3 +end +arch woodfloor2 +x 9 +y 4 +end +arch woodfloor2 +x 9 +y 5 +end +arch woodfloor2 +x 9 +y 6 +end +arch woodfloor2 +x 9 +y 7 +end +arch woodfloor2 +x 9 +y 8 +end +arch woodfloor2 +x 9 +y 9 +end +arch woodwall_1_3 +x 9 +y 9 +end +arch woodfloor2 +x 9 +y 10 +end +arch woodfloor2 +x 9 +y 11 +end +arch woodfloor2 +x 9 +y 12 +end +arch woodwall_win2 +x 9 +y 12 +end +arch grass_only +x 9 +y 13 +end +arch grass_only +x 9 +y 14 +end +arch cobblestones2 +x 10 +end +arch grass_only +x 10 +y 1 +end +arch woodfloor2 +x 10 +y 2 +end +arch woodwall_2_1_2 +x 10 +y 2 +end +arch woodfloor2 +x 10 +y 3 +end +arch woodfloor2 +x 10 +y 4 +end arch guildmaster name Smoking Man msg @match * Mind if I smoke? endmsg -x 6 +x 10 y 4 end arch woodfloor2 -x 6 +x 10 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 woodfloor2 -x 7 -y 1 +x 10 +y 6 end -arch wall_2_2_3 -x 7 +arch woodfloor2 +x 10 +y 7 +end +arch woodfloor2 +x 10 +y 8 +end +arch woodfloor2 +x 10 +y 9 +end +arch woodfloor2 +x 10 +y 10 +end +arch woodfloor2 +x 10 +y 11 +end +arch woodfloor2 +x 10 +y 12 +end +arch woodwall_2_1_2 +x 10 +y 12 +end +arch grass_only +x 10 +y 13 +end +arch grass_only +x 10 +y 14 +end +arch cobblestones2 +x 11 +end +arch grass_only +x 11 y 1 end arch woodfloor2 -x 7 +x 11 y 2 end -arch wall_2_1_1 -x 7 +arch woodwall_2_1_2 +x 11 y 2 end arch woodfloor2 -x 7 +x 11 y 3 end -arch wall_2_1_1 -x 7 +arch fireplace +x 11 y 3 end arch woodfloor2 -x 7 -y 4 -end -arch wall_2_1_1 -x 7 +x 11 y 4 end arch woodfloor2 -x 7 +x 11 y 5 end -arch wall_2_2_4 -x 7 -y 5 -end -arch blocked -x 7 +arch woodfloor2 +x 11 y 6 end -arch blocked -x 8 +arch woodfloor2 +x 11 +y 7 end -arch blocked -x 8 +arch woodfloor2 +x 11 +y 8 +end +arch woodfloor2 +x 11 +y 9 +end +arch woodfloor2 +x 11 +y 10 +end +arch woodfloor2 +x 11 +y 11 +end +arch woodfloor2 +x 11 +y 12 +end +arch woodwall_2_1_2 +x 11 +y 12 +end +arch grass_only +x 11 +y 13 +end +arch grass_only +x 11 +y 14 +end +arch cobblestones2 +x 12 +end +arch grass_only +x 12 y 1 end -arch blocked -x 8 +arch woodfloor2 +x 12 y 2 end -arch blocked -x 8 +arch woodwall_2_1_2 +x 12 +y 2 +end +arch woodfloor2 +x 12 y 3 end -arch blocked -x 8 +arch woodfloor2 +x 12 y 4 end -arch blocked -x 8 +arch woodfloor2 +x 12 y 5 end -arch blocked -x 8 +arch woodfloor2 +x 12 y 6 end +arch woodfloor2 +x 12 +y 7 +end +arch woodfloor2 +x 12 +y 8 +end +arch woodfloor2 +x 12 +y 9 +end +arch woodwall_2_2_2 +x 12 +y 9 +end +arch woodfloor2 +x 12 +y 10 +end +arch woodwall_2_1_1 +x 12 +y 10 +end +arch woodfloor2 +x 12 +y 11 +end +arch woodwall_2_1_1 +x 12 +y 11 +end +arch woodfloor2 +x 12 +y 12 +end +arch woodwall_3_1 +x 12 +y 12 +end +arch grass_only +x 12 +y 13 +end +arch grass_only +x 12 +y 14 +end +arch cobblestones2 +x 13 +end +arch grass_only +x 13 +y 1 +end +arch woodfloor2 +x 13 +y 2 +end +arch woodwall_2_1_2 +x 13 +y 2 +end +arch woodfloor2 +x 13 +y 3 +end +arch woodfloor2 +x 13 +y 4 +end +arch woodfloor2 +x 13 +y 5 +end +arch woodwall_0 +x 13 +y 5 +end +arch woodfloor2 +x 13 +y 6 +end +arch woodfloor2 +x 13 +y 7 +end +arch woodfloor2 +x 13 +y 8 +end +arch woodfloor2 +x 13 +y 9 +end +arch woodwall_1_3 +x 13 +y 9 +end +arch woodfloor2 +x 13 +y 10 +end +arch woodfloor2 +x 13 +y 11 +end +arch woodfloor2 +x 13 +y 12 +end +arch woodwall_1_3 +x 13 +y 12 +end +arch dungeon_magic +x 13 +y 13 +end +arch grass_only +x 13 +y 13 +move_block all +end +arch grass_only +x 13 +y 14 +end +arch cobblestones2 +x 14 +end +arch grass_only +x 14 +y 1 +end +arch woodfloor2 +x 14 +y 2 +end +arch woodwall_win2 +x 14 +y 2 +end +arch woodfloor2 +x 14 +y 3 +end +arch woodfloor2 +x 14 +y 3 +end +arch woodfloor2 +x 14 +y 4 +end +arch woodfloor2 +x 14 +y 5 +end +arch woodfloor2 +x 14 +y 6 +end +arch woodfloor2 +x 14 +y 7 +end +arch woodfloor2 +x 14 +y 8 +end +arch woodfloor2 +x 14 +y 9 +end +arch woodfloor2 +x 14 +y 10 +end +arch woodfloor2 +x 14 +y 11 +end +arch woodfloor2 +x 14 +y 12 +end +arch oakdoor_2 +slaying /world/world_121_117 +hp 41 +sp 0 +x 14 +y 12 +end +arch dungeon_magic +x 14 +y 13 +end +arch grass_only +x 14 +y 13 +move_block all +end +arch grass_only +x 14 +y 14 +end +arch cobblestones2 +x 15 +end +arch grass_only +x 15 +y 1 +end +arch woodfloor2 +x 15 +y 2 +end +arch woodwall_2_1_2 +x 15 +y 2 +end +arch woodfloor2 +x 15 +y 3 +end +arch woodfloor2 +x 15 +y 4 +end +arch woodfloor2 +x 15 +y 5 +end +arch woodfloor2 +x 15 +y 6 +end +arch woodfloor2 +x 15 +y 7 +end +arch woodfloor2 +x 15 +y 8 +end +arch woodfloor2 +x 15 +y 9 +end +arch woodwall_1_4 +x 15 +y 9 +end +arch woodfloor2 +x 15 +y 10 +end +arch woodfloor2 +x 15 +y 11 +end +arch woodfloor2 +x 15 +y 12 +end +arch woodwall_1_4 +x 15 +y 12 +end +arch dungeon_magic +x 15 +y 13 +end +arch grass_only +x 15 +y 13 +move_block all +end +arch grass_only +x 15 +y 14 +end +arch cobblestones2 +x 16 +end +arch grass_only +x 16 +y 1 +end +arch woodfloor2 +x 16 +y 2 +end +arch woodwall_2_2_3 +x 16 +y 2 +end +arch woodfloor2 +x 16 +y 3 +end +arch woodwall_2_1_1 +x 16 +y 3 +end +arch woodfloor2 +x 16 +y 4 +end +arch woodwall_2_1_1 +x 16 +y 4 +end +arch woodfloor2 +x 16 +y 5 +end +arch woodwall_2_1_1 +x 16 +y 5 +end +arch woodfloor2 +x 16 +y 6 +end +arch woodwall_win1 +x 16 +y 6 +end +arch woodfloor2 +x 16 +y 7 +end +arch woodwall_2_1_1 +x 16 +y 7 +end +arch woodfloor2 +x 16 +y 8 +end +arch woodwall_win1 +x 16 +y 8 +end +arch woodfloor2 +x 16 +y 9 +end +arch woodwall_3_4 +x 16 +y 9 +end +arch woodfloor2 +x 16 +y 10 +end +arch woodwall_2_1_1 +x 16 +y 10 +end +arch woodfloor2 +x 16 +y 11 +end +arch woodwall_2_1_1 +x 16 +y 11 +end +arch woodfloor2 +x 16 +y 12 +end +arch woodwall_2_2_4 +x 16 +y 12 +end +arch grass_only +x 16 +y 13 +end +arch grass_only +x 16 +y 14 +end +arch cobblestones2 +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 cobblestones2 +x 18 +end +arch grass_only +x 18 +y 1 +end +arch grass_only +x 18 +y 2 +end +arch grass_only +x 18 +y 3 +end +arch grass_only +x 18 +y 4 +end +arch grass_only +x 18 +y 5 +end +arch grass_only +x 18 +y 6 +end +arch grass_only +x 18 +y 7 +end +arch grass_only +x 18 +y 8 +end +arch grass_only +x 18 +y 9 +end +arch grass_only +x 18 +y 10 +end +arch grass_only +x 18 +y 11 +end +arch grass_only +x 18 +y 12 +end +arch grass_only +x 18 +y 13 +end +arch grass_only +x 18 +y 14 +end diff --git a/world/world_121_117 b/world/world_121_117 index 228008fc1..efff5cff8 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-08-08 Rick Tanner +Modified: 2012-08-09 Rick Tanner endmsg outdoor 1 tile_path_1 world_121_116 @@ -11479,8 +11479,8 @@ end arch house_1 name Smokey House slaying ../navar_city/houses/smokeyhouse -hp 6 -sp 2 +hp 14 +sp 11 x 41 end arch dungeon_magic