Remove obsolete fields. Other changes due to editor reformatting.

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

brest/asyvan/palace2

@@ -1470,7 +1470,6 @@ arch grate_closed_1
 x 8
 y 2
 connected 99
-protected 99
 end
 arch dungeon_magic
 x 8
@@ -1605,7 +1604,6 @@ arch button_handle
 x 8
 y 15
 connected 99
-protected 99
 end
 arch dungeon_magic
 x 8

brest/brittany/enigme.3

@@ -1,13 +1,13 @@
 arch map
 name enigme
 region brest
+width 16
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Jun  1 01:03:38 1994
 endmsg
-width 16
-height 16
 end
 arch dungeon_floor
 end
@@ -172,11 +172,12 @@ end
 arch full_helmet
 name Warrior's Helmet
 hp 1
-protected 16386
-material 4
-magic 3
 x 1
 y 4
+resist_magic 30
+resist_fear 30
+material 4
+magic 3
 end
 arch dungeon_floor
 x 1
@@ -345,27 +346,27 @@ x 2
 y 7
 end
 arch button_lever
-connected 4
 x 2
 y 7
+connected 4
 end
 arch dungeon_floor
 x 2
 y 8
 end
 arch button_lever
-connected 4
 x 2
 y 8
+connected 4
 end
 arch dungeon_floor
 x 2
 y 9
 end
 arch button_lever
-connected 4
 x 2
 y 9
+connected 4
 end
 arch dungeon_floor
 x 2
@@ -505,27 +506,27 @@ x 3
 y 7
 end
 arch button_lever
-connected 1
 x 3
 y 7
+connected 1
 end
 arch dungeon_floor
 x 3
 y 8
 end
 arch button_lever
-connected 4
 x 3
 y 8
+connected 4
 end
 arch dungeon_floor
 x 3
 y 9
 end
 arch button_lever
-connected 4
 x 3
 y 9
+connected 4
 end
 arch dungeon_floor
 x 3
@@ -658,27 +659,27 @@ x 4
 y 7
 end
 arch button_lever
-connected 4
 x 4
 y 7
+connected 4
 end
 arch dungeon_floor
 x 4
 y 8
 end
 arch button_lever
-connected 4
 x 4
 y 8
+connected 4
 end
 arch dungeon_floor
 x 4
 y 9
 end
 arch button_lever
-connected 4
 x 4
 y 9
+connected 4
 end
 arch dungeon_floor
 x 4
@@ -697,29 +698,29 @@ x 4
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 4
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 4
 y 13
 end
 arch button_plate
-connected 5
 x 4
 y 13
+connected 5
 end
 arch dungeon_floor
 x 4
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 4
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 4
@@ -816,27 +817,27 @@ x 5
 y 7
 end
 arch button_lever
-connected 4
 x 5
 y 7
+connected 4
 end
 arch dungeon_floor
 x 5
 y 8
 end
 arch button_lever
-connected 4
 x 5
 y 8
+connected 4
 end
 arch dungeon_floor
 x 5
 y 9
 end
 arch button_lever
-connected 4
 x 5
 y 9
+connected 4
 end
 arch dungeon_floor
 x 5
@@ -855,21 +856,21 @@ x 5
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 5
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 5
 y 13
 end
 arch spikes_open
+x 5
+y 13
 speed 0.500000
 value 1
 connected 1
-x 5
-y 13
 end
 arch boulder
 x 5
@@ -880,10 +881,10 @@ x 5
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 5
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 5
@@ -980,28 +981,28 @@ x 6
 y 7
 end
 arch button_lever
-connected 4
 x 6
 y 7
-end
-arch dungeon_floor
-x 6
-y 8
-end
-arch button_lever
-connected 2
-x 6
-y 8
-end
-arch dungeon_floor
-x 6
-y 9
-end
-arch button_lever
 connected 4
+end
+arch dungeon_floor
+x 6
+y 8
+end
+arch button_lever
+x 6
+y 8
+connected 2
+end
+arch dungeon_floor
 x 6
 y 9
 end
+arch button_lever
+x 6
+y 9
+connected 4
+end
 arch dungeon_floor
 x 6
 y 10
@@ -1019,30 +1020,30 @@ x 6
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 6
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 6
 y 13
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 6
 y 13
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 6
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 6
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 6
@@ -1071,9 +1072,9 @@ x 7
 y 1
 end
 arch igate_closed_2
-connected 5
 x 7
 y 1
+connected 5
 end
 arch dungeon_floor
 x 7
@@ -1128,27 +1129,27 @@ x 7
 y 7
 end
 arch button_lever
