MSW 2000-12-3:

Commit for PR code.  General changes was to clean up archetypes that
were immune/protected/vulnerable to the same attacktype (ie, protected &
immune).  Disease code changed to use last_grace instead of armour for
contagious values.  Gods still need to be fixed up.


git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@552 282e977c-c81d-0410-88c4-b93c2d0d6712

CHANGES

@@ -1,5 +1,11 @@
 Changes for CVS top of tree:
 
+MSW 2000-12-3:
+Commit for PR code.  General changes was to clean up archetypes that
+were immune/protected/vulnerable to the same attacktype (ie, protected &
+immune).  Disease code changed to use last_grace instead of armour for
+contagious values.  Gods still need to be fixed up.
+
 ------------------------------------------------------------------------------
 
 MSW 2000-11-22: talisman/ring_drain.arc - give object speed 0.1

armour/cloak/oilskin.arc

@@ -10,8 +10,7 @@ value 120000
 material 8
 editable 5120
 nrof 1
-immune 64
-protected 64
+resist_acid 70
 magic -4
 damned 1
 color_fg grey

armour/mail/wdsm.arc

@@ -10,8 +10,8 @@ ac 5
 armour 45
 weight 5000
 value 220000
-immune 20
-protected 4
+resist_cold 70
+resist_fire 30
 magic -3
 editable 5120
 color_fg black

disease/cold.arc

@@ -10,7 +10,7 @@ Cha -1
 maxhp 10
 dam 1
 maxgrace 6
-armour 1
+last_grace 1
 food -1
 speed 0.05
 last_sp 50

disease/ebola.arc

@@ -6,7 +6,7 @@ attacktype 1048576
 wc 30
 magic -1
 Str -3
-armour 5
+last_grace 5
 Con -4
 Dex -2
 Wis -2

disease/flu.arc

@@ -4,7 +4,7 @@ type 158
 invisible 1
 attacktype 1048576
 wc 20
-armour 1
+last_grace 1
 magic 3
 Str -1
 Con -1

disease/immolation.arc

@@ -27,7 +27,7 @@ You burn!
 endmsg
 race *,undead
 level 10
-armour 10
+last_grace 10
 end
 Object immolation_immunity
 name immolation

disease/plague.arc

@@ -5,7 +5,7 @@ attacktype 1048576
 invisible 1
 wc 10
 magic -1
-armour 1
+last_grace 1
 Str -3
 Con -4
 Dex -3

disease/pneumonic_plague.arc

@@ -4,7 +4,7 @@ type 158
 attacktype 1048576
 invisible 1
 wc 20
-armour 1
+last_grace 1
 magic 4
 Str -3
 Con -4

disease/smallpox.arc

@@ -4,7 +4,7 @@ type 158
 invisible 1
 attacktype 1048576
 wc 20
-armour 1
+last_grace 1
 magic -3
 Str -1
 Con -4

disease/typhoid.arc

@@ -4,7 +4,7 @@ type 158
 attacktype 1048576
 invisible 1
 wc 25
-armour 1
+last_grace 1
 magic -1
 Str -3
 Con -4

gods/demihumans/gnarg.arc

@@ -22,7 +22,6 @@ path_repelled 65792
 immune 1024
 protected 1024
 vulnerable 16384
-armour 40
 hp 1000
 ac -5
 wc -3

gods/demihumans/lythander.arc

@@ -22,7 +22,6 @@ protected 32
 vulnerable 32
 path_attuned 65536
 path_repelled 131088
-armour 50
 ac -7
 wc -1
 dam 40

gods/demihumans/mostrai.arc

@@ -20,7 +20,6 @@ Pow 30
 path_attuned 18432
 path_repelled 64
 protected 4
-armour 75
 ac -10
 wc -6
 dam 50

gods/elemental/gaea.arc

@@ -23,7 +23,6 @@ path_repelled 30
 immune 196736
 protected 196736
 vulnerable 16384
-armour 50
 ac -5
 wc -1
 dam 50

gods/elemental/ruggilli.arc

@@ -21,7 +21,6 @@ path_denied 82945
 immune 4
 protected 7
 vulnerable 16
-armour 20
 ac -5
 wc -3
 dam 60

gods/elemental/sorig.arc

@@ -20,7 +20,6 @@ protected 8
 path_attuned 131096
 path_repelled 256
 path_denied 66561
-armour 40
 ac -5
 wc -1
 dam 40

gods/supernatural/gorokh.arc

