Unify maps.

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

lake_country/ebony/entrance1

@@ -105,6 +105,9 @@ end
 arch dun4
 y 15
 end
+arch marble
+x 1
+end
 arch dun2
 x 1
 end
@@ -1851,14 +1854,26 @@ arch dun11
 x 11
 y 12
 end
-arch dun11
+arch marble
 x 11
 y 13
 end
 arch dun11
 x 11
+y 13
+end
+arch marble
+x 11
 y 14
 end
+arch dun11
+x 11
+y 14
+end
+arch marble
+x 11
+y 15
+end
 arch dun13
 x 11
 y 15
@@ -1973,7 +1988,7 @@ arch dun14
 x 12
 y 11
 end
-arch cobblestones
+arch cobblestones2
 x 12
 y 12
 end
@@ -1981,14 +1996,26 @@ arch dun17
 x 12
 y 12
 end
-arch dun14
+arch cobblestones2
 x 12
 y 13
 end
 arch dun14
 x 12
+y 13
+end
+arch cobblestones2
+x 12
 y 14
 end
+arch dun14
+x 12
+y 14
+end
+arch cobblestones2
+x 12
+y 15
+end
 arch dun13
 x 12
 y 15
@@ -2167,6 +2194,10 @@ sp 20
 x 13
 y 14
 end
+arch cobblestones2
+x 13
+y 15
+end
 arch dun2
 x 13
 y 15
@@ -2380,6 +2411,10 @@ arch grass
 x 14
 y 14
 end
+arch cobblestones2
+x 14
+y 15
+end
 arch dun2
 x 14
 y 15
@@ -2478,18 +2513,34 @@ arch dun3
 x 15
 y 11
 end
-arch dun3
+arch cobblestones2
 x 15
 y 12
 end
 arch dun3
 x 15
+y 12
+end
+arch cobblestones2
+x 15
 y 13
 end
 arch dun3
 x 15
+y 13
+end
+arch cobblestones2
+x 15
 y 14
 end
+arch dun3
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
 arch dun7
 x 15
 y 15
@@ -2571,7 +2622,6 @@ end
 arch boulder
 x 17
 y 1
-invisible 1
 end
 arch blocked
 x 17

lake_country/ebony/entrance2

@@ -11,53 +11,103 @@ Created:  1995-04-22
 Modified: 2011-08-27 Andreas Kirschbaum
 endmsg
 end
+arch marble
+end
 arch dun10
 end
+arch marble
+y 1
+end
 arch dun3
 y 1
 end
+arch marble
+y 2
+end
 arch dun3
 y 2
 end
+arch marble
+y 3
+end
 arch dun3
 y 3
 end
+arch marble
+y 4
+end
 arch dun3
 y 4
 end
+arch marble
+y 5
+end
 arch dun3
 y 5
 end
+arch marble
+y 6
+end
 arch dun3
 y 6
 end
+arch marble
+y 7
+end
 arch dun3
 y 7
 end
+arch marble
+y 8
+end
 arch dun3
 y 8
 end
+arch marble
+y 9
+end
 arch dun3
 y 9
 end
+arch marble
+y 10
+end
 arch dun3
 y 10
 end
+arch marble
+y 11
+end
 arch dun3
 y 11
 end
+arch marble
+y 12
+end
 arch dun3
 y 12
 end
+arch marble
+y 13
+end
 arch dun3
 y 13
 end
+arch marble
+y 14
+end
 arch dun3
 y 14
 end
+arch marble
+y 15
+end
 arch dun4
 y 15
 end
+arch marble
+x 1
+end
 arch dun2
 x 1
 end
@@ -138,10 +188,17 @@ arch marble
 x 1
 y 14
 end
+arch marble
+x 1
+y 15
+end
 arch dun2
 x 1
 y 15
 end
+arch cobblestones
+x 2
+end
 arch dun2
 x 2
 end
@@ -295,11 +352,18 @@ y 14
 invisible 1
 connected 10
 end
-arch dun2
+arch marble
 x 2
 y 15
 end
 arch dun2
