From 3265d8daae9e737f73d7c407f6101bddc1ed02c5 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sun, 13 May 2007 13:49:39 +0000 Subject: [PATCH] Remove obsolete armour field. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6256 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/ancient/castle/castle.1 | 5 +- .../ancient/village/siegfried/siegfried.B3 | 6 +- pup_land/castle_eureca/castle_eureca2 | 2 +- pup_land/castle_eureca/castle_eurecaB2 | 2 +- pup_land/castle_eureca/cave_pass | 2 +- pup_land/cave_weapon/cave1 | 2 +- pup_land/cave_weapon/cave2 | 62 +++++++++---------- pup_land/cave_weapon/cave3 | 24 +++---- pup_land/cave_weapon/cave4 | 38 ++++++------ pup_land/jk/gs_house | 2 +- pup_land/lone_town/cave/b3 | 4 +- pup_land/lone_town/heinrich | 2 +- pup_land/s_f/floor2 | 2 +- pup_land/s_f/st7 | 2 +- pup_land/s_f/to-jyo | 4 +- 15 files changed, 79 insertions(+), 80 deletions(-) diff --git a/pup_land/ancient/castle/castle.1 b/pup_land/ancient/castle/castle.1 index 2f9052a6a..7967f4037 100644 --- a/pup_land/ancient/castle/castle.1 +++ b/pup_land/ancient/castle/castle.1 @@ -1427,7 +1427,7 @@ speed 0.5 speed_left -2.100000 level 100 attacktype 4588873 -resist_physical 30 +resist_physical 80 resist_magic 30 resist_electricity 100 resist_weaponmagic 30 @@ -1444,7 +1444,6 @@ run_away 3 can_cast_spell 1 sleep 0 can_see_in_dark 1 -armour 80 arch spell_bullet_swarm end arch spell_cause_heavy_wounds @@ -1524,6 +1523,7 @@ ac -120 speed 0.1 level 110 attacktype 1048705 +resist_physical 99 resist_magic 100 resist_fire 100 resist_electricity 100 @@ -1539,7 +1539,6 @@ see_invisible 1 is_used_up 0 can_cast_spell 1 can_see_in_dark 1 -armour 99 arch spell_major_healing end arch spell_regenerate_spellpoints diff --git a/pup_land/ancient/village/siegfried/siegfried.B3 b/pup_land/ancient/village/siegfried/siegfried.B3 index 63e3062b7..b9906bff9 100644 --- a/pup_land/ancient/village/siegfried/siegfried.B3 +++ b/pup_land/ancient/village/siegfried/siegfried.B3 @@ -5063,7 +5063,7 @@ exp 1000 dam 127 wc -128 ac -128 -armour 127 +resist_physical 127 x 22 y 24 speed 0.250000 @@ -5087,7 +5087,7 @@ exp 1000 dam 127 wc -128 ac -128 -armour 127 +resist_physical 127 x 22 y 25 speed 0.250000 @@ -5111,7 +5111,7 @@ exp 1000 dam 127 wc -128 ac -128 -armour 127 +resist_physical 127 x 22 y 26 speed 0.800000 diff --git a/pup_land/castle_eureca/castle_eureca2 b/pup_land/castle_eureca/castle_eureca2 index e66164759..4fe3871b5 100644 --- a/pup_land/castle_eureca/castle_eureca2 +++ b/pup_land/castle_eureca/castle_eureca2 @@ -903,7 +903,7 @@ weight 200 magic 4 last_sp 5 no_pick 1 -armour 13 +resist_physical 13 end arch dungeon_floor x 5 diff --git a/pup_land/castle_eureca/castle_eurecaB2 b/pup_land/castle_eureca/castle_eurecaB2 index dd7faf1a8..bf81612f0 100644 --- a/pup_land/castle_eureca/castle_eurecaB2 +++ b/pup_land/castle_eureca/castle_eurecaB2 @@ -7211,7 +7211,7 @@ weight 5000 magic -3 identified 0 cursed 1 -armour 45 +resist_physical 45 end arch blocked x 22 diff --git a/pup_land/castle_eureca/cave_pass b/pup_land/castle_eureca/cave_pass index cf3272b48..ff492fd0a 100644 --- a/pup_land/castle_eureca/cave_pass +++ b/pup_land/castle_eureca/cave_pass @@ -1890,7 +1890,7 @@ ac 2 resist_poison 30 weight 8000 magic 1 -armour 3 +resist_physical 3 end end arch mine2 diff --git a/pup_land/cave_weapon/cave1 b/pup_land/cave_weapon/cave1 index c05c171bd..d1529f4d8 100644 --- a/pup_land/cave_weapon/cave1 +++ b/pup_land/cave_weapon/cave1 @@ -2787,7 +2787,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 28 y 15 attack_movement 7 diff --git a/pup_land/cave_weapon/cave2 b/pup_land/cave_weapon/cave2 index b84789d93..4477dc663 100644 --- a/pup_land/cave_weapon/cave2 +++ b/pup_land/cave_weapon/cave2 @@ -701,7 +701,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 4 y 7 speed 0.300000 @@ -909,7 +909,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 5 y 6 speed 0.300000 @@ -1125,7 +1125,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 6 y 5 speed 0.300000 @@ -1170,7 +1170,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 6 y 8 speed 0.300000 @@ -1341,7 +1341,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 7 y 3 speed 0.300000 @@ -1378,7 +1378,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 7 y 4 speed 0.300000 @@ -1419,7 +1419,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 7 y 6 speed 0.300000 @@ -1456,7 +1456,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 7 y 7 speed 0.300000 @@ -1535,7 +1535,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 7 y 18 speed 0.200000 @@ -1572,7 +1572,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 7 y 20 speed 0.200000 @@ -1689,7 +1689,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 8 y 5 speed 0.300000 @@ -1734,7 +1734,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 8 y 8 speed 0.300000 @@ -1825,7 +1825,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 8 y 22 speed 0.200000 @@ -1931,7 +1931,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 9 y 6 speed 0.300000 @@ -2059,7 +2059,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 9 y 24 speed 0.200000 @@ -2169,7 +2169,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 10 y 7 speed 0.300000 @@ -2292,7 +2292,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 10 y 20 speed 0.200000 @@ -2341,7 +2341,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 10 y 25 speed 0.200000 @@ -2569,7 +2569,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 11 y 22 speed 0.200000 @@ -2614,7 +2614,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 11 y 26 speed 0.200000 @@ -2852,7 +2852,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 12 y 24 speed 0.200000 @@ -3097,7 +3097,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 13 y 25 speed 0.200000 @@ -3506,7 +3506,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 15 y 17 attack_movement 7 @@ -3538,7 +3538,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 15 y 19 attack_movement 7 @@ -3719,7 +3719,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 16 y 16 attack_movement 7 @@ -3751,7 +3751,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 16 y 18 attack_movement 7 @@ -4077,7 +4077,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 17 y 17 attack_movement 7 @@ -4109,7 +4109,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 17 y 19 attack_movement 7 @@ -4308,7 +4308,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 18 y 16 attack_movement 7 @@ -4340,7 +4340,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 18 y 18 attack_movement 7 @@ -4538,7 +4538,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 19 y 17 attack_movement 7 diff --git a/pup_land/cave_weapon/cave3 b/pup_land/cave_weapon/cave3 index d6412fd15..58ea001e1 100644 --- a/pup_land/cave_weapon/cave3 +++ b/pup_land/cave_weapon/cave3 @@ -216,7 +216,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch dungeon_magic x 1 @@ -270,7 +270,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch dungeon_magic x 1 @@ -635,7 +635,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 4 @@ -720,7 +720,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 4 @@ -890,7 +890,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch dun2 x 6 @@ -1142,7 +1142,7 @@ level 19 unaggressive 1 can_use_armour 0 can_use_weapon 0 -armour 90 +resist_physical 90 end arch flagstone x 8 @@ -1196,7 +1196,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 8 @@ -1270,7 +1270,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 8 @@ -1573,7 +1573,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch dun2 x 11 @@ -1769,7 +1769,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 12 @@ -1849,7 +1849,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 13 @@ -2186,7 +2186,7 @@ unaggressive 1 can_cast_spell 1 can_use_armour 0 can_use_weapon 0 -armour 1 +resist_physical 1 end arch flagstone x 15 diff --git a/pup_land/cave_weapon/cave4 b/pup_land/cave_weapon/cave4 index eca392d28..779311337 100644 --- a/pup_land/cave_weapon/cave4 +++ b/pup_land/cave_weapon/cave4 @@ -209,7 +209,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 1 y 9 attack_movement 7 @@ -264,7 +264,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 1 y 13 attack_movement 7 @@ -311,7 +311,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 1 y 16 attack_movement 7 @@ -637,7 +637,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 3 y 17 attack_movement 7 @@ -719,7 +719,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 4 y 5 attack_movement 7 @@ -754,7 +754,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 4 y 7 attack_movement 7 @@ -807,7 +807,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 4 y 12 level 10 @@ -1126,7 +1126,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 6 y 17 attack_movement 7 @@ -1297,7 +1297,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 8 y 5 attack_movement 7 @@ -1332,7 +1332,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 8 y 7 attack_movement 7 @@ -1436,7 +1436,7 @@ exp 800 dam 30 wc 0 ac -1 -armour 25 +resist_physical 25 x 9 y 2 speed 0.050000 @@ -1519,7 +1519,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 9 y 10 attack_movement 7 @@ -1584,7 +1584,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 9 y 17 attack_movement 7 @@ -1861,7 +1861,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 12 y 5 attack_movement 7 @@ -1900,7 +1900,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 12 y 7 attack_movement 7 @@ -1963,7 +1963,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 12 y 14 speed 1.000000 @@ -2011,7 +2011,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 12 y 17 attack_movement 7 @@ -2407,7 +2407,7 @@ maxsp 200 exp 1000 dam 20 ac -2 -armour 28 +resist_physical 28 x 15 y 17 attack_movement 7 @@ -2476,7 +2476,7 @@ exp 800 dam 32 wc -1 ac -1 -armour 25 +resist_physical 25 x 16 y 6 speed 0.050000 diff --git a/pup_land/jk/gs_house b/pup_land/jk/gs_house index 2c3916ead..194f68367 100644 --- a/pup_land/jk/gs_house +++ b/pup_land/jk/gs_house @@ -2026,7 +2026,7 @@ level 45 attacktype 262225 carrying 20 hitback 1 -armour 0 +resist_physical 0 arch ectoplasm name Killing Thrill's ectoplasm type 0 diff --git a/pup_land/lone_town/cave/b3 b/pup_land/lone_town/cave/b3 index bb3ab0c70..5308de787 100755 --- a/pup_land/lone_town/cave/b3 +++ b/pup_land/lone_town/cave/b3 @@ -2482,7 +2482,7 @@ x 8 y 36 speed 0.000500 level 100 -armour 100 +resist_physical 100 end arch dungeon_floor x 8 @@ -2506,7 +2506,7 @@ x 8 y 38 speed 0.000500 level 100 -armour 100 +resist_physical 100 end arch dungeon_floor x 8 diff --git a/pup_land/lone_town/heinrich b/pup_land/lone_town/heinrich index e23081b7b..fe51b2df3 100644 --- a/pup_land/lone_town/heinrich +++ b/pup_land/lone_town/heinrich @@ -417,7 +417,7 @@ arch high_boots ac 0 x 4 y 2 -armour 0 +resist_physical 0 end arch cobblestones2 x 4 diff --git a/pup_land/s_f/floor2 b/pup_land/s_f/floor2 index c78915a21..3cb0e7428 100644 --- a/pup_land/s_f/floor2 +++ b/pup_land/s_f/floor2 @@ -1796,7 +1796,7 @@ people endmsg Int 1 ac 1 -armour 4 +resist_physical 4 material 64 value 320000 weight 33000 diff --git a/pup_land/s_f/st7 b/pup_land/s_f/st7 index ba4bdbd5c..5ebde6aef 100644 --- a/pup_land/s_f/st7 +++ b/pup_land/s_f/st7 @@ -995,7 +995,7 @@ x 11 y 6 value 100000 weight 5000 -armour 131072 +resist_physical 131072 end arch flagstone x 11 diff --git a/pup_land/s_f/to-jyo b/pup_land/s_f/to-jyo index a143f1327..6709e5fff 100644 --- a/pup_land/s_f/to-jyo +++ b/pup_land/s_f/to-jyo @@ -1742,7 +1742,7 @@ x 21 y 3 value 1 identified 1 -armour 1 +resist_physical 1 end arch flagstone x 21 @@ -1855,7 +1855,7 @@ x 22 y 3 value 1 identified 1 -armour 0 +resist_physical 0 end arch flagstone x 22