Remove obsolete fields. Other changes due to editor.

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

pup_land/s_f/floor1

@@ -1,13 +1,15 @@
 arch map
-region pupland
 name floor1
+region pupland
+width 16
+height 16
+enter_x 8
+enter_y 15
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Feb  7 19:10:01 1996
 endmsg
-hp 8
-sp 15
 end
 arch cobblestones2
 end
@@ -671,7 +673,6 @@ end
 arch altar
 x 7
 y 1
-protected 96
 connected 96
 end
 arch flagstone
@@ -762,7 +763,6 @@ end
 arch altar
 x 8
 y 1
-protected 96
 connected 96
 end
 arch flagstone

pup_land/s_f/ki

@@ -587,7 +587,6 @@ name 1 - if player on wrong side
 x 8
 y 1
 connected 1
-protected 1
 end
 arch woodfloor
 x 8
@@ -804,14 +803,12 @@ name 2
 x 11
 weight 10000
 connected 2
-protected 2
 end
 arch creator
 name 1
 other_arch boulder
 x 11
 connected 1
-protected 1
 end
 arch blocked
 x 11

pup_land/s_f/ki2

@@ -214,7 +214,6 @@ x 2
 y 2
 invisible 1
 connected 51
-protected 51
 end
 arch woodfloor
 x 2
@@ -229,7 +228,6 @@ x 2
 y 3
 invisible 1
 connected 41
-protected 41
 end
 arch woodfloor
 x 2
@@ -244,7 +242,6 @@ x 2
 y 4
 invisible 1
 connected 31
-protected 31
 end
 arch woodfloor
 x 2
@@ -259,7 +256,6 @@ x 2
 y 5
 invisible 1
 connected 21
-protected 21
 end
 arch woodfloor
 x 2
@@ -303,7 +299,6 @@ y 8
 speed 0.500000
 value 1
 connected 51
-protected 51
 end
 arch woodfloor
 x 2
@@ -315,7 +310,6 @@ y 9
 speed 0.500000
 value 1
 connected 41
-protected 41
 end
 arch woodfloor
 x 2
@@ -327,7 +321,6 @@ y 10
 speed 0.500000
 value 1
 connected 31
-protected 31
 end
 arch woodfloor
 x 2
@@ -339,7 +332,6 @@ y 11
 speed 0.500000
 value 1
 connected 21
-protected 21
 end
 arch woodfloor
 x 2
@@ -377,7 +369,6 @@ x 3
 y 2
 invisible 1
 connected 52
-protected 52
 end
 arch woodfloor
 x 3
@@ -392,7 +383,6 @@ x 3
 y 3
 invisible 1
 connected 42
-protected 42
 end
 arch woodfloor
 x 3
@@ -407,7 +397,6 @@ x 3
 y 4
 invisible 1
 connected 32
-protected 32
 end
 arch woodfloor
 x 3
@@ -422,7 +411,6 @@ x 3
 y 5
 invisible 1
 connected 22
-protected 22
 end
 arch woodfloor
 x 3
@@ -466,7 +454,6 @@ y 8
 speed 0.500000
 value 1
 connected 52
-protected 52
 end
 arch woodfloor
 x 3
@@ -478,7 +465,6 @@ y 9
 speed 0.500000
 value 1
 connected 42
-protected 42
 end
 arch woodfloor
 x 3
@@ -490,7 +476,6 @@ y 10
 speed 0.500000
 value 1
 connected 32
-protected 32
 end
 arch woodfloor
 x 3
@@ -502,7 +487,6 @@ y 11
 speed 0.500000
 value 1
 connected 22
-protected 22
 end
 arch woodfloor
 x 3
@@ -539,7 +523,6 @@ x 4
 y 2
 invisible 1
 connected 53
-protected 53
 end
 arch woodfloor
 x 4
@@ -554,7 +537,6 @@ x 4
 y 3
 invisible 1
 connected 43
-protected 43
 end
 arch woodfloor
 x 4
@@ -569,7 +551,6 @@ x 4
 y 4
 invisible 1
 connected 33
-protected 33
 end
 arch woodfloor
 x 4
@@ -584,7 +565,6 @@ x 4
 y 5
 invisible 1
 connected 23
-protected 23
 end
 arch woodfloor
 x 4
@@ -628,7 +608,6 @@ y 8
 speed 0.500000
 value 1
 connected 53
-protected 53
 end
 arch woodfloor
 x 4
@@ -640,7 +619,6 @@ y 9
 speed 0.500000
 value 1
 connected 43
-protected 43
 end
 arch woodfloor
 x 4
@@ -652,7 +630,6 @@ y 10
 speed 0.500000
 value 1
 connected 33
-protected 33
 end
 arch woodfloor
 x 4
