From 6925ecda9528a8d85c14b77a9324cc6242775708 Mon Sep 17 00:00:00 2001
From: akirschbaum <akirschbaum@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 28 Aug 2005 16:45:35 +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@3568 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 brest/asyvan/gate5          | 24 +++++-----
 brest/brittany/dol-guldur.6 | 94 ++++++++++++++++++-------------------
 brest/brittany/enigme.2     |  8 ++--
 brest/brittany/hole         |  8 ++--
 brest/brittany/khazad.3     | 16 +++----
 brest/jes.admini            | 24 +++++-----
 brest/jes.admini.1          | 16 +++----
 brest/pshops/pshops_main    | 34 +++++++-------
 brest/pshops/ugriver1       | 62 ++++++++++++------------
 brest/sport.jess            |  8 ++--
 brest/underground           | 16 +++----
 11 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/brest/asyvan/gate5 b/brest/asyvan/gate5
index f7b5d09c6..b046cb931 100644
--- a/brest/asyvan/gate5
+++ b/brest/asyvan/gate5
@@ -2450,10 +2450,6 @@ arch devil
 x 16
 y 8
 end
-arch dirtfloor
-x 16
-y 9
-end
 arch magic_mouth
 msg
 
@@ -2464,6 +2460,10 @@ y 9
 end
 arch dirtfloor
 x 16
+y 9
+end
+arch dirtfloor
+x 16
 y 10
 end
 arch devil
@@ -2616,10 +2616,6 @@ arch devil
 x 17
 y 8
 end
-arch dirtfloor
-x 17
-y 9
-end
 arch magic_mouth
 msg
 
@@ -2630,6 +2626,10 @@ y 9
 end
 arch dirtfloor
 x 17
+y 9
+end
+arch dirtfloor
+x 17
 y 10
 end
 arch devil
@@ -2940,10 +2940,6 @@ arch devil
 x 19
 y 7
 end
-arch dirtfloor
-x 19
-y 8
-end
 arch magic_mouth
 msg
 
@@ -2953,6 +2949,10 @@ endmsg
 x 19
 y 8
 end
+arch dirtfloor
+x 19
+y 8
+end
 arch button_handle
 x 19
 y 8
diff --git a/brest/brittany/dol-guldur.6 b/brest/brittany/dol-guldur.6
index 7de9fbccf..c0bb44d41 100644
--- a/brest/brittany/dol-guldur.6
+++ b/brest/brittany/dol-guldur.6
@@ -1976,10 +1976,6 @@ end
 arch bwall_0
 x 7
 end
-arch woodfloor
-x 7
-y 1
-end
 arch magic_mouth
 msg
 Aleeert !!!
@@ -1987,13 +1983,13 @@ endmsg
 x 7
 y 1
 end
-arch door_look_2
+arch woodfloor
 x 7
 y 1
 end
-arch woodfloor
+arch door_look_2
 x 7
-y 2
+y 1
 end
 arch magic_mouth
 msg
@@ -2002,13 +1998,13 @@ endmsg
 x 7
 y 2
 end
-arch door_look_2
+arch woodfloor
 x 7
 y 2
 end
-arch woodfloor
+arch door_look_2
 x 7
-y 3
+y 2
 end
 arch magic_mouth
 msg
@@ -2017,6 +2013,10 @@ endmsg
 x 7
 y 3
 end
+arch woodfloor
+x 7
+y 3
+end
 arch door_look_2
 x 7
 y 3
@@ -6930,44 +6930,44 @@ end
 arch bwall_0
 x 25
 end
+arch magic_mouth
+msg
+Who dares to disturb my sleeping...
+endmsg
+x 25
+y 1
+end
 arch woodfloor
 x 25
 y 1
 end
+arch door_look_2
+x 25
+y 1
+end
 arch magic_mouth
 msg
 Who dares to disturb my sleeping...
 endmsg
 x 25
-y 1
-end
-arch door_look_2
-x 25
-y 1
+y 2
 end
 arch woodfloor
 x 25
 y 2
 end
+arch door_look_2
+x 25
+y 2
+end
 arch magic_mouth
 msg
 Who dares to disturb my sleeping...
 endmsg
 x 25
