Cosmetic updates in regards to swall and cwall sections. Floor tile stacking re-arrangement. Added missing floor tiles in spots where floor tiles were missing. Other changes are due to map editor reformatting.

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

quests/greyshield/Doors

@@ -1,5 +1,5 @@
 arch map
-name <unnamed>
+name Doors
 width 16
 height 9
 enter_y 4

quests/greyshield/Finish

@@ -11,53 +11,100 @@ Email:
 Date: Sat Oct 26 16:06:45 1996
 endmsg
 end
+arch marble
+end
 arch flagstone_2_2_2
 end
+arch marble
+y 1
+end
 arch flagstone_2_1_1
 y 1
 end
+arch marble
+y 2
+end
 arch flagstone_2_1_1
 y 2
 end
+arch marble
+y 3
+end
 arch flagstone_2_1_1
 y 3
 end
+arch marble
+y 4
+end
 arch flagstone_2_1_1
 y 4
 end
+arch marble
+y 5
+end
 arch flagstone_2_1_1
 y 5
 end
+arch marble
+y 6
+end
 arch flagstone_2_1_1
 y 6
 end
+arch marble
+y 7
+end
 arch flagstone_2_1_1
 y 7
 end
+arch marble
+y 8
+end
 arch flagstone_2_1_1
 y 8
 end
+arch marble
+y 9
+end
 arch flagstone_2_1_1
 y 9
 end
+arch marble
+y 10
+end
 arch flagstone_2_1_1
 y 10
 end
+arch marble
+y 11
+end
 arch flagstone_2_1_1
 y 11
 end
-arch flagstone_2_1_1
+arch marble
 y 12
 end
 arch flagstone_2_1_1
+y 12
+end
+arch marble
 y 13
 end
+arch flagstone_2_1_1
+y 13
+end
+arch marble
+y 14
+end
 arch flagstone_3_2
 y 14
 end
 arch blocked
 y 15
 end
+arch marble
+x 1
+end
 arch flagstone_2_1_2
 x 1
 end
@@ -205,6 +252,10 @@ sp 45
 x 1
 y 13
 end
+arch marble
+x 1
+y 14
+end
 arch flagstone_2_1_2
 x 1
 y 14
@@ -213,6 +264,9 @@ arch blocked
 x 1
 y 15
 end
+arch marble
+x 2
+end
 arch flagstone_2_1_2
 x 2
 end
@@ -351,6 +405,10 @@ arch magic_banned
 x 2
 y 13
 end
+arch marble
+x 2
+y 14
+end
 arch flagstone_2_1_2
 x 2
 y 14
@@ -359,6 +417,9 @@ arch blocked
 x 2
 y 15
 end
+arch marble
+x 3
+end
 arch flagstone_2_1_2
 x 3
 end
@@ -497,6 +558,10 @@ arch marble
 x 3
 y 13
 end
+arch marble
+x 3
+y 14
+end
 arch flagstone_2_1_2
 x 3
 y 14
@@ -505,6 +570,9 @@ arch blocked
 x 3
 y 15
 end
+arch marble
+x 4
+end
 arch flagstone_2_1_2
 x 4
 end
@@ -643,6 +711,10 @@ arch marble
 x 4
 y 13
 end
+arch marble
+x 4
+y 14
+end
 arch flagstone_2_1_2
 x 4
 y 14
@@ -651,6 +723,9 @@ arch blocked
 x 4
 y 15
 end
+arch marble
+x 5
+end
 arch flagstone_2_1_2
 x 5
 end
@@ -777,6 +852,10 @@ arch marble
 x 5
 y 13
 end
+arch marble
+x 5
+y 14
+end
 arch flagstone_2_1_2
 x 5
 y 14
@@ -785,6 +864,9 @@ arch blocked
 x 5
 y 15
 end
+arch marble
+x 6
+end
 arch flagstone_2_1_2
 x 6
 end
@@ -971,6 +1053,10 @@ x 6
 y 13
 connected 1
 end
+arch marble
+x 6
+y 14
+end
 arch flagstone_2_1_2
 x 6
 y 14
