diff --git a/CHANGES b/CHANGES
index 35805bec4..91bad5f9a 100644
--- a/CHANGES
+++ b/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
diff --git a/armour/cloak/oilskin.arc b/armour/cloak/oilskin.arc
index f76b4861a..47ac99d4c 100644
--- a/armour/cloak/oilskin.arc
+++ b/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
diff --git a/armour/mail/wdsm.arc b/armour/mail/wdsm.arc
index 2b0c66f84..06763e97f 100644
--- a/armour/mail/wdsm.arc
+++ b/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
diff --git a/disease/cold.arc b/disease/cold.arc
index 6963d932c..959e9d540 100644
--- a/disease/cold.arc
+++ b/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
diff --git a/disease/ebola.arc b/disease/ebola.arc
index 312a6b895..3b3bb7ff4 100644
--- a/disease/ebola.arc
+++ b/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
diff --git a/disease/flu.arc b/disease/flu.arc
index 9ab35b04c..5c3716e2d 100644
--- a/disease/flu.arc
+++ b/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
diff --git a/disease/immolation.arc b/disease/immolation.arc
index a32f47253..297a6b3d4 100644
--- a/disease/immolation.arc
+++ b/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
diff --git a/disease/plague.arc b/disease/plague.arc
index 8fe53285c..c5f899801 100644
--- a/disease/plague.arc
+++ b/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
diff --git a/disease/pneumonic_plague.arc b/disease/pneumonic_plague.arc
index 9729eab15..a34314248 100644
--- a/disease/pneumonic_plague.arc
+++ b/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
diff --git a/disease/smallpox.arc b/disease/smallpox.arc
index eea501cb4..376071ab6 100644
--- a/disease/smallpox.arc
+++ b/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
diff --git a/disease/typhoid.arc b/disease/typhoid.arc
index d51b5dbc5..2a1241781 100644
--- a/disease/typhoid.arc
+++ b/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
diff --git a/gods/demihumans/gnarg.arc b/gods/demihumans/gnarg.arc
index 7afe776bf..bd2f6cdcc 100644
--- a/gods/demihumans/gnarg.arc
+++ b/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
diff --git a/gods/demihumans/lythander.arc b/gods/demihumans/lythander.arc
index 0bda59b2d..8b175f242 100644
--- a/gods/demihumans/lythander.arc
+++ b/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
diff --git a/gods/demihumans/mostrai.arc b/gods/demihumans/mostrai.arc
index 66674e26c..105e656fd 100644
--- a/gods/demihumans/mostrai.arc
+++ b/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
diff --git a/gods/elemental/gaea.arc b/gods/elemental/gaea.arc
index 1e911a809..b8cc5e4a0 100644
--- a/gods/elemental/gaea.arc
+++ b/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
diff --git a/gods/elemental/ruggilli.arc b/gods/elemental/ruggilli.arc
index a4cf42b3a..c8d8fc951 100644
--- a/gods/elemental/ruggilli.arc
+++ b/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
diff --git a/gods/elemental/sorig.arc b/gods/elemental/sorig.arc
index ec9ff9cac..86b06b7ca 100644
--- a/gods/elemental/sorig.arc
+++ b/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
diff --git a/gods/supernatural/gorokh.arc b/gods/supernatural/gorokh.arc
index ca529e215..fc76a2b6b 100644
--- a/gods/supernatural/gorokh.arc
+++ b/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
diff --git a/gods/supernatural/valriel.arc b/gods/supernatural/valriel.arc
index 68bdacc32..1e0c37187 100644
--- a/gods/supernatural/valriel.arc
+++ b/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
diff --git a/monster/demon/bone_head.arc b/monster/demon/bone_head.arc
index abffdc734..afc80ae64 100644
--- a/monster/demon/bone_head.arc
+++ b/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
diff --git a/monster/demon/evil_master1.arc b/monster/demon/evil_master1.arc
index 53b4960a4..1c2159bec 100644
--- a/monster/demon/evil_master1.arc
+++ b/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
diff --git a/monster/giant/Big_Wiz/big_wiz.arc b/monster/giant/Big_Wiz/big_wiz.arc
index 24c4fb812..774ebedf8 100644
--- a/monster/giant/Big_Wiz/big_wiz.arc
+++ b/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
diff --git a/monster/giant/DreadKnight/DK.arc b/monster/giant/DreadKnight/DK.arc
index 8815723fc..ccdc90496 100644
--- a/monster/giant/DreadKnight/DK.arc
+++ b/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
diff --git a/monster/giant/DreadKnight/EDK.arc b/monster/giant/DreadKnight/EDK.arc
index 16cbbef8b..48a6b5597 100644
--- a/monster/giant/DreadKnight/EDK.arc
+++ b/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
diff --git a/monster/giant/byakie/byakie.arc b/monster/giant/byakie/byakie.arc
index f8d659ef7..8573df206 100644
--- a/monster/giant/byakie/byakie.arc
+++ b/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
diff --git a/monster/goblin/ologhi.arc b/monster/goblin/ologhi.arc
index 5299ddb09..f94b15e55 100644
--- a/monster/goblin/ologhi.arc
+++ b/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
diff --git a/monster/undead/demilich.arc b/monster/undead/demilich.arc
index 92db3021a..505abe323 100644
--- a/monster/undead/demilich.arc
+++ b/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
diff --git a/monster/undead/skull.arc b/monster/undead/skull.arc
index a77a4d685..91bc7a983 100644
--- a/monster/undead/skull.arc
+++ b/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
diff --git a/weapon/artifact/Lslasher/lava_s.arc b/weapon/artifact/Lslasher/lava_s.arc
index 7c86d01d0..c9c1a45a7 100644
--- a/weapon/artifact/Lslasher/lava_s.arc
+++ b/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
diff --git a/weapon/artifact/defender.arc b/weapon/artifact/defender.arc
index 163639bbd..df84e679c 100644
--- a/weapon/artifact/defender.arc
+++ b/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