-y 2
-end
-arch door_look_2
-x 25
-y 2
-end
-arch woodfloor
-x 25
 y 3
 end
-arch magic_mouth
-msg
-Who dares to disturb my sleeping...
-endmsg
+arch woodfloor
 x 25
 y 3
 end
@@ -7599,11 +7599,11 @@ end
 arch bwall_0
 x 27
 end
-arch woodfloor
+arch magic_mouth
 x 27
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 27
 y 1
 end
@@ -7873,11 +7873,11 @@ end
 arch bwall_0
 x 28
 end
-arch woodfloor
+arch magic_mouth
 x 28
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 28
 y 1
 end
@@ -8147,11 +8147,11 @@ end
 arch bwall_0
 x 29
 end
-arch woodfloor
+arch magic_mouth
 x 29
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 29
 y 1
 end
@@ -8421,11 +8421,11 @@ end
 arch bwall_0
 x 30
 end
-arch woodfloor
+arch magic_mouth
 x 30
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 30
 y 1
 end
@@ -8695,11 +8695,11 @@ end
 arch bwall_0
 x 31
 end
-arch woodfloor
+arch magic_mouth
 x 31
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 31
 y 1
 end
@@ -8976,11 +8976,11 @@ end
 arch bwall_0
 x 32
 end
-arch woodfloor
+arch magic_mouth
 x 32
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 32
 y 1
 end
@@ -9266,11 +9266,11 @@ end
 arch bwall_0
 x 33
 end
-arch woodfloor
+arch magic_mouth
 x 33
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 33
 y 1
 end
@@ -9282,11 +9282,11 @@ arch woodfloor
 x 33
 y 2
 end
-arch woodfloor
+arch magic_mouth
 x 33
 y 3
 end
-arch magic_mouth
+arch woodfloor
 x 33
 y 3
 end
@@ -9294,11 +9294,11 @@ arch table_4
 x 33
 y 3
 end
-arch woodfloor
+arch magic_mouth
 x 33
 y 4
 end
-arch magic_mouth
+arch woodfloor
 x 33
 y 4
 end
@@ -9314,11 +9314,11 @@ endmsg
 x 33
 y 4
 end
-arch woodfloor
+arch magic_mouth
 x 33
 y 5
 end
-arch magic_mouth
+arch woodfloor
 x 33
 y 5
 end
diff --git a/brest/brittany/enigme.2 b/brest/brittany/enigme.2
index e4b5fa498..f1d2bca4f 100644
--- a/brest/brittany/enigme.2
+++ b/brest/brittany/enigme.2
@@ -2016,10 +2016,6 @@ arch dungeon_floor
 x 13
 y 27
 end
-arch dungeon_floor
-x 13
-y 28
-end
 arch magic_mouth
 msg
 Look for a large button
@@ -2030,6 +2026,10 @@ y 28
 end
 arch dungeon_floor
 x 13
+y 28
+end
+arch dungeon_floor
+x 13
 y 29
 end
 arch bwall_2_1_2
diff --git a/brest/brittany/hole b/brest/brittany/hole
index 59175c6f0..43353ad4f 100644
--- a/brest/brittany/hole
+++ b/brest/brittany/hole
@@ -15438,10 +15438,6 @@ arch blob
 x 48
 y 11
 end
-arch dirtfloor
-x 48
-y 12
-end
 arch magic_mouth
 msg
 This is the private Zoo
@@ -15453,6 +15449,10 @@ endmsg
 x 48
 y 12
 end
+arch dirtfloor
+x 48
+y 12
+end
 arch blob
 x 48
 y 12
diff --git a/brest/brittany/khazad.3 b/brest/brittany/khazad.3
index f7c71eb9a..e4e4cbd1c 100644
--- a/brest/brittany/khazad.3
+++ b/brest/brittany/khazad.3
@@ -4825,10 +4825,6 @@ arch bwall_0
 x 20
 y 17
 end
-arch dungeon_floor
-x 20
-y 18
-end
 arch magic_mouth
 msg
 Chamber of Mazarbul