+x 2
+y 15
+end
+arch cobblestones
+x 3
+end
+arch dun2
 x 3
 end
 arch cobblestones
@@ -516,11 +580,18 @@ arch marble
 x 3
 y 14
 end
-arch dun2
+arch marble
 x 3
 y 15
 end
 arch dun2
+x 3
+y 15
+end
+arch cobblestones
+x 4
+end
+arch dun2
 x 4
 end
 arch cobblestones
@@ -657,10 +728,17 @@ y 14
 invisible 1
 connected 10
 end
+arch marble
+x 4
+y 15
+end
 arch dun2
 x 4
 y 15
 end
+arch cobblestones
+x 5
+end
 arch dun2
 x 5
 end
@@ -798,10 +876,17 @@ arch marble
 x 5
 y 14
 end
+arch marble
+x 5
+y 15
+end
 arch dun2
 x 5
 y 15
 end
+arch cobblestones
+x 6
+end
 arch dun2
 x 6
 end
@@ -941,13 +1026,19 @@ arch marble
 x 6
 y 14
 end
-arch dun2
+arch marble
 x 6
 y 15
 end
 arch dun2
+x 6
+y 15
+end
+arch cobblestones
+x 7
+end
+arch dun2
 x 7
-move_block 0
 end
 arch cobblestones
 x 7
@@ -1096,13 +1187,19 @@ arch marble
 x 7
 y 14
 end
-arch dun2
+arch marble
 x 7
 y 15
 end
 arch dun2
+x 7
+y 15
+end
+arch cobblestones
+x 8
+end
+arch dun2
 x 8
-move_block 0
 end
 arch cobblestones
 x 8
@@ -1279,10 +1376,17 @@ y 14
 invisible 1
 connected 10
 end
+arch marble
+x 8
+y 15
+end
 arch dun2
 x 8
 y 15
 end
+arch cobblestones
+x 9
+end
 arch dun2
 x 9
 end
@@ -1447,10 +1551,17 @@ arch marble
 x 9
 y 14
 end
+arch marble
+x 9
+y 15
+end
 arch dun2
 x 9
 y 15
 end
+arch cobblestones
+x 10
+end
 arch dun2
 x 10
 end
@@ -1609,11 +1720,18 @@ y 14
 invisible 1
 connected 10
 end
-arch dun2
+arch marble
 x 10
 y 15
 end
 arch dun2
+x 10
+y 15
+end
+arch cobblestones
+x 11
+end
+arch dun2
 x 11
 end
 arch magic_mouth
@@ -1656,58 +1774,113 @@ arch mover_3
 x 11
 y 2
 end
+arch cobblestones
+x 11
+y 3
+end
 arch dun10
 x 11
 y 3
 end
-arch dun11
+arch cobblestones
 x 11
 y 4
 end
 arch dun11
 x 11
+y 4
+end
+arch cobblestones
+x 11
 y 5
 end
 arch dun11
 x 11
+y 5
+end
+arch cobblestones
+x 11
 y 6
 end
 arch dun11
 x 11
+y 6
+end
+arch cobblestones
+x 11
 y 7
 end
 arch dun11
 x 11
+y 7
+end
+arch cobblestones
+x 11
 y 8
 end
 arch dun11
 x 11
+y 8
+end
+arch cobblestones
+x 11
 y 9
 end
 arch dun11
 x 11
+y 9
+end
+arch cobblestones
+x 11
 y 10
 end
 arch dun11
 x 11
+y 10
+end
+arch cobblestones
+x 11
 y 11
 end
 arch dun11
 x 11
+y 11
+end
+arch cobblestones
+x 11
 y 12
 end
 arch dun11
 x 11
+y 12
+end
+arch marble
+x 11
 y 13
 end
 arch dun11
 x 11
+y 13
+end
+arch marble
+x 11
+y 14
+end
+arch dun11
+x 11
 y 14
 end
+arch marble
+x 11
+y 15
+end
 arch dun13
 x 11
 y 15
 end
+arch cobblestones
+x 12
+end
 arch dun2
 x 12
 end