@@ -979,6 +1065,9 @@ arch blocked
 x 6
 y 15
 end
+arch marble
+x 7
+end
 arch flagstone_2_1_2
 x 7
 end
@@ -1180,6 +1269,10 @@ x 7
 y 13
 connected 1
 end
+arch marble
+x 7
+y 14
+end
 arch flagstone_2_1_2
 x 7
 y 14
@@ -1188,6 +1281,9 @@ arch blocked
 x 7
 y 15
 end
+arch marble
+x 8
+end
 arch flagstone_2_1_2
 x 8
 end
@@ -1374,6 +1470,10 @@ x 8
 y 13
 connected 1
 end
+arch marble
+x 8
+y 14
+end
 arch flagstone_2_1_2
 x 8
 y 14
@@ -1382,6 +1482,9 @@ arch blocked
 x 8
 y 15
 end
+arch marble
+x 9
+end
 arch flagstone_2_1_2
 x 9
 end
@@ -1508,6 +1611,10 @@ arch marble
 x 9
 y 13
 end
+arch marble
+x 9
+y 14
+end
 arch flagstone_2_1_2
 x 9
 y 14
@@ -1516,6 +1623,9 @@ arch blocked
 x 9
 y 15
 end
+arch marble
+x 10
+end
 arch flagstone_2_1_2
 x 10
 end
@@ -1654,6 +1764,10 @@ arch marble
 x 10
 y 13
 end
+arch marble
+x 10
+y 14
+end
 arch flagstone_2_1_2
 x 10
 y 14
@@ -1662,6 +1776,9 @@ arch blocked
 x 10
 y 15
 end
+arch marble
+x 11
+end
 arch flagstone_2_1_2
 x 11
 end
@@ -1800,6 +1917,10 @@ arch marble
 x 11
 y 13
 end
+arch marble
+x 11
+y 14
+end
 arch flagstone_2_1_2
 x 11
 y 14
@@ -1808,6 +1929,9 @@ arch blocked
 x 11
 y 15
 end
+arch marble
+x 12
+end
 arch flagstone_2_1_2
 x 12
 end
@@ -1946,6 +2070,10 @@ arch magic_banned
 x 12
 y 13
 end
+arch marble
+x 12
+y 14
+end
 arch flagstone_2_1_2
 x 12
 y 14
@@ -1954,6 +2082,9 @@ arch blocked
 x 12
 y 15
 end
+arch marble
+x 13
+end
 arch flagstone_2_1_2
 x 13
 end
@@ -2101,6 +2232,10 @@ sp 45
 x 13
 y 13
 end
+arch marble
+x 13
+y 14
+end
 arch flagstone_2_1_2
 x 13
 y 14
@@ -2109,61 +2244,120 @@ arch blocked
 x 13
 y 15
 end
+arch marble
+x 14
+end
 arch flagstone_3_3
 x 14
 end
-arch flagstone_2_1_1
+arch marble
 x 14
 y 1
 end
 arch flagstone_2_1_1
 x 14
+y 1
+end
+arch marble
+x 14
 y 2
 end
 arch flagstone_2_1_1
 x 14
+y 2
+end
+arch marble
+x 14
 y 3
 end
 arch flagstone_2_1_1
 x 14
+y 3
+end
+arch marble
+x 14
 y 4
 end
 arch flagstone_2_1_1
 x 14
+y 4
+end
+arch marble
+x 14
 y 5
 end
 arch flagstone_2_1_1
 x 14
+y 5
+end
+arch marble
+x 14
 y 6
 end
 arch flagstone_2_1_1
 x 14
+y 6
+end
+arch marble
+x 14
 y 7
 end
 arch flagstone_2_1_1
 x 14
+y 7
+end
+arch marble
+x 14
 y 8
 end
 arch flagstone_2_1_1
 x 14
+y 8
+end
+arch marble
+x 14
 y 9
 end
 arch flagstone_2_1_1
 x 14
+y 9
+end
+arch marble
+x 14
 y 10
 end
 arch flagstone_2_1_1
 x 14
