Added missing floor tiles to the Castle Zaah maps. Cosmetic touchups for sections of walls next to doors - wrong wall sections are used. Other changes are Map Editor reformatting.

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

darcap/castle/castle2.0

@@ -1,16 +1,16 @@
 arch map
+name Castle Zaah, Dungeon
+difficulty 12
 region darcap
-name castle2
+width 43
+height 43
+enter_x 23
+enter_y 24
 msg
 Creator: Gnat the Gnu
 Email: john_cater@yahoo.com
 Date: Thu Jan 21 14:38:50 1999
 endmsg
-hp 23
-sp 24
-x 43
-y 43
-level 12
 end
 arch dungeon_floor
 end
@@ -3408,9 +3408,6 @@ x 15
 y 33
 end
 arch button_handle
-msg
-
-endmsg
 x 15
 y 33
 connected 96

darcap/castle/castle2.1

@@ -1,15 +1,16 @@
 arch map
+name Castle Zaah, Floor 1
+difficulty 1
 region darcap
-name castle2fl1
+width 50
+height 50
+enter_x 24
+enter_y 47
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Oct 19 03:23:21 1994
 endmsg
-width 50
-height 50
-enter_x 24
-enter_y 47
 end
 arch grass
 end
@@ -3614,10 +3615,10 @@ x 15
 y 27
 end
 arch spikes_closed
-speed 0.500000
-connected 7
 x 15
 y 27
+speed 0.500000
+connected 7
 end
 arch cobblestones
 x 15
@@ -3847,10 +3848,10 @@ x 16
 y 27
 end
 arch spikes_closed
-speed 0.500000
-connected 7
 x 16
 y 27
+speed 0.500000
+connected 7
 end
 arch cobblestones
 x 16
@@ -4056,9 +4057,9 @@ x 17
 y 21
 end
 arch button_handle
-connected 9
 x 17
 y 21
+connected 9
 end
 arch cobblestones
 x 17
@@ -4081,19 +4082,19 @@ x 17
 y 26
 end
 arch button_handle
-connected 7
 x 17
 y 26
+connected 7
 end
 arch cobblestones
 x 17
 y 27
 end
 arch spikes_closed
-speed 0.500000
-connected 7
 x 17
 y 27
+speed 0.500000
+connected 7
 end
 arch cobblestones
 x 17
@@ -4287,10 +4288,10 @@ x 18
 y 17
 end
 arch gate_closed_2
-speed 0.500000
-connected 2
 x 18
 y 17
+speed 0.500000
+connected 2
 end
 arch cobblestones
 x 18
@@ -4329,10 +4330,10 @@ x 18
 y 22
 end
 arch gate_closed_2
-speed 0.500000
-connected 9
 x 18
 y 22
+speed 0.500000
+connected 9
 end
 arch cobblestones
 x 18
@@ -4363,20 +4364,20 @@ x 18
 y 26
 end
 arch spikes_closed
-speed 0.500000
-connected 7
 x 18
 y 26
+speed 0.500000
+connected 7
 end
 arch cobblestones
 x 18
 y 27
 end
 arch spikes_closed
-speed 0.500000
-connected 7
 x 18
 y 27
+speed 0.500000
+connected 7
 end
 arch cobblestones
 x 18
@@ -4562,9 +4563,9 @@ x 19
 y 17
 end
 arch button_small
-connected 2
 x 19
 y 17
+connected 2
 end
 arch cobblestones
 x 19
@@ -4583,27 +4584,27 @@ x 19
 y 21
 end
 arch button_plate
-connected 9
 x 19
 y 21
+connected 9
 end
 arch cobblestones
 x 19
 y 22
 end
 arch button_plate
-connected 9
 x 19
 y 22
+connected 9
 end
 arch cobblestones
 x 19
 y 23
 end
 arch button_plate
-connected 9
 x 19
 y 23
+connected 9
 end
 arch cobblestones
 x 19
@@ -5100,9 +5101,9 @@ x 21
 y 30
 end
 arch button_handle
-connected 8
 x 21
 y 30
+connected 8
 end
 arch cobblestones
 x 21
@@ -5364,20 +5365,20 @@ x 22
 y 31
 end
 arch grate_closed_2
-speed 0.500000
-connected 8
 x 22
 y 31