@@ -1731,18 +1904,34 @@ y 2
 speed 0.500000
 connected 4
 end
+arch cobblestones
+x 12
+y 3
+end
 arch dun9
 x 12
 y 3
 end
-arch dun14
+arch cobblestones
 x 12
 y 4
 end
 arch dun14
 x 12
+y 4
+end
+arch cobblestones
+x 12
 y 5
 end
+arch dun14
+x 12
+y 5
+end
+arch cobblestones
+x 12
+y 6
+end
 arch button_lever
 x 12
 y 6
@@ -1753,14 +1942,26 @@ x 12
 y 6
 move_block 0
 end
-arch dun14
+arch cobblestones
 x 12
 y 7
 end
 arch dun14
 x 12
+y 7
+end
+arch cobblestones
+x 12
 y 8
 end
+arch dun14
+x 12
+y 8
+end
+arch cobblestones
+x 12
+y 9
+end
 arch button_lever
 x 12
 y 9
@@ -1771,30 +1972,57 @@ x 12
 y 9
 move_block 0
 end
-arch dun14
+arch cobblestones
 x 12
 y 10
 end
 arch dun14
 x 12
+y 10
+end
+arch cobblestones
+x 12
 y 11
 end
+arch dun14
+x 12
+y 11
+end
+arch cobblestones2
+x 12
+y 12
+end
 arch dun17
 x 12
 y 12
 end
-arch dun14
+arch cobblestones2
 x 12
 y 13
 end
 arch dun14
 x 12
+y 13
+end
+arch cobblestones2
+x 12
 y 14
 end
+arch dun14
+x 12
+y 14
+end
+arch cobblestones2
+x 12
+y 15
+end
 arch dun13
 x 12
 y 15
 end
+arch cobblestones
+x 13
+end
 arch dun2
 x 13
 end
@@ -1968,10 +2196,17 @@ sp 5
 x 13
 y 14
 end
+arch cobblestones2
+x 13
+y 15
+end
 arch dun2
 x 13
 y 15
 end
+arch cobblestones
+x 14
+end
 arch dun2
 x 14
 end
@@ -2162,7 +2397,6 @@ hp 1
 sp 2
 x 14
 y 13
-speed 0.000000
 invisible 1
 connected 19
 end
@@ -2179,69 +2413,136 @@ arch cobblestones2
 x 14
 y 14
 end
+arch cobblestones2
+x 14
+y 15
+end
 arch dun2
 x 14
 y 15
 end
+arch cobblestones
+x 15
+end
 arch dun9
 x 15
 end
-arch dun3
+arch cobblestones
 x 15
 y 1
 end
 arch dun3
 x 15
+y 1
+end
+arch cobblestones
+x 15
 y 2
 end
 arch dun3
 x 15
+y 2
+end
+arch cobblestones
+x 15
 y 3
 end
 arch dun3
 x 15
+y 3
+end
+arch cobblestones
+x 15
 y 4
 end
 arch dun3
 x 15
+y 4
+end
+arch cobblestones
+x 15
 y 5
 end
 arch dun3
 x 15
+y 5
+end
+arch cobblestones
+x 15
 y 6
 end
 arch dun3
 x 15
+y 6
+end
+arch cobblestones
+x 15
 y 7
 end
 arch dun3
 x 15
+y 7
+end
+arch cobblestones
+x 15
 y 8
 end
 arch dun3
 x 15
+y 8
+end
+arch cobblestones
+x 15
 y 9
 end
 arch dun3
 x 15
+y 9
+end
+arch cobblestones
+x 15
 y 10
 end
 arch dun3
 x 15
+y 10
+end
+arch cobblestones
+x 15
 y 11
 end
 arch dun3
 x 15
+y 11
+end
+arch cobblestones2
+x 15
 y 12
 end
 arch dun3
 x 15
+y 12
+end
+arch cobblestones2
+x 15
 y 13
 end
 arch dun3
 x 15
+y 13
+end
+arch cobblestones2
+x 15
 y 14
 end
+arch dun3
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
 arch dun7
 x 15
 y 15