+y 10
+end
+arch marble
+x 14
 y 11
 end
 arch flagstone_2_1_1
 x 14
+y 11
+end
+arch marble
+x 14
 y 12
 end
 arch flagstone_2_1_1
 x 14
+y 12
+end
+arch marble
+x 14
 y 13
 end
+arch flagstone_2_1_1
+x 14
+y 13
+end
+arch marble
+x 14
+y 14
+end
 arch flagstone_3_1
 x 14
 y 14

quests/greyshield/GreyMaster

@@ -3561,6 +3561,10 @@ arch flagstone
 x 22
 y 21
 end
+arch swall_1_4_half
+x 22
+y 21
+end
 arch cave_13
 x 22
 y 21
@@ -3817,15 +3821,15 @@ arch marble
 x 23
 y 20
 end
-arch flagstone
-x 23
-y 21
-end
 arch dungeon_magic
 x 23
 y 21
 end
-arch swall_1_4
+arch flagstone
+x 23
+y 21
+end
+arch swall_2_1_2
 x 23
 y 21
 end
@@ -4004,15 +4008,15 @@ arch marble
 x 24
 y 20
 end
-arch flagstone
-x 24
-y 21
-end
 arch dungeon_magic
 x 24
 y 21
 end
-arch swall_1_3
+arch flagstone
+x 24
+y 21
+end
+arch swall_2_1_2
 x 24
 y 21
 end
@@ -4195,6 +4199,10 @@ arch flagstone
 x 25
 y 21
 end
+arch swall_1_3_half
+x 25
+y 21
+end
 arch cave_12
 x 25
 y 21

quests/greyshield/Greysword

@@ -937,19 +937,19 @@ face blocked.111
 x 6
 y 5
 end
-arch marble
-x 6
-y 6
-end
 arch dungeon_magic
 x 6
 y 6
 end
 arch marble
 x 6
+y 6
+end
+arch dungeon_magic
+x 6
 y 7
 end
-arch dungeon_magic
+arch marble
 x 6
 y 7
 end
@@ -958,11 +958,11 @@ x 6
 y 7
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 6
 y 8
 end
-arch dungeon_magic
+arch marble
 x 6
 y 8
 end
@@ -971,11 +971,11 @@ x 6
 y 8
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 6
 y 9
 end
-arch dungeon_magic
+arch marble
 x 6
 y 9
 end
@@ -1096,11 +1096,11 @@ face blocked.111
 x 7
 y 5
 end
-arch marble
+arch dungeon_magic
 x 7
 y 6
 end
-arch dungeon_magic
+arch marble
 x 7
 y 6
 end
@@ -1109,11 +1109,11 @@ x 7
 y 6
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 7
 y 7
 end
-arch dungeon_magic
+arch marble
 x 7
 y 7
 end
@@ -1124,11 +1124,11 @@ sp 14
 x 7
 y 7
 end
-arch marble
+arch dungeon_magic
 x 7
 y 8
 end
-arch dungeon_magic
+arch marble
 x 7
 y 8
 end
@@ -1143,11 +1143,11 @@ endmsg
 x 7
 y 8
 end
-arch marble
+arch dungeon_magic
 x 7
 y 9
 end
-arch dungeon_magic
+arch marble
 x 7
 y 9
 end
@@ -1269,11 +1269,11 @@ face blocked.111
 x 8
 y 5
 end
-arch marble
+arch dungeon_magic
 x 8
 y 6
 end
-arch dungeon_magic
+arch marble
 x 8
 y 6
 end
@@ -1282,19 +1282,19 @@ x 8
 y 6
 connected 1
 end
-arch marble
-x 8
-y 7
-end
 arch dungeon_magic
 x 8
 y 7
 end
 arch marble
 x 8
+y 7
+end
+arch dungeon_magic
+x 8
 y 8
 end
-arch dungeon_magic
+arch marble
 x 8
 y 8
 end
@@ -1305,11 +1305,11 @@ sp 14
 x 8
 y 8
 end
-arch marble
+arch dungeon_magic
 x 8
 y 9
 end
-arch dungeon_magic
+arch marble
 x 8
 y 9
 end