-connected 4
 x 7
 y 7
+connected 4
 end
 arch dungeon_floor
 x 7
 y 8
 end
 arch button_lever
-connected 4
 x 7
 y 8
+connected 4
 end
 arch dungeon_floor
 x 7
 y 9
 end
 arch button_lever
-connected 4
 x 7
 y 9
+connected 4
 end
 arch dungeon_floor
 x 7
@@ -1167,29 +1168,29 @@ x 7
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 7
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 7
 y 13
 end
 arch button_plate
-connected 6
 x 7
 y 13
+connected 6
 end
 arch dungeon_floor
 x 7
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 7
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 7
@@ -1218,9 +1219,9 @@ x 8
 y 1
 end
 arch igate_closed_2
-connected 6
 x 8
 y 1
+connected 6
 end
 arch dungeon_floor
 x 8
@@ -1275,27 +1276,27 @@ x 8
 y 7
 end
 arch button_lever
-connected 4
 x 8
 y 7
+connected 4
 end
 arch dungeon_floor
 x 8
 y 8
 end
 arch button_lever
-connected 4
 x 8
 y 8
+connected 4
 end
 arch dungeon_floor
 x 8
 y 9
 end
 arch button_lever
-connected 4
 x 8
 y 9
+connected 4
 end
 arch dungeon_floor
 x 8
@@ -1314,21 +1315,21 @@ x 8
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 8
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 8
 y 13
 end
 arch spikes_open
+x 8
+y 13
 speed 0.500000
 value 1
 connected 2
-x 8
-y 13
 end
 arch boulder
 x 8
@@ -1339,10 +1340,10 @@ x 8
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 8
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 8
@@ -1371,9 +1372,9 @@ x 9
 y 1
 end
 arch igate_closed_2
-connected 7
 x 9
 y 1
+connected 7
 end
 arch dungeon_floor
 x 9
@@ -1428,27 +1429,27 @@ x 9
 y 7
 end
 arch button_lever
-connected 4
 x 9
 y 7
-end
-arch dungeon_floor
-x 9
-y 8
-end
-arch button_lever
 connected 4
+end
+arch dungeon_floor
 x 9
 y 8
 end
+arch button_lever
+x 9
+y 8
+connected 4
+end
 arch dungeon_floor
 x 9
 y 9
 end
 arch button_lever
-connected 3
 x 9
 y 9
+connected 3
 end
 arch dungeon_floor
 x 9
@@ -1467,30 +1468,30 @@ x 9
 y 12
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 9
 y 12
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 9
 y 13
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 9
 y 13
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 9
 y 14
 end
 arch block_door_closed
-speed 0.500000
-connected 8
 x 9
 y 14
+speed 0.500000
+connected 8
 end
 arch dungeon_floor
 x 9
@@ -1567,27 +1568,27 @@ x 10
 y 7
 end
 arch button_lever
-connected 4
 x 10
 y 7
+connected 4
 end
 arch dungeon_floor
 x 10
 y 8
 end
 arch button_lever
-connected 4
 x 10
 y 8
+connected 4
 end
 arch dungeon_floor
 x 10
 y 9
 end
 arch button_lever
-connected 4
 x 10
 y 9
+connected 4
 end
 arch dungeon_floor
 x 10
@@ -1606,27 +1607,27 @@ x 10
 y 12
 end
 arch block_door_closed
-connected 8
 x 10
 y 12
+connected 8
 end
 arch dungeon_floor
 x 10
 y 13
 end
 arch button_plate
-connected 7
 x 10
 y 13
+connected 7
 end
 arch dungeon_floor
 x 10
 y 14
 end
 arch block_door_closed
-connected 8
 x 10
 y 14
+connected 8
 end
 arch dungeon_floor
 x 10
@@ -1687,27 +1688,27 @@ x 11
 y 7
 end
 arch button_lever
-connected 4
 x 11
 y 7
+connected 4
 end
 arch dungeon_floor
 x 11
 y 8
 end
 arch button_lever
-connected 4
 x 11
 y 8
+connected 4
 end
 arch dungeon_floor
 x 11
 y 9
 end
 arch button_lever
-connected 4
 x 11
 y 9
+connected 4
 end
 arch dungeon_floor
 x 11
@@ -1726,20 +1727,20 @@ x 11
 y 12
 end
 arch block_door_closed
-connected 8
 x 11
 y 12
+connected 8
 end
 arch dungeon_floor
 x 11
 y 13
 end
 arch spikes_open
+x 11
+y 13
 speed 0.500000
 value 1
 connected 3
-x 11
-y 13
 end
 arch boulder
 x 11