+speed 0.500000
+connected 8
 end
 arch cobblestones
 x 22
 y 32
 end
 arch grate_closed_2
-speed 0.500000
-connected 8
 x 22
 y 32
+speed 0.500000
+connected 8
 end
 arch cobblestones
 x 22
@@ -5452,10 +5453,10 @@ x 22
 y 43
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 22
 y 43
+speed 0.500000
+connected 96
 end
 arch grass
 x 22
@@ -5593,28 +5594,28 @@ x 23
 y 24
 end
 arch button_small
-connected 1
 x 23
 y 24
+connected 1
 end
 arch cobblestones
 x 23
 y 25
 end
 arch grate_closed_1
-speed 0.500000
-connected 1
 x 23
 y 25
+speed 0.500000
+connected 1
 end
 arch cobblestones
 x 23
 y 26
 end
 arch button_small
-connected 1
 x 23
 y 26
+connected 1
 end
 arch cobblestones
 x 23
@@ -5649,10 +5650,10 @@ x 23
 y 34
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 23
 y 34
+speed 0.500000
+connected 96
 end
 arch cobblestones
 x 23
@@ -5683,9 +5684,9 @@ x 23
 y 41
 end
 arch button_small
-connected 96
 x 23
 y 42
+connected 96
 end
 arch cobblestones
 x 23
@@ -5696,10 +5697,10 @@ x 23
 y 43
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 23
 y 43
+speed 0.500000
+connected 96
 end
 arch dirtfloor
 x 23
@@ -5725,6 +5726,17 @@ arch dirtfloor
 x 23
 y 49
 end
+arch dirtfloor
+x 23
+y 49
+end
+arch exit
+slaying /world/world_117_103
+hp 17
+sp 5
+x 23
+y 49
+end
 arch grass
 x 24
 end
@@ -5842,28 +5854,28 @@ x 24
 y 24
 end
 arch button_small
-connected 1
 x 24
 y 24
+connected 1
 end
 arch cobblestones
 x 24
 y 25
 end
 arch grate_closed_1
-speed 0.500000
-connected 1
 x 24
 y 25
+speed 0.500000
+connected 1
 end
 arch cobblestones
 x 24
 y 26
 end
 arch button_small
-connected 1
 x 24
 y 26
+connected 1
 end
 arch cobblestones
 x 24
@@ -5898,10 +5910,10 @@ x 24
 y 34
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 24
 y 34
+speed 0.500000
+connected 96
 end
 arch cobblestones
 x 24
@@ -5932,9 +5944,9 @@ x 24
 y 41
 end
 arch button_small
-connected 96
 x 24
 y 42
+connected 96
 end
 arch cobblestones
 x 24
@@ -5945,10 +5957,10 @@ x 24
 y 43
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 24
 y 43
+speed 0.500000
+connected 96
 end
 arch dirtfloor
 x 24
@@ -5961,9 +5973,9 @@ I N V A T I O N
 of
 B E A S T S
 endmsg
-connected 96
 x 24
 y 44
+connected 96
 end
 arch dirtfloor
 x 24
@@ -5981,15 +5993,15 @@ arch dirtfloor
 x 24
 y 48
 end
+arch dirtfloor
+x 24
+y 49
+end
 arch exit
 slaying /world/world_117_103
 hp 17
 sp 5
 x 24
-y 48
-end
-arch dirtfloor
-x 24
 y 49
 end
 arch grass
@@ -6104,28 +6116,28 @@ x 25
 y 24
 end
 arch button_small
-connected 1
 x 25
 y 24
+connected 1
 end
 arch cobblestones
 x 25
 y 25
 end
 arch grate_closed_1
-speed 0.500000
-connected 1
 x 25
 y 25
+speed 0.500000
+connected 1
 end
 arch cobblestones
 x 25
 y 26
 end
 arch button_small
-connected 1
 x 25
 y 26
+connected 1
 end
 arch cobblestones
 x 25
@@ -6160,10 +6172,10 @@ x 25
 y 34
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 25
 y 34
+speed 0.500000
+connected 96
 end
 arch cobblestones
 x 25
@@ -6194,9 +6206,9 @@ x 25
 y 41
 end
 arch button_small
-connected 96
 x 25
 y 42
+connected 96
 end
 arch cobblestones
 x 25
