Corrected map paths for broken exits, merged in missing map.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5720 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-09 02:39:03 +00:00 · 2007-03-09 02:39:03 +00:00 · 8a03c79fc7
parent 9554e9a0ff
commit 8a03c79fc7
5 changed files with 27363 additions and 193 deletions
--- a/mlab/citydeclouds/cdcwgrotto1
+++ b/mlab/citydeclouds/cdcwgrotto1
--- a/mlab/citydeclouds/citydeclouds2F
+++ b/mlab/citydeclouds/citydeclouds2F
@ -5993,7 +5993,7 @@ speed 0.500000
 value 1
 end
 arch invis_exit
-slaying ../cloudworlddecity
+slaying cloudworlddecity
 hp 62
 sp 106
 x 13
@ -6424,7 +6424,7 @@ speed 0.500000
 value 1
 end
 arch invis_exit
-slaying ../cloudworlddecity
+slaying cloudworlddecity
 hp 62
 sp 106
 x 14
@ -6852,7 +6852,7 @@ speed 0.500000
 value 1
 end
 arch invis_exit
-slaying ../cloudworlddecity
+slaying cloudworlddecity
 hp 62
 sp 106
 x 15
@ -7264,7 +7264,7 @@ speed 0.500000
 value 1
 end
 arch invis_exit
-slaying ../cloudworlddecity
+slaying cloudworlddecity
 hp 62
 sp 106
 x 16
@ -17403,13 +17403,6 @@ arch marble
 x 36
 y 25
 end
-arch stair_up_2
-slaying cdccotgf1
-hp 55
-sp 67
-x 36
-y 25
-end
 arch marble
 x 36
 y 26
--- a/mlab/citydeclouds/citydeclouds2H
+++ b/mlab/citydeclouds/citydeclouds2H
@ -476,15 +476,6 @@ face shop_empty.111
 x 1
 y 21
 end
-arch stair_3_down
-name to Public Library & Wand Depository
-name_pl to Public Library & Wand Depository
-slaying cdcunderbigstre1
-hp 70
-sp 53
-x 1
-y 21
-end
 arch flagstone
 name floor
 name_pl floor
@ -1817,11 +1808,11 @@ name_pl woodfloor
 x 4
 y 28
 end
-arch dungeon_magic
+arch wwall_win1
 x 4
 y 28
 end
-arch wwall_3_2
+arch dungeon_magic
 x 4
 y 28
 end
@ -2361,6 +2352,10 @@ name_pl woodfloor
 x 5
 y 25
 end
+arch shop_books
+x 5
+y 25
+end
 arch dungeon_magic
 x 5
 y 26
@ -2371,6 +2366,10 @@ name_pl woodfloor
 x 5
 y 26
 end
+arch shop_books
+x 5
+y 26
+end
 arch dungeon_magic
 x 5
 y 27
@ -2381,6 +2380,10 @@ name_pl woodfloor
 x 5
 y 27
 end
+arch shop_books
+x 5
+y 27
+end
 arch dungeon_magic
 x 5
 y 28
@ -2391,11 +2394,7 @@ name_pl woodfloor
 x 5
 y 28
 end
-arch swall_1_4
-x 5
-y 28
-end
-arch wwall_1_3
+arch shop_books
 x 5
 y 28
 end
@ -2409,6 +2408,10 @@ name_pl woodfloor
 x 5
 y 29
 end
+arch shop_books
+x 5
+y 29
+end
 arch dungeon_magic
 x 5
 y 30
@ -2419,6 +2422,10 @@ name_pl woodfloor
 x 5
 y 30
 end
+arch shop_books
+x 5
+y 30
+end
 arch woodfloor2
 name woodfloor
 name_pl woodfloor
@ -2849,10 +2856,6 @@ name_pl woodfloor
 x 6
 y 28
 end
-arch swall_2_1_2
-x 6
-y 28
-end
 arch dungeon_magic
 x 6
 y 29
@ -2873,15 +2876,6 @@ name_pl woodfloor
 x 6
 y 30
 end
-arch stair_down_3
-name to Wand Depository
-name_pl to Wand Depository
-slaying cdcunderbigstre1
-hp 75
-sp 62
-x 6
-y 30
-end
 arch woodfloor2
 name woodfloor
 name_pl woodfloor
@ -3285,6 +3279,10 @@ name_pl woodfloor
 x 7
 y 25
 end
+arch shop_books
+x 7
+y 25
+end
 arch dungeon_magic
 x 7
 y 26
@ -3295,6 +3293,10 @@ name_pl woodfloor
 x 7
 y 26
 end
+arch shop_books
+x 7
+y 26
+end
 arch dungeon_magic
 x 7
 y 27
@ -3305,7 +3307,7 @@ name_pl woodfloor
 x 7
 y 27
 end
-arch shop_mat
+arch shop_books
 x 7
 y 27
 end
@ -3319,7 +3321,7 @@ name_pl woodfloor
 x 7
 y 28
 end
-arch swall_2_1_2
+arch shop_books
 x 7
 y 28
 end
@ -3333,7 +3335,7 @@ name_pl woodfloor
 x 7
 y 29
 end
-arch shop_mat
+arch shop_books
 x 7
 y 29
 end
@ -3771,10 +3773,6 @@ name_pl woodfloor
 x 8
 y 28
 end
-arch swall_2_2_3
-x 8
-y 28
-end
 arch dungeon_magic
 x 8
 y 29
@ -3785,10 +3783,6 @@ name_pl woodfloor
 x 8
 y 29
 end
-arch swall_2_1_1
-x 8
-y 29
-end
 arch dungeon_magic
 x 8
 y 30