@@ -1750,9 +1751,9 @@ x 11
 y 14
 end
 arch block_door_closed
-connected 8
 x 11
 y 14
+connected 8
 end
 arch dungeon_floor
 x 11
@@ -1837,27 +1838,27 @@ x 12
 y 12
 end
 arch block_door_closed
-connected 8
 x 12
 y 12
+connected 8
 end
 arch dungeon_floor
 x 12
 y 13
 end
 arch block_door_closed
-connected 8
 x 12
 y 13
+connected 8
 end
 arch dungeon_floor
 x 12
 y 14
 end
 arch block_door_closed
-connected 8
 x 12
 y 14
+connected 8
 end
 arch dungeon_floor
 x 12
@@ -1878,9 +1879,9 @@ x 13
 y 1
 end
 arch igate_open_2
-connected 8
 x 13
 y 1
+connected 8
 end
 arch dungeon_floor
 x 13
@@ -1955,9 +1956,9 @@ x 13
 y 13
 end
 arch button_plate
-connected 8
 x 13
 y 13
+connected 8
 end
 arch dungeon_floor
 x 13
@@ -2049,9 +2050,9 @@ x 14
 y 13
 end
 arch spikes_open
-connected 4
 x 14
 y 13
+connected 4
 end
 arch boulder
 x 14

brest/brittany/khazad.5

@@ -1,14 +1,14 @@
 arch map
-region brest
 name khazad
+region brest
+darkness 5
+width 36
+height 43
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Jun  7 20:52:00 1994
 endmsg
-x 36
-y 43
-invisible 5
 end
 arch dirtfloor
 y 9
@@ -597,6 +597,10 @@ arch dirtfloor
 x 5
 y 1
 end
+arch chinese_dragon
+x 5
+y 1
+end
 arch dirtfloor
 x 5
 y 2
@@ -605,6 +609,10 @@ arch dirtfloor
 x 5
 y 3
 end
+arch big_dragon
+x 5
+y 3
+end
 arch dirtfloor
 x 5
 y 4
@@ -617,6 +625,10 @@ arch dirtfloor
 x 5
 y 6
 end
+arch chinese_dragon
+x 5
+y 6
+end
 arch dirtfloor
 x 5
 y 7
@@ -657,6 +669,10 @@ arch dirtfloor
 x 5
 y 12
 end
+arch big_dragon
+x 5
+y 12
+end
 arch dirtfloor
 x 5
 y 13
@@ -665,6 +681,10 @@ arch dirtfloor
 x 5
 y 14
 end
+arch chinese_dragon
+x 5
+y 14
+end
 arch dirtfloor
 x 5
 y 15
@@ -677,6 +697,10 @@ arch dirtfloor
 x 5
 y 17
 end
+arch big_dragon
+x 5
+y 17
+end
 arch dirtfloor
 x 5
 y 18
@@ -1156,6 +1180,10 @@ arch dirtfloor
 x 8
 y 23
 end
+arch big_elec
+x 8
+y 23
+end
 arch dirtfloor
 x 8
 y 24
@@ -1226,6 +1254,10 @@ arch dirtfloor
 x 9
 y 1
 end
+arch chinese_dragon
+x 9
+y 1
+end
 arch dirtfloor
 x 9
 y 2
@@ -1234,6 +1266,10 @@ arch dirtfloor
 x 9
 y 3
 end
+arch big_dragon
+x 9
+y 3
+end
 arch dirtfloor
 x 9
 y 4
@@ -1282,6 +1318,10 @@ arch dirtfloor
 x 9
 y 12
 end
+arch big_dragon
+x 9
+y 12
+end
 arch dirtfloor
 x 9
 y 13
@@ -1290,6 +1330,10 @@ arch dirtfloor
 x 9
 y 14
 end
+arch chinese_dragon
+x 9
+y 14
+end
 arch dirtfloor
 x 9
 y 15
@@ -1302,6 +1346,10 @@ arch dirtfloor
 x 9
 y 17
 end
+arch big_dragon
+x 9
+y 17
+end
 arch dirtfloor
 x 9
 y 18
@@ -1358,6 +1406,10 @@ arch dirtfloor
 x 9
 y 29
 end
+arch titan
+x 9
+y 29
+end
 arch dirtfloor
 x 9
 y 30
@@ -1412,6 +1464,10 @@ arch dirtfloor
 x 10
 y 6
 end
+arch chinese_dragon
+x 10
+y 6
+end
 arch dirtfloor
 x 10
 y 7
@@ -1560,6 +1616,10 @@ arch dirtfloor
 x 10
 y 32
 end