@@ -664,7 +641,6 @@ y 11
 speed 0.500000
 value 1
 connected 23
-protected 23
 end
 arch note
 msg
@@ -710,7 +686,6 @@ x 5
 y 2
 invisible 1
 connected 54
-protected 54
 end
 arch woodfloor
 x 5
@@ -725,7 +700,6 @@ x 5
 y 3
 invisible 1
 connected 44
-protected 44
 end
 arch woodfloor
 x 5
@@ -740,7 +714,6 @@ x 5
 y 4
 invisible 1
 connected 34
-protected 34
 end
 arch woodfloor
 x 5
@@ -755,7 +728,6 @@ x 5
 y 5
 invisible 1
 connected 24
-protected 24
 end
 arch woodfloor
 x 5
@@ -799,7 +771,6 @@ y 8
 speed 0.500000
 value 1
 connected 54
-protected 54
 end
 arch woodfloor
 x 5
@@ -811,7 +782,6 @@ y 9
 speed 0.500000
 value 1
 connected 44
-protected 44
 end
 arch woodfloor
 x 5
@@ -823,7 +793,6 @@ y 10
 speed 0.500000
 value 1
 connected 34
-protected 34
 end
 arch woodfloor
 x 5
@@ -835,7 +804,6 @@ y 11
 speed 0.500000
 value 1
 connected 24
-protected 24
 end
 arch note
 msg
@@ -890,7 +858,6 @@ x 6
 y 2
 invisible 1
 connected 55
-protected 55
 end
 arch woodfloor
 x 6
@@ -905,7 +872,6 @@ x 6
 y 3
 invisible 1
 connected 45
-protected 45
 end
 arch woodfloor
 x 6
@@ -920,7 +886,6 @@ x 6
 y 4
 invisible 1
 connected 35
-protected 35
 end
 arch woodfloor
 x 6
@@ -935,7 +900,6 @@ x 6
 y 5
 invisible 1
 connected 25
-protected 25
 end
 arch woodfloor
 x 6
@@ -979,7 +943,6 @@ y 8
 speed 0.500000
 value 1
 connected 55
-protected 55
 end
 arch woodfloor
 x 6
@@ -991,7 +954,6 @@ y 9
 speed 0.500000
 value 1
 connected 45
-protected 45
 end
 arch woodfloor
 x 6
@@ -1003,7 +965,6 @@ y 10
 speed 0.500000
 value 1
 connected 35
-protected 35
 end
 arch woodfloor
 x 6
@@ -1015,7 +976,6 @@ y 11
 speed 0.500000
 value 1
 connected 25
-protected 25
 end
 arch woodfloor
 x 6
@@ -1059,7 +1019,6 @@ x 7
 y 2
 invisible 1
 connected 56
-protected 56
 end
 arch woodfloor
 x 7
@@ -1074,7 +1033,6 @@ x 7
 y 3
 invisible 1
 connected 46
-protected 46
 end
 arch woodfloor
 x 7
@@ -1089,7 +1047,6 @@ x 7
 y 4
 invisible 1
 connected 36
-protected 36
 end
 arch woodfloor
 x 7
@@ -1104,7 +1061,6 @@ x 7
 y 5
 invisible 1
 connected 26
-protected 26
 end
 arch woodfloor
 x 7
@@ -1148,7 +1104,6 @@ y 8
 speed 0.500000
 value 1
 connected 56
-protected 56
 end
 arch woodfloor
 x 7
@@ -1160,7 +1115,6 @@ y 9
 speed 0.500000
 value 1
 connected 46
-protected 46
 end
 arch woodfloor
 x 7
@@ -1172,7 +1126,6 @@ y 10
 speed 0.500000
 value 1
 connected 36
-protected 36
 end
 arch woodfloor
 x 7
@@ -1184,7 +1137,6 @@ y 11
 speed 0.500000
 value 1
 connected 26
-protected 26
 end
 arch woodfloor
 x 7

pup_land/s_f/ruin_ug

@@ -1,12 +1,13 @@
 arch map
-region pupland
 name ruin_ug
+region pupland
+width 19
+height 16
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Feb  7 23:13:41 1996
 endmsg
-x 19
 end
 arch blocked
 end
@@ -509,6 +510,11 @@ arch pstone_3
 x 4
 y 9
 end
+arch big_dragon
+x 4
+y 9
+unaggressive 1
+end
 arch pstone_1
 x 4
 y 10
@@ -1162,7 +1168,6 @@ slaying uw_sword
 food 1
 x 10
 y 6
-protected 4
 connected 4
 end
 arch pstone_1
@@ -1374,7 +1379,6 @@ slaying crown
 food 1
 x 12
 y 4
-protected 3
 connected 3
 end
 arch pstone_1
@@ -1398,7 +1402,6 @@ slaying mithril_chainmail
 food 1
 x 12
 y 6