@ -3799,21 +3793,13 @@ name_pl woodfloor
 x 8
 y 30
 end
-arch swall_1_2
-x 8
-y 30
-end
-arch wwall_1_1
-x 8
-y 30
-end
 arch woodfloor2
 name woodfloor
 name_pl woodfloor
 x 8
 y 31
 end
-arch wwall_3_1
+arch wwall_2_1_2
 x 8
 y 31
 end
@ -4287,6 +4273,10 @@ name_pl woodfloor
 x 9
 y 25
 end
+arch shop_books
+x 9
+y 25
+end
 arch dungeon_magic
 x 9
 y 26
@ -4297,6 +4287,10 @@ name_pl woodfloor
 x 9
 y 26
 end
+arch shop_books
+x 9
+y 26
+end
 arch dungeon_magic
 x 9
 y 27
@ -4307,6 +4301,10 @@ name_pl woodfloor
 x 9
 y 27
 end
+arch shop_books
+x 9
+y 27
+end
 arch dungeon_magic
 x 9
 y 28
@ -4317,6 +4315,10 @@ name_pl woodfloor
 x 9
 y 28
 end
+arch shop_books
+x 9
+y 28
+end
 arch dungeon_magic
 x 9
 y 29
@ -4327,6 +4329,10 @@ name_pl woodfloor
 x 9
 y 29
 end
+arch shop_books
+x 9
+y 29
+end
 arch dungeon_magic
 x 9
 y 30
--- a/mlab/citydeclouds/citydeclouds2I
+++ b/mlab/citydeclouds/citydeclouds2I
@ -21728,13 +21728,6 @@ arch dungeon_floor
 x 46
 y 6
 end
-arch stair_up_2
-slaying cdccotgf1
-hp 115
-sp 48
-x 46
-y 6
-end
 arch flagstone
 name floor
 name_pl floor
--- a/mlab/citydeclouds/villa/citydecloudsvillab1
+++ b/mlab/citydeclouds/villa/citydecloudsvillab1
@ -12795,6 +12795,10 @@ arch flagstone
 x 11
 y 28
 end
+arch dungeon_magic
+x 11
+y 29
+end
 arch flagstone
 x 11
 y 29
@ -12806,7 +12810,7 @@ connected 507
 end
 arch dungeon_magic
 x 11
-y 29
+y 30
 end
 arch button_small
 x 11
@ -12819,7 +12823,7 @@ y 30
 end
 arch dungeon_magic
 x 11
-y 30
+y 31
 end
 arch flagstone
 x 11
@ -12832,10 +12836,6 @@ x 11
 y 31
 connected 4
 end
-arch dungeon_magic
-x 11
-y 31
-end
 arch flagstone
 x 11
 y 32
@ -37568,18 +37568,6 @@ arch table_3
 x 34
 y 9
 end
-arch oakdoor
-name Hell: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/gatesofhell1
-face penta.111
-hp 14
-sp 17
-x 34
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 34
 y 10
@ -37588,18 +37576,6 @@ arch table_3
 x 34
 y 10
 end
-arch oakdoor
-name Tavern: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/tavern
-face penta.111
-hp 47
-sp 27
-x 34
-y 10
-weight 40
-no_pick 0
-end
 arch blocked
 x 34
 y 11
@ -38804,18 +38780,6 @@ arch table_3
 x 35
 y 9
 end
-arch oakdoor
-name Gates of Hell: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/gatesofhell1
-face penta.111
-hp 21
-sp 50
-x 35
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 35
 y 10
@ -38824,18 +38788,6 @@ arch table_3
 x 35
 y 10
 end
-arch oakdoor
-name Villa: Portable Teleporter
-name_pl Villa: Portable Teleporter
-slaying /mlab/citydecloudsvillab1
-face penta.111
-hp 17
-sp 31
-x 35
-y 10
-weight 40
-no_pick 0
-end
 arch blocked
 x 35
 y 11
@ -40040,18 +39992,6 @@ arch table_3
 x 36
 y 9
 end
-arch oakdoor
-name Mazes of Menace: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/mazesofmenace
-face penta.111
-hp 34
-sp 47
-x 36
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 36
 y 10
@ -40060,18 +40000,6 @@ arch table_3
 x 36
 y 10
 end
-arch oakdoor
-name University: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/university1
-face penta.111
-hp 54
-sp 116
-x 36
-y 10
-weight 40
-no_pick 0
-end
 arch blocked
 x 36
 y 11
@ -41201,18 +41129,6 @@ arch table_3
 x 37
 y 9
 end
-arch oakdoor
-name Goldmine B3: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/goldmineb3
-face penta.111
-hp 23
-sp 17
-x 37
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 37
 y 10
@ -41221,18 +41137,6 @@ arch table_3
 x 37
 y 10
 end
-arch oakdoor
-name CityDeClouds: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/citydeclouds
-face penta.111
-hp 25
-sp 19
-x 37
-y 10
-weight 40
-no_pick 0
-end
 arch blocked
 x 37
 y 11
@ -42351,18 +42255,6 @@ arch table_3
 x 38
 y 9
 end
-arch oakdoor
-name Spiral Tower: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/mlabspiraltower/stb1
-face penta.111
-hp 14
-sp 12
-x 38
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 38
 y 10
@ -43498,18 +43390,6 @@ arch table_3
 x 39
 y 9
 end
-arch oakdoor
-name Spiral Tower lvl 18: Portable Teleporter
-name_pl World: Portable Teleporter
-slaying /mlab/mlabspiraltower/sta18
-face penta.111
-hp 9
-sp 7
-x 39
-y 9
-weight 40
-no_pick 0
-end
 arch flagstone
 x 39
 y 10