@@ -6207,10 +6219,10 @@ x 25
 y 43
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 25
 y 43
+speed 0.500000
+connected 96
 end
 arch dirtfloor
 x 25
@@ -6236,6 +6248,17 @@ arch dirtfloor
 x 25
 y 49
 end
+arch dirtfloor
+x 25
+y 49
+end
+arch exit
+slaying /world/world_117_103
+hp 17
+sp 5
+x 25
+y 49
+end
 arch grass
 x 26
 end
@@ -6412,20 +6435,20 @@ x 26
 y 31
 end
 arch grate_closed_2
-speed 0.500000
-connected 6
 x 26
 y 31
+speed 0.500000
+connected 6
 end
 arch cobblestones
 x 26
 y 32
 end
 arch grate_closed_2
-speed 0.500000
-connected 6
 x 26
 y 32
+speed 0.500000
+connected 6
 end
 arch cobblestones
 x 26
@@ -6500,10 +6523,10 @@ x 26
 y 43
 end
 arch grate_closed_1
-speed 0.500000
-connected 96
 x 26
 y 43
+speed 0.500000
+connected 96
 end
 arch grass
 x 26
@@ -6681,9 +6704,9 @@ x 27
 y 30
 end
 arch button_handle
-connected 6
 x 27
 y 30
+connected 6
 end
 arch cobblestones
 x 27
@@ -7084,9 +7107,9 @@ x 29
 y 17
 end
 arch button_small
-connected 2
 x 29
 y 17
+connected 2
 end
 arch cobblestones
 x 29
@@ -7105,27 +7128,27 @@ x 29
 y 21
 end
 arch button_plate
-connected 4
 x 29
 y 21
+connected 4
 end
 arch cobblestones
 x 29
 y 22
 end
 arch button_plate
-connected 4
 x 29
 y 22
+connected 4
 end
 arch cobblestones
 x 29
 y 23
 end
 arch button_plate
-connected 4
 x 29
 y 23
+connected 4
 end
 arch cobblestones
 x 29
@@ -7343,10 +7366,10 @@ x 30
 y 17
 end
 arch gate_closed_2
-speed 0.500000
-connected 2
 x 30
 y 17
+speed 0.500000
+connected 2
 end
 arch cobblestones
 x 30
@@ -7385,10 +7408,10 @@ x 30
 y 22
 end
 arch gate_closed_2
-speed 0.500000
-connected 4
 x 30
 y 22
+speed 0.500000
+connected 4
 end
 arch cobblestones
 x 30
@@ -7614,9 +7637,9 @@ x 31
 y 19
 end
 arch button_handle
-connected 3
 x 31
 y 19
+connected 3
 end
 arch cobblestones
 x 31
@@ -7631,9 +7654,9 @@ x 31
 y 21
 end
 arch button_handle
-connected 4
 x 31
 y 21
+connected 4
 end
 arch cobblestones
 x 31
@@ -7648,18 +7671,18 @@ x 31
 y 24
 end
 arch button_handle
-connected 5
 x 31
 y 24
+connected 5
 end
 arch cobblestones
 x 31
 y 25
 end
 arch grate_closed_1
-connected 5
 x 31
 y 25
+connected 5
 end
 arch cobblestones
 x 31
@@ -7869,19 +7892,19 @@ x 32
 y 20
 end
 arch grate_closed_1
-speed 0.500000
-connected 3
 x 32
 y 20
+speed 0.500000
+connected 3
 end
 arch cobblestones
 x 32
 y 21
 end
 arch button_plate
-connected 3
 x 32
 y 21
+connected 3
 end
 arch cobblestones
 x 32
@@ -7900,10 +7923,10 @@ x 32
 y 25
 end
 arch grate_closed_1
-speed 0.500000
-connected 5
 x 32
 y 25
+speed 0.500000
+connected 5
 end
 arch cobblestones
 x 32
@@ -8121,10 +8144,10 @@ x 33
 y 20
 end
 arch grate_closed_1
-speed 0.500000
-connected 3
 x 33
 y 20
+speed 0.500000
+connected 3
 end
 arch cobblestones
 x 33
@@ -8621,9 +8644,9 @@ x 35
 y 13
 end
 arch button_handle
-connected 96
 x 35
 y 13
+connected 96
 end
 arch cobblestones
 x 35