+arch titan
+x 10
+y 32
+end
 arch dirtfloor
 x 10
 y 33
@@ -1994,6 +2054,10 @@ arch dirtfloor
 x 13
 y 3
 end
+arch big_dragon
+x 13
+y 3
+end
 arch dirtfloor
 x 13
 y 4
@@ -2006,6 +2070,10 @@ arch dirtfloor
 x 13
 y 6
 end
+arch chinese_dragon
+x 13
+y 6
+end
 arch dirtfloor
 x 13
 y 7
@@ -2042,6 +2110,10 @@ arch dirtfloor
 x 13
 y 12
 end
+arch big_dragon
+x 13
+y 12
+end
 arch dirtfloor
 x 13
 y 13
@@ -2050,6 +2122,10 @@ arch dirtfloor
 x 13
 y 14
 end
+arch chinese_dragon
+x 13
+y 14
+end
 arch dirtfloor
 x 13
 y 15
@@ -2062,6 +2138,10 @@ arch dirtfloor
 x 13
 y 17
 end
+arch big_dragon
+x 13
+y 17
+end
 arch dirtfloor
 x 13
 y 18
@@ -2158,6 +2238,10 @@ arch dirtfloor
 x 13
 y 32
 end
+arch titan
+x 13
+y 32
+end
 arch dirtfloor
 x 13
 y 33
@@ -2180,6 +2264,10 @@ arch dirtfloor
 x 14
 y 1
 end
+arch chinese_dragon
+x 14
+y 1
+end
 arch dirtfloor
 x 14
 y 2
@@ -2518,6 +2606,10 @@ arch dirtfloor
 x 15
 y 28
 end
+arch dread
+x 15
+y 28
+end
 arch dirtfloor
 x 15
 y 29
@@ -2776,6 +2868,10 @@ arch dirtfloor
 x 16
 y 32
 end
+arch titan
+x 16
+y 32
+end
 arch dirtfloor
 x 16
 y 33
@@ -3134,6 +3230,10 @@ arch small_stones
 x 18
 y 11
 end
+arch chinese_dragon
+x 18
+y 11
+end
 arch small_stones
 x 18
 y 12
@@ -3142,6 +3242,10 @@ arch small_stones
 x 18
 y 13
 end
+arch chinese_dragon
+x 18
+y 13
+end
 arch small_stones
 x 18
 y 14
@@ -3150,6 +3254,10 @@ arch small_stones
 x 18
 y 15
 end
+arch chinese_dragon
+x 18
+y 15
+end
 arch small_stones
 x 18
 y 16
@@ -3158,6 +3266,10 @@ arch small_stones
 x 18
 y 17
 end
+arch chinese_dragon
+x 18
+y 17
+end
 arch small_stones
 x 18
 y 18
@@ -3166,6 +3278,10 @@ arch small_stones
 x 18
 y 19
 end
+arch chinese_dragon
+x 18
+y 19
+end
 arch small_stones
 x 18
 y 20
@@ -3174,6 +3290,10 @@ arch small_stones
 x 18
 y 21
 end
+arch chinese_dragon
+x 18
+y 21
+end
 arch small_stones
 x 18
 y 22
@@ -3182,6 +3302,10 @@ arch small_stones
 x 18
 y 23
 end
+arch chinese_dragon
+x 18
+y 23
+end
 arch small_stones
 x 18
 y 24
@@ -3190,6 +3314,10 @@ arch small_stones
 x 18
 y 25
 end
+arch chinese_dragon
+x 18
+y 25
+end
 arch small_stones
 x 18
 y 26
@@ -3421,6 +3549,10 @@ arch dirtfloor
 x 19
 y 32
 end
+arch titan
+x 19
+y 32
+end
 arch dirtfloor
 x 19
 y 33
@@ -3449,6 +3581,10 @@ arch small_stones
 x 20
 y 5
 end
+arch big_dragon
+x 20
+y 5
+end
 arch small_stones
 x 20
 y 6
@@ -4129,6 +4265,10 @@ arch dirtfloor
 x 22
 y 32
 end
+arch titan
+x 22
+y 32
+end
 arch dirtfloor
 x 22
 y 33
@@ -4421,6 +4561,10 @@ arch small_stones
 x 23
 y 36
 end
+arch dread
+x 23
+y 36
+end
 arch small_stones
 x 23
 y 37
@@ -4816,8 +4960,10 @@ Cha 2
 sp 2
 x 25
 y 20
-immune 128
-protected 16418
+resist_magic 30
+resist_confusion 30
+resist_drain 100
+resist_fear 30
 value 22000
 weight 5000
 magic 4