@@ -21,7 +21,6 @@ path_attuned 393216
 path_denied 1025
 protected 16416
 immune 16416
-armour 50
 ac -5
 wc -3
 dam 50

gods/supernatural/valriel.arc

@@ -21,7 +21,6 @@ path_attuned 1025
 path_denied 393216
 immune 16416
 protected 16416
-armour 50
 ac -7
 wc -1
 hp 350

monster/demon/bone_head.arc

@@ -21,8 +21,11 @@ flying 1
 exp 3500
 level 15
 attacktype 17
-immune 21522
-protected 16
+resist_magic 100
+resist_cold 100
+resist_poison 100
+resist_paralyze 100
+resist_fear 100
 ac -2
 Pow 16
 maxsp 50

monster/demon/evil_master1.arc

@@ -18,11 +18,13 @@ exp 7000
 dam 50
 wc -50
 ac -70
-armour 60
+resist_physical 70
+resist_cold 100
+resist_electricity 100
+resist_fire 100
+resist_magic 100
 speed 0.850000
 level 100
-immune 30
-protected 3
 attacktype 17
 randomitems spectre
 pick_up 24

monster/giant/Big_Wiz/big_wiz.arc

@@ -26,8 +26,10 @@ sp 100
 maxsp 100
 hp 3500
 maxhp 3500
-immune 21506
-protected 2
+resist_magic 100
+resist_poison 100
+resist_paralyze 100
+resist_fear 100
 ac -15
 wc -20
 dam 19

monster/giant/DreadKnight/DK.arc

@@ -46,8 +46,14 @@ can_use_ring 1
 can_use_armour 1
 can_use_weapon 1
 editable 1
-immune 20642
-protected 27
+resist_physical 50
+resist_magic 100
+resist_electricity 50
+resist_cold 50
+resist_confusion 100
+resist_drain 100
+resist_paralyze 100
+resist_fear 100
 ac -15
 wc -35
 dam 30

monster/giant/DreadKnight/EDK.arc

@@ -70,8 +70,14 @@ can_use_ring 1
 can_use_armour 1
 can_use_weapon 1
 editable 1
-immune 20651
-protected 18
+resist_physical 50
+resist_magic 100
+resist_cold 50
+resist_electricity 100
+resist_confusion 100
+resist_drain 100
+resist_paralyze 100
+resist_fear 100
 ac -15
 wc -35
 dam 45

monster/giant/byakie/byakie.arc

@@ -16,8 +16,8 @@ sp 20
 maxsp 20
 Int 1
 Pow 1
-armour 50
-immune 279555
+resist_physical 100
+immune 279554
 protected 6364
 vulnerable 32
 see_invisible 1

monster/goblin/ologhi.arc

@@ -13,7 +13,6 @@ alive 1
 exp 100
 level 100
 ac -100
-armour 100
 can_see_in_dark 1
 Str 30
 Dex 20
@@ -26,8 +25,9 @@ wc -100
 dam 100
 speed 0.25
 attack_movement 5
-immune 1
-vulnerable 10
+resist_physical 100
+resist_magic -100
+resist_electricity -100
 carrying 20000
 weight 140000
 randomitems throw_stnd

monster/undead/demilich.arc

@@ -23,14 +23,23 @@ Wis 20
 Pow 80
 see_invisible 1
 no_pick 1
-immune 23806
-protected 2
+resist_physical 30
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_fear 100
 sp 100
 maxsp 100
 hp 1000
 maxhp 1000
 ac -15
-armour 30
 exp 100000
 dam 1
 level 31

monster/undead/skull.arc

@@ -16,8 +16,11 @@ flying 1
 exp 5000
 level 15
 attacktype 17
-immune 21522
-protected 16
+resist_magic 100
+resist_cold 100
+resist_poison 100
+resist_paralyze 100
+resist_fear 100
 ac -2
 Pow 16
 maxsp 50

weapon/artifact/Lslasher/lava_s.arc

@@ -12,8 +12,7 @@ Con 2
 dam 30
 speed 0.250000
 type 15
-immune 16
-protected 16
+resist_cold 70
 attacktype 5
 material 2
 value 220000

weapon/artifact/defender.arc

@@ -3,14 +3,14 @@ name Defender
 nrof 1
 last_sp 8
 ac -1
-armour 20
 type 15
 face defender.111
 material 2
 dam 8
 weight 20000
+resist_drain 50
+resist_physical 50
 magic 3
-protected 129
 value 150000
 editable 5120
 attacktype 1