@@ -4836,14 +4832,14 @@ endmsg
 x 20
 y 18
 end
+arch dungeon_floor
+x 20
+y 18
+end
 arch door_look_2
 x 20
 y 18
 end
-arch dungeon_floor
-x 20
-y 19
-end
 arch magic_mouth
 msg
 Chamber of Mazarbul
@@ -4851,6 +4847,10 @@ endmsg
 x 20
 y 19
 end
+arch dungeon_floor
+x 20
+y 19
+end
 arch door_look_2
 x 20
 y 19
diff --git a/brest/jes.admini b/brest/jes.admini
index aefa84640..7b7ec3264 100644
--- a/brest/jes.admini
+++ b/brest/jes.admini
@@ -4028,14 +4028,6 @@ arch woodfloor
 x 24
 y 17
 end
-arch woodfloor
-x 24
-y 18
-end
-arch gravestone
-x 24
-y 18
-end
 arch magic_mouth
 msg
 You are not allowed in this office.
@@ -4046,6 +4038,14 @@ y 18
 end
 arch woodfloor
 x 24
+y 18
+end
+arch gravestone
+x 24
+y 18
+end
+arch woodfloor
+x 24
 y 19
 end
 arch gate_open_1
@@ -4837,10 +4837,6 @@ arch woodfloor
 x 29
 y 17
 end
-arch woodfloor
-x 29
-y 18
-end
 arch magic_mouth
 msg
 Mr Bacal is very busy.
@@ -4850,6 +4846,10 @@ endmsg
 x 29
 y 18
 end
+arch woodfloor
+x 29
+y 18
+end
 arch table_3
 x 29
 y 18
diff --git a/brest/jes.admini.1 b/brest/jes.admini.1
index d1a6e0735..450c94ead 100644
--- a/brest/jes.admini.1
+++ b/brest/jes.admini.1
@@ -526,10 +526,6 @@ arch door_2
 x 1
 y 18
 end
-arch cobblestones
-x 1
-y 19
-end
 arch magic_mouth
 msg
 Brittany is a very nice place
@@ -540,6 +536,10 @@ y 19
 end
 arch cobblestones
 x 1
+y 19
+end
+arch cobblestones
+x 1
 y 20
 end
 arch cobblestones
@@ -936,10 +936,6 @@ arch door_2
 x 2
 y 18
 end
-arch cobblestones
-x 2
-y 19
-end
 arch magic_mouth
 msg
 I wish U a happy September!!!!
@@ -949,6 +945,10 @@ y 19
 end
 arch cobblestones
 x 2
+y 19
+end
+arch cobblestones
+x 2
 y 20
 end
 arch statue
diff --git a/brest/pshops/pshops_main b/brest/pshops/pshops_main
index a4e1ff139..3a1bbaad6 100644
--- a/brest/pshops/pshops_main
+++ b/brest/pshops/pshops_main
@@ -17,9 +17,6 @@ end
 arch evergreens
 y 2
 end
-arch marble
-y 3
-end
 arch invis_exit
 slaying ../../world/world_107_123
 hp 18
@@ -27,7 +24,7 @@ sp 24
 y 3
 end
 arch marble
-y 4
+y 3
 end
 arch invis_exit
 slaying ../../world/world_107_123
@@ -36,12 +33,15 @@ sp 24
 y 4
 end
 arch marble
+y 4
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 18
+sp 24
 y 5
 end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 18
-sp 24
+arch marble
 y 5
 end
 arch evergreens
@@ -1651,10 +1651,6 @@ arch evergreens
 x 42
 y 2
 end
-arch marble
-x 42
-y 3
-end
 arch invis_exit
 slaying ../../world/world_107_123
 hp 21
@@ -1664,7 +1660,7 @@ y 3
 end
 arch marble
 x 42
-y 4
+y 3
 end
 arch invis_exit
 slaying ../../world/world_107_123
@@ -1675,12 +1671,16 @@ y 4
 end
 arch marble
 x 42
+y 4
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
 y 5
 end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
+arch marble
 x 42
 y 5
 end