@@ -4906,6 +5052,10 @@ arch dirtfloor
 x 25
 y 32
 end
+arch titan
+x 25
+y 32
+end
 arch dirtfloor
 x 25
 y 33
@@ -4993,6 +5143,10 @@ arch small_stones
 x 26
 y 4
 end
+arch big_elec
+x 26
+y 4
+end
 arch small_stones
 x 26
 y 5
@@ -5029,6 +5183,10 @@ arch dirtfloor
 x 26
 y 12
 end
+arch titan
+x 26
+y 12
+end
 arch dirtfloor
 x 26
 y 13
@@ -5041,6 +5199,10 @@ arch dirtfloor
 x 26
 y 15
 end
+arch titan
+x 26
+y 15
+end
 arch dirtfloor
 x 26
 y 16
@@ -5177,6 +5339,10 @@ arch small_stones
 x 26
 y 35
 end
+arch dread
+x 26
+y 35
+end
 arch small_stones
 x 26
 y 36
@@ -6010,6 +6176,10 @@ arch small_stones
 x 29
 y 35
 end
+arch dread
+x 29
+y 35
+end
 arch small_stones
 x 29
 y 36
@@ -6118,6 +6288,10 @@ arch dirtfloor
 x 30
 y 11
 end
+arch titan
+x 30
+y 11
+end
 arch dirtfloor
 x 30
 y 12
@@ -6130,6 +6304,10 @@ arch dirtfloor
 x 30
 y 14
 end
+arch titan
+x 30
+y 14
+end
 arch dirtfloor
 x 30
 y 15
@@ -7685,179 +7863,3 @@ arch bwall_2_2_4
 x 35
 y 42
 end
-arch chinese_dragon
-x 5
-y 1
-end
-arch big_dragon
-x 5
-y 3
-end
-arch chinese_dragon
-x 5
-y 6
-end
-arch big_dragon
-x 5
-y 12
-end
-arch chinese_dragon
-x 5
-y 14
-end
-arch big_dragon
-x 5
-y 17
-end
-arch big_elec
-x 8
-y 23
-end
-arch chinese_dragon
-x 9
-y 1
-end
-arch big_dragon
-x 9
-y 3
-end
-arch big_dragon
-x 9
-y 12
-end
-arch chinese_dragon
-x 9
-y 14
-end
-arch big_dragon
-x 9
-y 17
-end
-arch titan
-x 9
-y 29
-end
-arch chinese_dragon
-x 10
-y 6
-end
-arch titan
-x 10
-y 32
-end
-arch big_dragon
-x 13
-y 3
-end
-arch chinese_dragon
-x 13
-y 6
-end
-arch big_dragon
-x 13
-y 12
-end
-arch chinese_dragon
-x 13
-y 14
-end
-arch big_dragon
-x 13
-y 17
-end
-arch titan
-x 13
-y 32
-end
-arch chinese_dragon
-x 14
-y 1
-end
-arch dread
-x 15
-y 28
-end
-arch titan
-x 16
-y 32
-end
-arch chinese_dragon
-x 18
-y 11
-end
-arch chinese_dragon
-x 18
-y 13
-end
-arch chinese_dragon
-x 18
-y 15
-end
-arch chinese_dragon
-x 18
-y 17
-end
-arch chinese_dragon
-x 18
-y 19
-end
-arch chinese_dragon
-x 18
-y 21
-end
-arch chinese_dragon
-x 18
-y 23
-end
-arch chinese_dragon
-x 18
-y 25
-end
-arch titan
-x 19
-y 32
-end
-arch big_dragon
-x 20
-y 5
-end
-arch titan
-x 22
-y 32
-end
-arch dread
-x 23
-y 36
-end
-arch titan
-x 25
-y 32
-end
-arch big_elec
-x 26
-y 4
-end
-arch titan
-x 26
-y 12
-end
-arch titan
-x 26
-y 15
-end
-arch dread
-x 26
-y 35
-end
-arch dread
-x 29
-y 35
-end
-arch titan
-x 30
-y 11
-end
-arch titan
-x 30
-y 14
-end

brest/elec.jes

@@ -13360,6 +13360,14 @@ arch dungeon_floor
 x 43
 y 8
 end
+arch big_elec
+hp 8000
+maxhp 8000
+exp 150000
+x 43
+y 8
+level 20
+end
 arch dungeon_floor
 x 43
 y 9
@@ -18271,12 +18279,3 @@ arch bwall_0
 x 59
 y 47
 end
-arch big_elec
-hp 8000
-maxhp 8000
-exp 150000
-x 43
-y 8
-level 20
-vulnerable 0
-end