-protected 5
 connected 5
 end
 arch pstone_1
@@ -1422,7 +1425,6 @@ slaying cloak
 food 1
 x 12
 y 8
-protected 7
 connected 7
 end
 arch pstone_1
@@ -1659,7 +1661,6 @@ slaying uw_shield
 food 1
 x 14
 y 6
-protected 6
 connected 6
 end
 arch pstone_1
@@ -1820,7 +1821,6 @@ end
 arch grate_closed_2
 x 15
 y 10
-protected 2
 connected 2
 end
 arch pstone_3
@@ -1945,7 +1945,6 @@ arch igate_open_1
 x 17
 y 1
 speed 0.500000
-protected 3
 value 1
 connected 3
 end
@@ -1957,7 +1956,6 @@ arch igate_open_1
 x 17
 y 2
 speed 0.500000
-protected 4
 value 1
 connected 4
 end
@@ -1965,7 +1963,6 @@ arch igate_open_1
 x 17
 y 3
 speed 0.500000
-protected 5
 value 1
 connected 5
 end
@@ -1973,7 +1970,6 @@ arch igate_open_1
 x 17
 y 4
 speed 0.500000
-protected 6
 value 1
 connected 6
 end
@@ -1981,14 +1977,12 @@ arch igate_open_1
 x 17
 y 5
 speed 0.500000
-protected 7
 value 1
 connected 7
 end
 arch button_small
 x 17
 y 6
-protected 2
 connected 2
 end
 arch blocked
@@ -2022,7 +2016,6 @@ end
 arch button_lever
 x 17
 y 10
-protected 2
 connected 2
 end
 arch pstone_2
@@ -2130,8 +2123,3 @@ arch blocked
 x 18
 y 15
 end
-arch big_dragon
-x 4
-y 9
-unaggressive 1
-end

pup_land/s_f/st1

@@ -1,13 +1,13 @@
 arch map
-region pupland
 name st1
+region pupland
+width 17
+height 17
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Feb 10 04:27:35 1996
 endmsg
-x 17
-y 17
 end
 arch pstone_1
 end
@@ -723,7 +723,6 @@ msg
 endmsg
 x 8
 y 12
-protected 1
 connected 1
 end
 arch corpse

pup_land/s_f/st3

@@ -1,13 +1,13 @@
 arch map
-region pupland
 name st3
+region pupland
+width 17
+height 17
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Feb 12 14:37:24 1996
 endmsg
-x 17
-y 17
 end
 arch blocked
 end
@@ -252,7 +252,6 @@ arch button_small
 face button_sma.112
 x 1
 y 11
-protected 1
 value 1
 connected 1
 end
@@ -1315,7 +1314,6 @@ end
 arch ggate_open
 x 8
 y 6
-protected 1
 connected 1
 end
 arch flagstone
@@ -1441,7 +1439,6 @@ end
 arch button_handle
 x 9
 y 5
-protected 1
 connected 1
 end
 arch flagstone

pup_land/s_f/st6

@@ -1,13 +1,13 @@
 arch map
-region pupland
 name st6
+region pupland
+width 21
+height 17
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Feb 12 17:23:03 1996
 endmsg
-x 21
-y 17
 end
 arch blocked
 end
@@ -137,6 +137,16 @@ arch flagstone
 x 1
 y 6
 end
+arch jessyb
+name A
+x 1
+y 6
+carrying 100
+arch key2
+name Key of A
+slaying 9A
+end
+end
 arch flagstone
 x 1
 y 7
@@ -629,7 +639,6 @@ end
 arch grate_closed_2
 x 5
 y 6
-protected 3
 connected 3
 end
 arch flagstone
@@ -639,7 +648,6 @@ end
 arch grate_closed_2
 x 5
 y 7
-protected 3
 connected 3
 end
 arch flagstone
@@ -649,7 +657,6 @@ end
 arch grate_closed_2
 x 5
 y 8
-protected 3
 connected 3
 end
 arch flagstone
@@ -659,7 +666,6 @@ end
 arch grate_closed_2
 x 5
 y 9
-protected 3
 connected 3
 end
 arch flagstone
@@ -791,7 +797,6 @@ end
 arch grate_closed_1
 x 6
 y 10
-protected 2
 connected 2
 end
 arch flagstone
@@ -915,7 +920,6 @@ end
 arch grate_closed_1
 x 7
 y 10
-protected 2
 connected 2
 end
 arch flagstone
@@ -1041,7 +1045,6 @@ end
 arch button_handle
 x 8
 y 7
-protected 1
 connected 1
 end
 arch flagstone
@@ -1069,7 +1072,6 @@ end
 arch grate_closed_1
 x 8
 y 10
-protected 2
 connected 2
 end
 arch flagstone
