Merged in missing maps, updated exits and map paths.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5710 282e977c-c81d-0410-88c4-b93c2d0d6712

mlab/citydeclouds/cdccastlekeepb1

@@ -972,13 +972,8 @@ name_pl stonefloor
 x 4
 y 16
 end
-arch perm_magic_portal
-x 4
-y 16
-end
 arch whirlwind_exit
-slaying citydeclouds2
-hp 99
+slaying /citydeclouds/citydeclouds2G
 sp 15
 x 4
 y 16

mlab/citydeclouds/citydeclouds2C

@@ -18690,13 +18690,6 @@ arch marble
 x 49
 y 25
 end
-arch stair_up_4
-slaying cdccotgf1
-hp 18
-sp 67
-x 49
-y 25
-end
 arch marble
 x 49
 y 26

mlab/citydeclouds/citydeclouds2E

@@ -14095,13 +14095,6 @@ arch dungeon_magic
 x 31
 y 10
 end
-arch invis_exit
-slaying cdcunderbigstre1
-hp 50
-sp 42
-x 31
-y 10
-end
 arch flagstone
 x 31
 y 10
@@ -14115,13 +14108,6 @@ arch dungeon_magic
 x 31
 y 11
 end
-arch invis_exit
-slaying cdcunderbigstre1
-hp 50
-sp 43
-x 31
-y 11
-end
 arch flagstone
 x 31
 y 11
@@ -14135,13 +14121,6 @@ arch dungeon_magic
 x 31
 y 12
 end
-arch invis_exit
-slaying cdcunderbigstre1
-hp 50
-sp 44
-x 31
-y 12
-end
 arch flagstone
 x 31
 y 12

mlab/citydeclouds/citydeclouds2F

@@ -134,24 +134,12 @@ end
 arch flagstone
 y 17
 end
-arch stair_down_4
-slaying cdcunderbigstre1
-hp 19
-sp 98
-y 17
-end
 arch dungeon_magic
 y 18
 end
 arch flagstone
 y 18
 end
-arch stair_up_4
-slaying cdccotgf1
-hp 19
-sp 60
-y 18
-end
 arch dungeon_magic
 y 19
 end
@@ -6811,13 +6799,6 @@ arch dungeon_floor
 x 15
 y 38
 end
-arch stair_up_2
-slaying cdccotgf1
-hp 34
-sp 80
-x 15
-y 38
-end
 arch dungeon_floor
 x 15
 y 39
@@ -21805,13 +21786,6 @@ arch marble
 x 44
 y 15
 end
-arch stair_3_up
-slaying cdccotgf1
-hp 63
-sp 57
-x 44
-y 15
-end
 arch flagstone
 name floor
 name_pl floor
@@ -23348,13 +23322,6 @@ arch marble
 x 47
 y 12
 end
-arch stair_3_down
-slaying cdcunderbigstre1
-hp 66
-sp 93
-x 47
-y 12
-end
 arch greenmarble
 x 47
 y 13

mlab/citydeclouds/citydeclouds2G

@@ -10228,8 +10228,7 @@ unique 1
 end
 arch ladder_bi_up
 name ladder to secure discussion room (2nd floor)
-name_pl ladder to secure discussion room
-slaying citydecloudsvilla/citydecloudsvillaC1
+slaying /mlab/citydeclouds/villa/citydecloudsvillaC1
 hp 6
 sp 6
 x 20
@@ -11403,8 +11402,7 @@ unique 1
 end
 arch stair_down_1
 name enchanted fountain
-name_pl enchanted fountain
-slaying tavernb3
+slaying /navar_city/mlab/tavernb3
 face fountain.111
 hp 41
 sp 7
@@ -15708,14 +15706,6 @@ x 29
 y 23
 unique 1
 end
-arch stair_up_1
-name stairs to 2nd floor
-slaying /mlab/citydeclouds/villa/citydecloudsvillaC1
-hp 22
-sp 7
-x 29
-y 23
-end
 arch light3
 x 29
 y 24

mlab/mlabscrntrd2

@@ -8087,7 +8087,7 @@ x 23
 y 2
 end
 arch dragon_exit
-slaying /mlab/cloudworlddecity
+slaying /mlab/citydeclouds/cloudworlddecity
 msg
 You feel very tired.
 You dream of dragons and the sky...

navar_city/mlab/tadobebuild3

@@ -12071,11 +12071,10 @@ no_pass 0
 blocksview 0
 end
 arch dragon_exit
-slaying /mlab/cloudworlddecity
+slaying /mlab/citydeclouds/cloudworlddecity
 msg
 You feel very tired.
 You dream of dragons and the sky...
-
 endmsg
 hp 29
 sp 112

navar_city/mlab/tavernb3

@@ -1568,10 +1568,9 @@ y 7
 end
 arch stair_up_2
 name enchanted pentagram
-name_pl enchanted pentagram
-slaying /mlab/citydeclouds2
+slaying /mlab/citydeclouds/citydeclouds2G
 face penta.111
-hp 122
+hp 22
 sp 31
 x 41
 y 7

navar_city/mlab/ttowerchoswld1

@@ -2,6 +2,7 @@ arch map
 name Chaos
 reset_timeout 7200
 difficulty 1
+region navar
 darkness 3
 width 64
 height 64
@@ -8657,20 +8658,14 @@ arch cmarsh
 x 19
 y 44
 end
-arch invis_exit
-slaying ttower34
-hp 12
-sp 9
-x 19
-y 45
-end
 arch cmarsh
 x 19
 y 45
 end
 arch perm_magic_portal
-hp 0
-sp 0
+slaying ttower34
+hp 12
+sp 9
 x 19
 y 45
 end