diff --git a/brest/pshops/ugriver1 b/brest/pshops/ugriver1
index 96a36580d..f833ed22a 100644
--- a/brest/pshops/ugriver1
+++ b/brest/pshops/ugriver1
@@ -188,6 +188,14 @@ end
 arch cave4
 x 2
 end
+arch magic_mouth
+msg
+You seem to be stuck in some sort of an underground river...
+The water is moving to fast to go back up,  I guess you'll have to find another way out.
+endmsg
+x 2
+y 1
+end
 arch earth
 x 2
 y 1
@@ -202,14 +210,6 @@ level 1
 x 2
 y 1
 end
-arch magic_mouth
-msg
-You seem to be stuck in some sort of an underground river...
-The water is moving to fast to go back up,  I guess you'll have to find another way out.
-endmsg
-x 2
-y 1
-end
 arch earth
 no_pass 1
 x 2
@@ -586,10 +586,6 @@ arch ford_we
 x 5
 y 10
 end
-arch earth
-x 5
-y 11
-end
 arch magic_mouth
 msg
 The current seems to deposit items in the soft banks of the river here.
@@ -597,6 +593,10 @@ endmsg
 x 5
 y 11
 end
+arch earth
+x 5
+y 11
+end
 arch ford_we
 x 5
 y 11
@@ -1191,10 +1191,6 @@ arch cave13
 x 10
 y 4
 end
-arch earth
-x 10
-y 5
-end
 arch magic_mouth
 msg
 The current is to strong to go that way.
@@ -1202,6 +1198,10 @@ endmsg
 x 10
 y 5
 end
+arch earth
+x 10
+y 5
+end
 arch river_w-e
 no_pass 0
 x 10
@@ -1246,10 +1246,6 @@ no_pass 0
 x 10
 y 10
 end
-arch earth
-x 10
-y 11
-end
 arch magic_mouth
 msg
 You crash through the wall.
@@ -1260,6 +1256,10 @@ food 1
 x 10
 y 11
 end
+arch earth
+x 10
+y 11
+end
 arch river_nw-se
 no_pass 0
 x 10
@@ -2104,6 +2104,17 @@ arch cave4
 x 18
 y 4
 end
+arch invis_exit
+msg
+You see a ray of light poking through a small opening and wiggle yourself back to the surface, the rocks collapsing behind you.
+Maybe next time you should be more careful in the water!
+endmsg
+slaying ../../world/world_107_123
+hp 22
+sp 24
+x 18
+y 5
+end
 arch earth
 x 18
 y 5
@@ -2118,17 +2129,6 @@ level 1
 x 18
 y 5
 end
-arch invis_exit
-msg
-You see a ray of light poking through a small opening and wiggle yourself back to the surface, the rocks collapsing behind you.
-Maybe next time you should be more careful in the water!
-endmsg
-slaying ../../world/world_107_123
-hp 22
-sp 24
-x 18
-y 5
-end
 arch earth
 no_pass 1
 x 18
diff --git a/brest/sport.jess b/brest/sport.jess
index be694b577..e08abcbed 100644
--- a/brest/sport.jess
+++ b/brest/sport.jess
@@ -7136,10 +7136,6 @@ arch wall_2_1_2
 x 34
 y 33
 end
-arch woodfloor
-x 34
-y 34
-end
 arch magic_mouth
 msg
 Truc!!!
@@ -7149,6 +7145,10 @@ y 34
 end
 arch woodfloor
 x 34
+y 34
+end
+arch woodfloor
+x 34
 y 35
 end
 arch wall_2_1_2
diff --git a/brest/underground b/brest/underground
index d6a17cda2..38647ee87 100644
--- a/brest/underground
+++ b/brest/underground
@@ -797,14 +797,6 @@ y 7
 resist_physical 30
 connected 1
 end
-arch woodfloor
-x 2
-y 8
-end
-arch dungeon_magic
-x 2
-y 8
-end
 arch magic_mouth
 msg
      Ah! Ah! Ah!
@@ -815,6 +807,14 @@ endmsg
 x 2
 y 8
 end
+arch woodfloor
+x 2
+y 8
+end
+arch dungeon_magic
+x 2
+y 8
+end
 arch dungeon_magic
 x 2
 y 9