@@ -1194,7 +1196,6 @@ end
 arch grate_closed_1
 x 9
 y 10
-protected 2
 connected 2
 end
 arch flagstone
@@ -1318,7 +1319,6 @@ end
 arch grate_closed_1
 x 10
 y 10
-protected 2
 connected 2
 end
 arch flagstone
@@ -1430,7 +1430,6 @@ end
 arch grate_closed_2
 x 11
 y 6
-protected 4
 connected 4
 end
 arch flagstone
@@ -1440,7 +1439,6 @@ end
 arch grate_closed_2
 x 11
 y 7
-protected 4
 connected 4
 end
 arch flagstone
@@ -1450,7 +1448,6 @@ end
 arch grate_closed_2
 x 11
 y 8
-protected 4
 connected 4
 end
 arch flagstone
@@ -1460,7 +1457,6 @@ end
 arch grate_closed_2
 x 11
 y 9
-protected 4
 connected 4
 end
 arch flagstone
@@ -1577,6 +1573,16 @@ arch flagstone
 x 12
 y 6
 end
+arch jessyb
+name UM
+x 12
+y 6
+carrying 100
+arch key2
+name Key of UM
+slaying 9UM
+end
+end
 arch flagstone
 x 12
 y 7
@@ -2261,7 +2267,6 @@ end
 arch button_small
 x 18
 y 9
-protected 3
 connected 3
 end
 arch blocked
@@ -2312,7 +2317,6 @@ hp 19
 sp 9
 x 19
 y 4
-protected 1
 connected 1
 end
 arch key2
@@ -2334,19 +2338,16 @@ end
 arch button_small
 x 19
 y 8
-protected 2
 connected 2
 end
 arch button_small
 x 19
 y 9
-protected 5
 connected 5
 end
 arch button_small
 x 19
 y 10
-protected 4
 connected 4
 end
 arch blocked
@@ -2366,7 +2367,6 @@ hp 8
 sp 3
 x 19
 y 14
-protected 5
 connected 5
 end
 arch note
@@ -2452,23 +2452,3 @@ arch blocked
 x 20
 y 16
 end
-arch jessyb
-name A
-x 1
-y 6
-carrying 100
-arch key2
-name Key of A
-slaying 9A
-end
-end
-arch jessyb
-name UM
-x 12
-y 6
-carrying 100
-arch key2
-name Key of UM
-slaying 9UM
-end
-end

pup_land/s_f/to-jyo

@@ -314,9 +314,29 @@ endmsg
 hp 500
 x 3
 y 3
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_turn_undead 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_godpower 100
+resist_holyword 100
+resist_blind 100
 friendly 1
 unaggressive 0
-immune 8388607
 end
 arch pstone_1
 x 3
@@ -768,7 +788,6 @@ x 8
 y 8
 speed 0.500000
 connected 6
-protected 6
 end
 arch pstone_1
 x 8
@@ -876,7 +895,6 @@ endmsg
 x 9
 y 8
 connected 6
-protected 6
 end
 arch pstone_1
 x 9
@@ -1497,7 +1515,6 @@ x 18
 y 14
 weight 10000
 connected 2
-protected 2
 end
 arch creator
 name 1
@@ -1505,7 +1522,6 @@ other_arch boulder
 x 18
 y 14
 connected 1
-protected 1
 end
 arch blocked
 x 19
@@ -1601,7 +1617,6 @@ x 19
 y 14
 speed 0.000000
 connected 3
-protected 3
 end
 arch chair_1.1
 x 19
@@ -1794,7 +1809,6 @@ y 14
 speed 0.500000
 value 1
 connected 2
-protected 2
 end
 arch food
 x 21
@@ -1841,8 +1855,7 @@ x 22
 y 3
 value 1
 identified 1
-armour 1
+armour 0
-protected 0
 end
 arch flagstone
 x 22
@@ -1898,7 +1911,6 @@ food 1
 x 22
 y 14
 connected 4
-protected 4
 end
 arch blocked
 x 23
@@ -2069,7 +2081,6 @@ name 3 - chair
 x 24
 y 14
 connected 3
-protected 3
 end
 arch blocked
 x 25
@@ -2233,7 +2244,6 @@ x 26
 y 14
 speed 0.000000
 connected 4
-protected 4
 end
 arch sage
 name To-jyo
@@ -2251,11 +2261,31 @@ sp 0
 maxsp 0
 x 26
 y 14
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_turn_undead 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_godpower 100
+resist_holyword 100
+resist_blind 100
 monster 0
 unaggressive 0
 can_cast_spell 0
 can_use_skill 0
-immune 8388607
 end
 arch blocked
 x 27
@@ -2600,7 +2630,6 @@ endmsg
 x 30
 y 7
 connected 1
-protected 1
 end
 arch woodfloor
 x 30