From 620e01f2f9585a4d16a1f42ee0f4e149701bfd47 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Wed, 18 Jul 2012 05:17:00 +0000 Subject: [PATCH] Cosmetic and layout changes to Dancing Lessons (navar_city/houses/dancinglessons) in Navar. Enlarged the map to include area surrounding the house, sectioned off a stage area with chairs, made the house larger 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@18369 282e977c-c81d-0410-88c4-b93c2d0d6712 --- navar_city/houses/dancinglessons | 1241 +++++++++++++++++++++++------- world/world_121_117 | 4 +- 2 files changed, 952 insertions(+), 293 deletions(-) diff --git a/navar_city/houses/dancinglessons b/navar_city/houses/dancinglessons index 99e2c7c8a..ade450f37 100644 --- a/navar_city/houses/dancinglessons +++ b/navar_city/houses/dancinglessons @@ -2,93 +2,115 @@ arch map name Dancing Lessons difficulty 1 region navar -width 15 -height 8 +width 17 +height 14 enter_x 12 -enter_y 5 +enter_y 10 msg Created: 2012-05-19 Rick Tanner -Modified: 2012-05-19 Rick Tanner +Modified: 2012-07-17 Rick Tanner endmsg end -arch blocked +arch cobblestones2 end -arch blocked +arch cobblestones2 y 1 end -arch blocked +arch cobblestones2 y 2 end -arch blocked +arch cobblestones2 y 3 end -arch blocked +arch cobblestones2 y 4 end -arch blocked +arch cobblestones2 y 5 end -arch blocked +arch cobblestones2 y 6 end -arch blocked +arch cobblestones2 y 7 end -arch blocked +arch cobblestones2 +y 8 +end +arch cobblestones2 +y 9 +end +arch cobblestones2 +y 10 +end +arch cobblestones2 +y 11 +end +arch cobblestones2 +y 12 +end +arch cobblestones2 +y 13 +end +arch grass_only 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_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 2 end -arch woodfloor2 -x 2 -y 1 -end -arch wall_2_1_2 +arch grass_only x 2 y 1 end @@ -96,171 +118,335 @@ arch woodfloor2 x 2 y 2 end +arch woodwall_2_2_2 +x 2 +y 2 +end 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_2_1_1 +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_3_2 +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_2_1 +x 2 +y 11 +end +arch grass_only +x 2 +y 12 +end +arch grass_only +x 2 +y 13 +end +arch grass_only +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 wwall_0 +x 3 +y 3 +end +arch woodfloor2 +x 3 +y 4 +end +arch chair_1.4 +x 3 +y 4 +end +arch woodfloor2 +x 3 +y 5 +end +arch chair_1.4 +x 3 +y 5 +end +arch woodfloor2 +x 3 +y 6 +end +arch woodfloor2 +x 3 +y 7 +end +arch wwall_0 +x 3 +y 7 +end +arch woodfloor2 +x 3 +y 8 +end +arch woodwall_1_3 +x 3 +y 8 +end +arch woodfloor2 +x 3 +y 9 +end +arch woodfloor2 +x 3 +y 10 +end +arch woodfloor2 +x 3 +y 11 +end +arch woodwall_2_1_2 +x 3 +y 11 +end +arch grass_only +x 3 +y 12 +end +arch grass_only +x 3 +y 13 +end +arch grass_only +x 4 +end +arch grass_only +x 4 +y 1 +end +arch woodfloor2 +x 4 +y 2 +end +arch woodwall_2_1_2 +x 4 +y 2 +end +arch woodfloor2 +x 4 +y 3 +end +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 woodfloor2 +x 4 +y 11 +end +arch woodwall_2_1_2 +x 4 +y 11 +end +arch grass_only +x 4 +y 12 +end +arch grass_only +x 4 +y 13 +end +arch grass_only +x 5 +end +arch grass_only +x 5 +y 1 +end +arch woodfloor2 +x 5 +y 2 +end +arch woodwall_2_1_2 +x 5 +y 2 +end +arch woodlarge +x 5 +y 3 +end +arch slevel_3_2 +x 5 +y 3 +end arch dancing_girl -x 2 +x 5 y 3 end -arch woodfloor2 -x 2 +arch woodlarge +x 5 y 4 end -arch wall_2_1_2 -x 2 +arch slevel_3_2 +x 5 y 4 end -arch blocked -x 2 -y 5 -end -arch blocked -x 2 -y 6 -end -arch blocked -x 2 -y 7 -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 dancing_girl -x 3 -y 2 -end -arch woodfloor2 -x 3 -y 3 -end -arch woodfloor2 -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 woodfloor2 -x 4 -y 1 -end -arch wall_2_1_2 -x 4 -y 1 -end -arch woodfloor2 -x 4 -y 2 -end -arch dancing_girl -x 4 -y 2 -end -arch woodfloor2 -x 4 -y 3 -end -arch dancing_girl -x 4 -y 3 -end -arch woodfloor2 -x 4 -y 4 -end -arch wall_2_1_2 -x 4 -y 4 -end -arch blocked -x 4 -y 5 -end -arch blocked -x 4 -y 6 -end -arch blocked -x 4 -y 7 -end -arch blocked -x 5 -end -arch woodfloor2 -x 5 -y 1 -end -arch wall_2_1_2 -x 5 -y 1 -end -arch woodfloor2 -x 5 -y 2 -end -arch woodfloor2 -x 5 -y 3 -end -arch woodfloor2 x 5 y 4 end -arch wall_2_1_2 -x 5 -y 4 -end -arch blocked +arch woodlarge x 5 y 5 end -arch blocked +arch slevel_2_2_1 +x 5 +y 5 +end +arch woodfloor2 x 5 y 6 end -arch blocked +arch woodfloor2 x 5 y 7 end -arch blocked -x 6 +arch chair_1.3 +x 5 +y 7 end arch woodfloor2 -x 6 -y 1 +x 5 +y 8 end -arch wall_2_1_2 +arch woodwall_2_2_2 +x 5 +y 8 +end +arch woodfloor2 +x 5 +y 9 +end +arch woodwall_1_2 +x 5 +y 9 +end +arch woodfloor2 +x 5 +y 10 +end +arch woodfloor2 +x 5 +y 11 +end +arch woodwall_win2 +x 5 +y 11 +end +arch grass_only +x 5 +y 12 +end +arch grass_only +x 5 +y 13 +end +arch grass_only +x 6 +end +arch grass_only x 6 y 1 end @@ -268,46 +454,74 @@ arch woodfloor2 x 6 y 2 end -arch dancing_girl +arch woodwall_2_1_2 x 6 y 2 end -arch woodfloor2 +arch woodlarge x 6 y 3 end -arch dancing_girl -x 6 -y 3 -end -arch woodfloor2 +arch woodlarge x 6 y 4 end -arch wall_2_1_2 -x 6 -y 4 -end -arch blocked +arch woodlarge x 6 y 5 end -arch blocked +arch slevel_3_1 +x 6 +y 5 +end +arch woodfloor2 x 6 y 6 end -arch blocked +arch woodfloor2 x 6 y 7 end -arch blocked +arch chair_1.3 +x 6 +y 7 +end +arch woodfloor2 +x 6 +y 8 +end +arch woodwall_2_1_2 +x 6 +y 8 +end +arch woodfloor2 +x 6 +y 9 +end +arch woodfloor2 +x 6 +y 10 +end +arch woodfloor2 +x 6 +y 11 +end +arch woodwall_2_1_2 +x 6 +y 11 +end +arch grass_only +x 6 +y 12 +end +arch grass_only +x 6 +y 13 +end +arch grass_only x 7 end -arch woodfloor2 -x 7 -y 1 -end -arch wall_2_1_2 +arch grass_only x 7 y 1 end @@ -315,11 +529,11 @@ arch woodfloor2 x 7 y 2 end -arch dancing_girl +arch woodwall_2_1_2 x 7 y 2 end -arch woodfloor2 +arch woodlarge x 7 y 3 end @@ -327,19 +541,19 @@ arch dancing_girl x 7 y 3 end -arch woodfloor2 +arch woodlarge x 7 y 4 end -arch wall_2_2_3 +arch dancing_girl x 7 y 4 end -arch woodfloor2 +arch woodlarge x 7 y 5 end -arch wall_2_1_1 +arch slevel_3_1 x 7 y 5 end @@ -347,22 +561,50 @@ arch woodfloor2 x 7 y 6 end -arch wall_2_2_1 -x 7 -y 6 -end -arch blocked +arch woodfloor2 x 7 y 7 end -arch blocked -x 8 +arch chair_1.3 +x 7 +y 7 end arch woodfloor2 -x 8 -y 1 +x 7 +y 8 end -arch wall_2_1_2 +arch woodwall_2_1_2 +x 7 +y 8 +end +arch woodfloor2 +x 7 +y 9 +end +arch woodfloor2 +x 7 +y 10 +end +arch woodfloor2 +x 7 +y 11 +end +arch woodwall_2_1_2 +x 7 +y 11 +end +arch grass_only +x 7 +y 12 +end +arch grass_only +x 7 +y 13 +end +arch grass_only +x 8 +end +arch grass_only x 8 y 1 end @@ -370,15 +612,23 @@ arch woodfloor2 x 8 y 2 end -arch woodfloor2 +arch woodwall_2_1_2 +x 8 +y 2 +end +arch woodlarge x 8 y 3 end -arch woodfloor2 +arch woodlarge x 8 y 4 end -arch woodfloor2 +arch woodlarge +x 8 +y 5 +end +arch slevel_3_1 x 8 y 5 end @@ -386,22 +636,50 @@ arch woodfloor2 x 8 y 6 end -arch wall_2_1_2 -x 8 -y 6 -end -arch blocked +arch woodfloor2 x 8 y 7 end -arch blocked -x 9 +arch chair_1.3 +x 8 +y 7 end arch woodfloor2 -x 9 -y 1 +x 8 +y 8 end -arch wall_2_2_3 +arch woodwall_2_1_2 +x 8 +y 8 +end +arch woodfloor2 +x 8 +y 9 +end +arch woodfloor2 +x 8 +y 10 +end +arch woodfloor2 +x 8 +y 11 +end +arch woodwall_2_1_2 +x 8 +y 11 +end +arch grass_only +x 8 +y 12 +end +arch grass_only +x 8 +y 13 +end +arch grass_only +x 9 +end +arch grass_only x 9 y 1 end @@ -409,19 +687,31 @@ arch woodfloor2 x 9 y 2 end -arch wall_2_2_1 +arch woodwall_2_1_2 x 9 y 2 end -arch woodfloor2 +arch woodlarge x 9 y 3 end -arch woodfloor2 +arch dancing_girl +x 9 +y 3 +end +arch woodlarge x 9 y 4 end -arch woodfloor2 +arch dancing_girl +x 9 +y 4 +end +arch woodlarge +x 9 +y 5 +end +arch slevel_3_1 x 9 y 5 end @@ -429,18 +719,50 @@ arch woodfloor2 x 9 y 6 end -arch wall_2_1_2 -x 9 -y 6 -end -arch blocked +arch woodfloor2 x 9 y 7 end -arch blocked +arch chair_1.3 +x 9 +y 7 +end +arch woodfloor2 +x 9 +y 8 +end +arch woodwall_2_1_2 +x 9 +y 8 +end +arch woodfloor2 +x 9 +y 9 +end +arch woodfloor2 +x 9 +y 10 +end +arch woodfloor2 +x 9 +y 11 +end +arch woodwall_win2 +x 9 +y 11 +end +arch grass_only +x 9 +y 12 +end +arch grass_only +x 9 +y 13 +end +arch grass_only x 10 end -arch blocked +arch grass_only x 10 y 1 end @@ -448,19 +770,23 @@ arch woodfloor2 x 10 y 2 end -arch wall_2_1_2 +arch woodwall_2_1_2 x 10 y 2 end -arch woodfloor2 +arch woodlarge x 10 y 3 end -arch woodfloor2 +arch woodlarge x 10 y 4 end -arch woodfloor2 +arch woodlarge +x 10 +y 5 +end +arch slevel_3_1 x 10 y 5 end @@ -468,18 +794,50 @@ arch woodfloor2 x 10 y 6 end -arch wall_2_1_2 -x 10 -y 6 -end -arch blocked +arch woodfloor2 x 10 y 7 end -arch blocked +arch chair_1.3 +x 10 +y 7 +end +arch woodfloor2 +x 10 +y 8 +end +arch woodwall_2_1_2 +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 woodwall_2_1_2 +x 10 +y 11 +end +arch grass_only +x 10 +y 12 +end +arch grass_only +x 10 +y 13 +end +arch grass_only x 11 end -arch blocked +arch grass_only x 11 y 1 end @@ -487,46 +845,103 @@ arch woodfloor2 x 11 y 2 end -arch wall_2_1_2 +arch woodwall_2_1_2 x 11 y 2 end -arch woodfloor2 +arch woodlarge x 11 y 3 end -arch woodfloor2 +arch slevel_3_4 +x 11 +y 3 +end +arch dancing_girl +x 11 +y 3 +end +arch woodlarge x 11 y 4 end -arch woodfloor2 +arch slevel_3_4 +x 11 +y 4 +end +arch dancing_girl +x 11 +y 4 +end +arch woodlarge x 11 y 5 end +arch slevel_2_2_4 +x 11 +y 5 +end +arch woodfloor2 +x 11 +y 6 +end +arch woodfloor2 +x 11 +y 7 +end +arch chair_1.3 +x 11 +y 7 +end +arch woodfloor2 +x 11 +y 8 +end +arch woodwall_2_1_2 +x 11 +y 8 +end +arch woodfloor2 +x 11 +y 9 +end +arch woodfloor2 +x 11 +y 10 +end arch sign_w name Belly Dancing in Progress msg Madam Stomata is taking this lesson. endmsg x 11 -y 5 +y 10 end arch woodfloor2 x 11 -y 6 +y 11 end -arch wall_2_1_2 +arch woodwall_1_3 x 11 -y 6 +y 11 end -arch blocked +arch dungeon_magic x 11 -y 7 +y 12 end -arch blocked +arch grass_only +x 11 +y 12 +move_block all +end +arch grass_only +x 11 +y 13 +end +arch grass_only x 12 end -arch blocked +arch grass_only x 12 y 1 end @@ -534,7 +949,7 @@ arch woodfloor2 x 12 y 2 end -arch wall_2_1_2 +arch woodwall_2_1_2 x 12 y 2 end @@ -550,29 +965,62 @@ arch woodfloor2 x 12 y 5 end -arch oakdoor +arch woodfloor2 +x 12 +y 6 +end +arch woodfloor2 +x 12 +y 7 +end +arch chair_1.3 +x 12 +y 7 +end +arch woodfloor2 +x 12 +y 8 +end +arch woodwall_2_1_2 +x 12 +y 8 +end +arch woodfloor2 +x 12 +y 9 +end +arch woodfloor2 +x 12 +y 10 +end +arch woodfloor2 +x 12 +y 11 +end +arch oakdoor_2 slaying /world/world_121_117 hp 45 sp 2 x 12 -y 5 +y 11 end -arch woodfloor2 +arch dungeon_magic x 12 -y 6 +y 12 end -arch wall_2_1_2 +arch grass_only x 12 -y 6 +y 12 +move_block all end -arch blocked +arch grass_only x 12 -y 7 +y 13 end -arch blocked +arch grass_only x 13 end -arch blocked +arch grass_only x 13 y 1 end @@ -580,7 +1028,7 @@ arch woodfloor2 x 13 y 2 end -arch wall_2_2_3 +arch woodwall_2_1_2 x 13 y 2 end @@ -588,7 +1036,7 @@ arch woodfloor2 x 13 y 3 end -arch wall_2_1_1 +arch wwall_0 x 13 y 3 end @@ -596,7 +1044,7 @@ arch woodfloor2 x 13 y 4 end -arch wall_2_1_1 +arch chair_1.2 x 13 y 4 end @@ -604,7 +1052,7 @@ arch woodfloor2 x 13 y 5 end -arch wall_2_1_1 +arch chair_1.2 x 13 y 5 end @@ -612,42 +1060,253 @@ arch woodfloor2 x 13 y 6 end -arch wall_2_2_4 -x 13 -y 6 -end -arch blocked +arch woodfloor2 x 13 y 7 end -arch blocked +arch wwall_0 +x 13 +y 7 +end +arch woodfloor2 +x 13 +y 8 +end +arch woodwall_2_1_2 +x 13 +y 8 +end +arch woodfloor2 +x 13 +y 9 +end +arch woodfloor2 +x 13 +y 10 +end +arch woodfloor2 +x 13 +y 11 +end +arch woodwall_1_4 +x 13 +y 11 +end +arch dungeon_magic +x 13 +y 12 +end +arch grass_only +x 13 +y 12 +move_block all +end +arch grass_only +x 13 +y 13 +end +arch grass_only x 14 end -arch blocked +arch grass_only x 14 y 1 end -arch blocked +arch woodfloor2 x 14 y 2 end -arch blocked +arch woodwall_2_2_3 +x 14 +y 2 +end +arch woodfloor2 x 14 y 3 end -arch blocked +arch woodwall_2_1_1 +x 14 +y 3 +end +arch woodfloor2 x 14 y 4 end -arch blocked +arch woodwall_2_1_1 +x 14 +y 4 +end +arch woodfloor2 x 14 y 5 end -arch blocked +arch woodwall_2_1_1 +x 14 +y 5 +end +arch woodfloor2 x 14 y 6 end -arch blocked +arch woodwall_2_1_1 +x 14 +y 6 +end +arch woodfloor2 x 14 y 7 end +arch woodwall_2_1_1 +x 14 +y 7 +end +arch woodfloor2 +x 14 +y 8 +end +arch woodwall_3_4 +x 14 +y 8 +end +arch woodfloor2 +x 14 +y 9 +end +arch woodwall_2_1_1 +x 14 +y 9 +end +arch woodfloor2 +x 14 +y 10 +end +arch woodwall_2_1_1 +x 14 +y 10 +end +arch woodfloor2 +x 14 +y 11 +end +arch woodwall_2_2_4 +x 14 +y 11 +end +arch grass_only +x 14 +y 12 +end +arch grass_only +x 14 +y 13 +end +arch grass_only +x 15 +end +arch grass_only +x 15 +y 1 +end +arch grass_only +x 15 +y 2 +end +arch grass_only +x 15 +y 3 +end +arch grass_only +x 15 +y 4 +end +arch grass_only +x 15 +y 5 +end +arch grass_only +x 15 +y 6 +end +arch grass_only +x 15 +y 7 +end +arch grass_only +x 15 +y 8 +end +arch grass_only +x 15 +y 9 +end +arch grass_only +x 15 +y 10 +end +arch grass_only +x 15 +y 11 +end +arch grass_only +x 15 +y 12 +end +arch grass_only +x 15 +y 13 +end +arch grass_only +x 16 +end +arch grass_only +x 16 +y 1 +end +arch grass_only +x 16 +y 2 +end +arch grass_only +x 16 +y 3 +end +arch grass_only +x 16 +y 4 +end +arch grass_only +x 16 +y 5 +end +arch grass_only +x 16 +y 6 +end +arch grass_only +x 16 +y 7 +end +arch grass_only +x 16 +y 8 +end +arch grass_only +x 16 +y 9 +end +arch grass_only +x 16 +y 10 +end +arch grass_only +x 16 +y 11 +end +arch grass_only +x 16 +y 12 +end +arch grass_only +x 16 +y 13 +end diff --git a/world/world_121_117 b/world/world_121_117 index 18c54f443..a0c4ea2d4 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-16 Rick Tanner +Modified: 2012-07-17 Rick Tanner endmsg outdoor 1 tile_path_1 world_121_116 @@ -12853,7 +12853,7 @@ arch house_1 name Dancing Lessons slaying ../navar_city/houses/dancinglessons hp 12 -sp 5 +sp 10 x 45 y 2 end