From 315e7e840cd00e4ae9be261cbe3a0b29e4b6d394 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Tue, 30 Aug 2005 19:50:52 +0000 Subject: [PATCH] Move magic mouths and invisible exits below floor to prevent detection by show invisible. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3575 282e977c-c81d-0410-88c4-b93c2d0d6712 --- dragonisland/advguild | 8 +- dragonisland/advguild2 | 36 +++--- dragonisland/advguild3 | 8 +- dragonisland/apartment2 | 8 +- dragonisland/apartment3 | 16 +-- dragonisland/damarishouse1 | 8 +- dragonisland/damarishouse2 | 8 +- dragonisland/dragonmountain0 | 6 +- dragonisland/dragonmountain1 | 8 +- dragonisland/house1 | 6 +- dragonisland/house6 | 8 +- dragonisland/housebrxzl | 220 +++++++++++++++-------------------- dragonisland/intwell | 14 +-- dragonisland/keysale | 14 +-- dragonisland/luxhouse | 12 +- dragonisland/thievesden | 20 ++-- 16 files changed, 186 insertions(+), 214 deletions(-) diff --git a/dragonisland/advguild b/dragonisland/advguild index acfd9c56e..1397ae1a0 100644 --- a/dragonisland/advguild +++ b/dragonisland/advguild @@ -1595,10 +1595,6 @@ arch wall_1_2 x 8 y 9 end -arch woodfloor -x 8 -y 10 -end arch magic_mouth msg Local Guild Bank @@ -1608,6 +1604,10 @@ y 10 end arch woodfloor x 8 +y 10 +end +arch woodfloor +x 8 y 11 end arch wall_1_3 diff --git a/dragonisland/advguild2 b/dragonisland/advguild2 index f552d9c28..3a0c3dd09 100644 --- a/dragonisland/advguild2 +++ b/dragonisland/advguild2 @@ -2231,15 +2231,6 @@ x 11 y 14 connected 4 end -arch button_small -x 11 -y 15 -connected 2 -end -arch woodfloor -x 11 -y 15 -end arch magic_mouth msg Practicing against floating, @@ -2249,6 +2240,15 @@ endmsg x 11 y 15 end +arch button_small +x 11 +y 15 +connected 2 +end +arch woodfloor +x 11 +y 15 +end arch woodfloor x 11 y 16 @@ -2632,15 +2632,6 @@ x 13 y 10 connected 3 end -arch button_small -x 13 -y 11 -connected 3 -end -arch woodfloor -x 13 -y 11 -end arch magic_mouth msg Undead practicing room - please leave @@ -2650,6 +2641,15 @@ endmsg x 13 y 11 end +arch button_small +x 13 +y 11 +connected 3 +end +arch woodfloor +x 13 +y 11 +end arch woodfloor x 13 y 12 diff --git a/dragonisland/advguild3 b/dragonisland/advguild3 index 8b3639332..ad0b9ac00 100644 --- a/dragonisland/advguild3 +++ b/dragonisland/advguild3 @@ -1580,10 +1580,6 @@ arch rune_large_icestorm x 8 y 3 end -arch dungeon_floor -x 8 -y 4 -end arch magic_mouth msg You hear a laughter in the distance. @@ -1591,6 +1587,10 @@ endmsg x 8 y 4 end +arch dungeon_floor +x 8 +y 4 +end arch rune_drain_magic x 8 y 4 diff --git a/dragonisland/apartment2 b/dragonisland/apartment2 index b7eb28e40..8e7ed7b2b 100644 --- a/dragonisland/apartment2 +++ b/dragonisland/apartment2 @@ -879,10 +879,6 @@ arch cobblestones2 x 7 y 14 end -arch grass -x 7 -y 15 -end arch invis_exit slaying /world/world_103_127 hp 4 @@ -890,6 +886,10 @@ sp 13 x 7 y 15 end +arch grass +x 7 +y 15 +end arch ggate_open x 7 y 15 diff --git a/dragonisland/apartment3 b/dragonisland/apartment3 index d1acd7460..ffe417a75 100644 --- a/dragonisland/apartment3 +++ b/dragonisland/apartment3 @@ -1258,6 +1258,14 @@ x 10 y 8 unique 1 end +arch magic_mouth +msg +You feel a strange tingling running +down your spine! +endmsg +x 10 +y 9 +end arch dungeon_floor x 10 y 9 @@ -1268,14 +1276,6 @@ x 10 y 9 no_pick 1 end -arch magic_mouth -msg -You feel a strange tingling running -down your spine! -endmsg -x 10 -y 9 -end arch dungeon_floor x 10 y 10 diff --git a/dragonisland/damarishouse1 b/dragonisland/damarishouse1 index ca5d25231..f634e0e24 100644 --- a/dragonisland/damarishouse1 +++ b/dragonisland/damarishouse1 @@ -943,10 +943,6 @@ arch grass x 10 y 13 end -arch grass -x 10 -y 14 -end arch invis_exit slaying /world/world_103_127 hp 8 @@ -954,6 +950,10 @@ sp 14 x 10 y 14 end +arch grass +x 10 +y 14 +end arch ggate_open x 10 y 14 diff --git a/dragonisland/damarishouse2 b/dragonisland/damarishouse2 index 603a8978e..d9c795bfd 100644 --- a/dragonisland/damarishouse2 +++ b/dragonisland/damarishouse2 @@ -82,10 +82,6 @@ arch woodfloor x 1 y 2 end -arch woodfloor -x 1 -y 3 -end arch magic_mouth msg You are not allowed to walk around @@ -96,6 +92,10 @@ y 3 end arch woodfloor x 1 +y 3 +end +arch woodfloor +x 1 y 4 end arch woodfloor diff --git a/dragonisland/dragonmountain0 b/dragonisland/dragonmountain0 index 9246295e0..5291d9bf1 100644 --- a/dragonisland/dragonmountain0 +++ b/dragonisland/dragonmountain0 @@ -79,9 +79,6 @@ end arch mine4 y 11 end -arch small_stones -y 12 -end arch invis_exit slaying /world/world_103_127 hp 23 @@ -89,6 +86,9 @@ sp 30 y 12 end arch small_stones +y 12 +end +arch small_stones y 13 end arch mine10 diff --git a/dragonisland/dragonmountain1 b/dragonisland/dragonmountain1 index 37ffdbb00..b7754a280 100644 --- a/dragonisland/dragonmountain1 +++ b/dragonisland/dragonmountain1 @@ -4180,10 +4180,6 @@ arch mine5 x 22 y 11 end -arch small_stones -x 22 -y 12 -end arch magic_mouth msg treasure chamber @@ -4193,6 +4189,10 @@ y 12 end arch small_stones x 22 +y 12 +end +arch small_stones +x 22 y 13 end arch mine8 diff --git a/dragonisland/house1 b/dragonisland/house1 index 3e75faed3..5f5106820 100644 --- a/dragonisland/house1 +++ b/dragonisland/house1 @@ -13,15 +13,15 @@ end arch brush y 1 end -arch cobblestones2 -y 2 -end arch invis_exit slaying /world/world_103_127 hp 9 sp 18 y 2 end +arch cobblestones2 +y 2 +end arch brush y 3 end diff --git a/dragonisland/house6 b/dragonisland/house6 index ddfba54f5..bdca2f6bd 100644 --- a/dragonisland/house6 +++ b/dragonisland/house6 @@ -2021,10 +2021,6 @@ arch woodfloor x 15 y 5 end -arch woodfloor -x 15 -y 6 -end arch magic_mouth msg So you dare enter through spikes! @@ -2032,6 +2028,10 @@ endmsg x 15 y 6 end +arch woodfloor +x 15 +y 6 +end arch spikes_moving x 15 y 6 diff --git a/dragonisland/housebrxzl b/dragonisland/housebrxzl index ba1049894..c31ce7839 100644 --- a/dragonisland/housebrxzl +++ b/dragonisland/housebrxzl @@ -2299,17 +2299,6 @@ arch river_w-e x 9 y 18 end -arch grass -x 9 -y 19 -end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 9 -y 19 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -2319,12 +2308,16 @@ y 19 end arch grass x 9 +y 19 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 9 y 20 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 9 y 20 end @@ -2444,17 +2437,6 @@ arch river_w-e x 9 y 41 end -arch grass -x 9 -y 42 -end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 9 -y 42 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -2464,12 +2446,16 @@ y 42 end arch grass x 9 +y 42 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 9 y 43 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 9 y 43 end @@ -2608,10 +2594,6 @@ arch grass x 10 y 19 end -arch cobblestones2 -x 10 -y 19 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -2619,14 +2601,14 @@ sp 9 x 10 y 19 end +arch cobblestones2 +x 10 +y 19 +end arch grass x 10 y 20 end -arch cobblestones2 -x 10 -y 20 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -2634,6 +2616,10 @@ sp 9 x 10 y 20 end +arch cobblestones2 +x 10 +y 20 +end arch blocked msg endmsg @@ -2763,6 +2749,13 @@ arch bridge_ns x 10 y 41 end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 10 +y 42 +end arch grass x 10 y 42 @@ -2776,7 +2769,7 @@ slaying /world/world_103_127 hp 12 sp 9 x 10 -y 42 +y 43 end arch grass x 10 @@ -2786,13 +2779,6 @@ arch cobblestones2 x 10 y 43 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 10 -y 43 -end arch grass x 11 end @@ -2903,10 +2889,6 @@ arch river_w-e x 11 y 18 end -arch grass -x 11 -y 19 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -2916,12 +2898,16 @@ y 19 end arch grass x 11 +y 19 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 11 y 20 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 11 y 20 end @@ -3041,10 +3027,6 @@ arch river_w-e x 11 y 41 end -arch grass -x 11 -y 42 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -3054,12 +3036,16 @@ y 42 end arch grass x 11 +y 42 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 11 y 43 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 11 y 43 end @@ -8562,17 +8548,6 @@ arch river_w-e x 32 y 41 end -arch grass -x 32 -y 42 -end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 32 -y 42 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -8582,12 +8557,16 @@ y 42 end arch grass x 32 +y 42 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 32 y 43 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 32 y 43 end @@ -8831,10 +8810,6 @@ arch grass x 33 y 42 end -arch cobblestones2 -x 33 -y 42 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -8842,14 +8817,14 @@ sp 9 x 33 y 42 end +arch cobblestones2 +x 33 +y 42 +end arch grass x 33 y 43 end -arch cobblestones2 -x 33 -y 43 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -8857,6 +8832,10 @@ sp 9 x 33 y 43 end +arch cobblestones2 +x 33 +y 43 +end arch blackmarble x 34 unique 1 @@ -9080,10 +9059,6 @@ arch river_w-e x 34 y 41 end -arch grass -x 34 -y 42 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -9093,12 +9068,16 @@ y 42 end arch grass x 34 +y 42 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 34 y 43 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 34 y 43 end @@ -12414,17 +12393,6 @@ arch river_w-e x 49 y 18 end -arch grass -x 49 -y 19 -end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 49 -y 19 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -12434,12 +12402,16 @@ y 19 end arch grass x 49 +y 19 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 49 y 20 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 49 y 20 end @@ -12575,6 +12547,13 @@ arch grass x 50 y 19 end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 50 +y 19 +end arch cobblestones2 x 50 y 19 @@ -12584,7 +12563,7 @@ slaying /world/world_103_127 hp 12 sp 9 x 50 -y 19 +y 20 end arch grass x 50 @@ -12594,13 +12573,6 @@ arch cobblestones2 x 50 y 20 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 -x 50 -y 20 -end arch blocked msg endmsg @@ -12716,10 +12688,6 @@ arch river_w-e x 51 y 18 end -arch grass -x 51 -y 19 -end arch invis_exit slaying /world/world_103_127 hp 12 @@ -12729,12 +12697,16 @@ y 19 end arch grass x 51 +y 19 +end +arch invis_exit +slaying /world/world_103_127 +hp 12 +sp 9 +x 51 y 20 end -arch invis_exit -slaying /world/world_103_127 -hp 12 -sp 9 +arch grass x 51 y 20 end diff --git a/dragonisland/intwell b/dragonisland/intwell index 6f0a3ffa7..b118d0df9 100644 --- a/dragonisland/intwell +++ b/dragonisland/intwell @@ -1744,6 +1744,13 @@ arch wwall_2_1_2 x 10 y 6 end +arch magic_mouth +msg +Congratulations! +endmsg +x 10 +y 7 +end arch dirtfloor x 10 y 7 @@ -1752,13 +1759,6 @@ arch random_treasure x 10 y 7 end -arch magic_mouth -msg -Congratulations! -endmsg -x 10 -y 7 -end arch dirtfloor x 10 y 8 diff --git a/dragonisland/keysale b/dragonisland/keysale index 9d33f45b9..739599ab9 100644 --- a/dragonisland/keysale +++ b/dragonisland/keysale @@ -799,6 +799,13 @@ y 12 speed 0.500000 connected 1 end +arch magic_mouth +msg +Come in! +endmsg +x 7 +y 13 +end arch button_small x 7 y 13 @@ -808,13 +815,6 @@ arch cobblestones2 x 7 y 13 end -arch magic_mouth -msg -Come in! -endmsg -x 7 -y 13 -end arch cobblestones2 x 7 y 14 diff --git a/dragonisland/luxhouse b/dragonisland/luxhouse index 00c33f463..a1c27fe05 100644 --- a/dragonisland/luxhouse +++ b/dragonisland/luxhouse @@ -763,9 +763,6 @@ arch wall_2_1_2 x 6 y 15 end -arch cobblestones -x 7 -end arch invis_exit slaying /world/world_102_127 hp 49 @@ -774,6 +771,9 @@ x 7 end arch cobblestones x 7 +end +arch cobblestones +x 7 y 1 end arch cobblestones @@ -882,9 +882,6 @@ arch wall_2_1_2 x 7 y 15 end -arch cobblestones -x 8 -end arch invis_exit slaying /world/world_102_127 hp 49 @@ -893,6 +890,9 @@ x 8 end arch cobblestones x 8 +end +arch cobblestones +x 8 y 1 end arch cobblestones diff --git a/dragonisland/thievesden b/dragonisland/thievesden index 275a02192..7bc65b0bc 100644 --- a/dragonisland/thievesden +++ b/dragonisland/thievesden @@ -19,9 +19,6 @@ end arch cave_11 y 1 end -arch flagstone -y 2 -end arch invis_exit slaying /world/world_103_127 hp 22 @@ -29,7 +26,7 @@ sp 11 y 2 end arch flagstone -y 3 +y 2 end arch invis_exit slaying /world/world_103_127 @@ -38,7 +35,7 @@ sp 11 y 3 end arch flagstone -y 4 +y 3 end arch invis_exit slaying /world/world_103_127 @@ -47,7 +44,7 @@ sp 11 y 4 end arch flagstone -y 5 +y 4 end arch invis_exit slaying /world/world_103_127 @@ -56,12 +53,15 @@ sp 11 y 5 end arch flagstone +y 5 +end +arch invis_exit +slaying /world/world_103_127 +hp 22 +sp 11 y 6 end -arch invis_exit -slaying /world/world_103_127 -hp 22 -sp 11 +arch flagstone y 6 end arch flagstone