@@ -1435,19 +1435,19 @@ face blocked.111
 x 9
 y 5
 end
-arch marble
-x 9
-y 6
-end
 arch dungeon_magic
 x 9
 y 6
 end
 arch marble
 x 9
+y 6
+end
+arch dungeon_magic
+x 9
 y 7
 end
-arch dungeon_magic
+arch marble
 x 9
 y 7
 end
@@ -1456,11 +1456,11 @@ x 9
 y 7
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 9
 y 8
 end
-arch dungeon_magic
+arch marble
 x 9
 y 8
 end
@@ -1469,11 +1469,11 @@ x 9
 y 8
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 9
 y 9
 end
-arch dungeon_magic
+arch marble
 x 9
 y 9
 end

quests/greyshield/Sphinx

@@ -391,6 +391,10 @@ arch marble
 x 3
 y 13
 end
+arch swall_1_4_half
+x 3
+y 13
+end
 arch cwall_1_2
 x 3
 y 13
@@ -470,15 +474,15 @@ arch marble
 x 4
 y 12
 end
-arch marble
-x 4
-y 13
-end
 arch dungeon_magic
 x 4
 y 13
 end
-arch swall_1_4
+arch marble
+x 4
+y 13
+end
+arch swall_2_1_2
 x 4
 y 13
 end
@@ -573,11 +577,11 @@ arch marble
 x 5
 y 12
 end
-arch marble
+arch dungeon_magic
 x 5
 y 13
 end
-arch dungeon_magic
+arch marble
 x 5
 y 13
 end
@@ -620,6 +624,10 @@ arch cwall_0
 x 6
 y 2
 end
+arch swall_1_1_half
+x 6
+y 2
+end
 arch marble
 x 6
 y 3
@@ -632,6 +640,10 @@ arch marble
 x 6
 y 4
 end
+arch swall_1_2_half
+x 6
+y 4
+end
 arch cwall_0
 x 6
 y 4
@@ -688,11 +700,11 @@ arch marble
 x 6
 y 12
 end
-arch marble
+arch dungeon_magic
 x 6
 y 13
 end
-arch dungeon_magic
+arch marble
 x 6
 y 13
 end
@@ -802,11 +814,11 @@ arch marble
 x 7
 y 12
 end
-arch marble
+arch dungeon_magic
 x 7
 y 13
 end
-arch dungeon_magic
+arch marble
 x 7
 y 13
 end
@@ -920,11 +932,11 @@ arch marble
 x 8
 y 12
 end
-arch marble
+arch dungeon_magic
 x 8
 y 13
 end
-arch dungeon_magic
+arch marble
 x 8
 y 13
 end
@@ -967,6 +979,10 @@ arch cwall_0
 x 9
 y 2
 end
+arch swall_1_1_half
+x 9
+y 2
+end
 arch marble
 x 9
 y 3
@@ -979,6 +995,10 @@ arch marble
 x 9
 y 4
 end
+arch swall_1_2_half
+x 9
+y 4
+end
 arch cwall_0
 x 9
 y 4
@@ -1035,11 +1055,11 @@ arch marble
 x 9
 y 12
 end
-arch marble
+arch dungeon_magic
 x 9
 y 13
 end
-arch dungeon_magic
+arch marble
 x 9
 y 13
 end
@@ -1138,11 +1158,11 @@ arch marble
 x 10
 y 12
 end
-arch marble
+arch dungeon_magic
 x 10
 y 13
 end
-arch dungeon_magic
+arch marble
 x 10
 y 13
 end
@@ -1225,15 +1245,15 @@ arch marble
 x 11
 y 12
 end
-arch marble
-x 11
-y 13
-end
 arch dungeon_magic
 x 11
 y 13
 end
-arch swall_1_3
+arch marble
+x 11
+y 13
+end
+arch swall_2_1_2
 x 11
 y 13
 end
@@ -1340,6 +1360,10 @@ arch marble
 x 12
 y 13
 end
+arch swall_1_3_half
+x 12
+y 13
+end
 arch cwall_1_2
 x 12
 y 13