diff --git a/dragonisland/dragonmountain1 b/dragonisland/dragonmountain1
index ceba482d5..da83f4574 100644
--- a/dragonisland/dragonmountain1
+++ b/dragonisland/dragonmountain1
@@ -1630,6 +1630,16 @@ arch random_wealth
 x 8
 y 10
 end
+arch big_dragon
+name red hideous dragon
+exp 10000
+x 8
+y 10
+carrying 30000
+can_cast_spell 0
+arch kobold
+end
+end
 arch small_stones
 x 8
 y 11
@@ -2722,6 +2732,10 @@ arch small_stones
 x 14
 y 3
 end
+arch dread
+x 14
+y 3
+end
 arch small_stones
 x 14
 y 4
@@ -3482,6 +3496,22 @@ arch small_stones
 x 18
 y 12
 end
+arch big_dragon
+name Infyrana
+Int 5
+hp 20000
+maxhp 20000
+maxsp 80
+exp 200000
+dam 40
+wc -25
+ac -16
+x 18
+y 12
+speed -0.500000
+level 80
+resist_physical 0
+end
 arch small_stones
 x 18
 y 13
@@ -7638,33 +7668,3 @@ arch mine12
 x 39
 y 32
 end
-arch big_dragon
-name red hideous dragon
-exp 10000
-x 8
-y 10
-carrying 30000
-can_cast_spell 0
-arch kobold
-end
-end
-arch dread
-x 14
-y 3
-end
-arch big_dragon
-name Infyrana
-Int 5
-hp 20000
-maxhp 20000
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 18
-y 12
-speed -0.500000
-level 80
-armour 0
-end
diff --git a/lake_country/Butakis/inn b/lake_country/Butakis/inn
index d72f23c95..5c7b1e7a9 100644
--- a/lake_country/Butakis/inn
+++ b/lake_country/Butakis/inn
@@ -564,7 +564,7 @@ randomitems none
 move_type walk
 monster 1
 unaggressive 1
-armour 30
+resist_physical 30
 end
 arch woodfloor
 x 5
diff --git a/navar_city/illusion/illtow1 b/navar_city/illusion/illtow1
index b865bd5b0..d19e06c84 100644
--- a/navar_city/illusion/illtow1
+++ b/navar_city/illusion/illtow1
@@ -211,7 +211,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 1
@@ -234,7 +234,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 1
@@ -257,7 +257,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 1
@@ -358,7 +358,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 2
@@ -389,7 +389,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 2
@@ -412,7 +412,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 2
@@ -569,7 +569,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 3
@@ -592,7 +592,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 3
@@ -705,7 +705,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 4
@@ -831,7 +831,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 5
@@ -854,7 +854,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 5
@@ -999,7 +999,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 6
@@ -1022,7 +1022,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 6
@@ -1151,7 +1151,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 7
@@ -1174,7 +1174,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 7
@@ -1291,7 +1291,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 8
@@ -1314,7 +1314,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 8
@@ -1351,7 +1351,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 9
@@ -1374,7 +1374,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 9
@@ -1495,7 +1495,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 9
@@ -1518,7 +1518,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 9
@@ -1555,7 +1555,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 10
@@ -1578,7 +1578,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 10
@@ -1701,7 +1701,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 10
@@ -1746,7 +1746,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 11
@@ -1845,7 +1845,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 11
@@ -1868,7 +1868,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 11
@@ -1905,7 +1905,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 12
@@ -1928,7 +1928,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 12
@@ -2048,12 +2048,12 @@ x 13
 y 1
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 13
@@ -2215,7 +2215,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 14
@@ -2238,7 +2238,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 14
@@ -2363,7 +2363,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 15
@@ -2386,7 +2386,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 15
@@ -2499,7 +2499,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 16
@@ -2522,7 +2522,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 16
@@ -2679,7 +2679,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 17
@@ -2710,7 +2710,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 17
@@ -2733,7 +2733,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 17
@@ -2756,7 +2756,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 17
@@ -2782,12 +2782,12 @@ x 17
 y 7
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 17
@@ -2805,12 +2805,12 @@ x 17
 y 8
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 17
@@ -2828,12 +2828,12 @@ x 17
 y 9
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 17
@@ -2906,7 +2906,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -2929,7 +2929,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -2952,7 +2952,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -2975,7 +2975,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -2998,7 +2998,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -3021,7 +3021,7 @@ monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
+resist_physical 0
 end
 arch cobblestones
 x 18
@@ -3039,12 +3039,12 @@ x 18
 y 7
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 18
@@ -3062,12 +3062,12 @@ x 18
 y 8
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 18
@@ -3085,12 +3085,12 @@ x 18
 y 9
 speed -0.050000
 level 4
+resist_physical 0
 weight 15000
 monster 0
 undead 1
 run_away 0
 sleep 1
-armour 0
 end
 arch cobblestones
 x 18
diff --git a/quests/mak/chaos/monsters.pick b/quests/mak/chaos/monsters.pick
index 65b5e9a2d..4e7a49379 100644
--- a/quests/mak/chaos/monsters.pick
+++ b/quests/mak/chaos/monsters.pick
@@ -450,7 +450,7 @@ level 25
 see_invisible 1
 can_cast_spell 1
 stand_still 0
-armour 1
+resist_physical 1
 arch ability_fear
 end
 arch ability_paralyze
@@ -582,7 +582,7 @@ y 7
 speed -0.600000
 level 31
 attacktype 2
-armour 20514
+resist_physical 20514
 arch ability_speedball
 end
 arch ability_missile
@@ -764,7 +764,7 @@ value 1000000
 last_heal 0
 glow_radius 2
 identified 1
-armour 5
+resist_physical 5
 end
 arch key2
 name a sharpedged key
@@ -794,7 +794,7 @@ carrying 4250
 see_invisible 1
 unaggressive 0
 can_cast_spell 1
-armour 0
+resist_physical 0
 arch ability_slow
 end
 arch ability_speedball
diff --git a/quests/mcz/castle1 b/quests/mcz/castle1
index fce4fbb6a..29ec7fb00 100644
--- a/quests/mcz/castle1
+++ b/quests/mcz/castle1
@@ -324,7 +324,7 @@ dam 8
 x 2
 y 2
 level 6
-armour 28
+resist_physical 28
 end
 arch dungeon_floor
 x 2
@@ -349,7 +349,7 @@ dam 8
 x 2
 y 3
 level 6
-armour 28
+resist_physical 28
 end
 arch dungeon_floor
 x 2
@@ -540,7 +540,7 @@ dam 8
 x 3
 y 2
 level 6
-armour 28
+resist_physical 28
 end
 arch dungeon_floor
 x 3
@@ -560,7 +560,7 @@ dam 8
 x 3
 y 3
 level 6
-armour 28
+resist_physical 28
 end
 arch dungeon_floor
 x 3
diff --git a/santo_dominion/mudman/mudman.3 b/santo_dominion/mudman/mudman.3
index 7e8d0a086..b041d8d82 100644
--- a/santo_dominion/mudman/mudman.3
+++ b/santo_dominion/mudman/mudman.3
@@ -1665,7 +1665,7 @@ arch ring
 name Mudman's ring
 face ring_green.111
 value 8000
-armour 3072
+resist_physical 3072
 end
 arch residue
 name Mudman's residue
diff --git a/sisters/compound2 b/sisters/compound2
index b80e564e2..e28c08770 100644
--- a/sisters/compound2
+++ b/sisters/compound2
@@ -525,7 +525,7 @@ x 5
 y 1
 speed -0.200000
 see_invisible 0
-armour 20
+resist_physical 20
 end
 arch woodfloor
 x 5
@@ -1122,7 +1122,7 @@ maxhp 6000
 x 9
 y 13
 carrying 30000
-armour 50
+resist_physical 50
 arch mjoellnir
 name Baba Mal the War Hammer
 Str 0
diff --git a/sisters/shrine0_east b/sisters/shrine0_east
index 77cdbffa4..c8143e184 100644
--- a/sisters/shrine0_east
+++ b/sisters/shrine0_east
@@ -1009,7 +1009,7 @@ ac 0
 x 15
 y 5
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 15
@@ -1024,7 +1024,7 @@ ac 0
 x 15
 y 6
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 15
@@ -1108,7 +1108,7 @@ ac 0
 x 15
 y 18
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 15
@@ -1123,7 +1123,7 @@ ac 0
 x 15
 y 19
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch magic_mouth
 msg
@@ -1205,7 +1205,7 @@ ac 0
 x 16
 y 5
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 16
@@ -1220,7 +1220,7 @@ ac 0
 x 16
 y 6
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 16
@@ -1303,7 +1303,7 @@ ac 0
 x 16
 y 18
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 16
@@ -1318,7 +1318,7 @@ ac 0
 x 16
 y 19
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 16
@@ -1575,7 +1575,7 @@ ac 0
 x 18
 y 12
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 18
@@ -1590,7 +1590,7 @@ ac 0
 x 18
 y 13
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 18
@@ -1744,7 +1744,7 @@ ac 0
 x 19
 y 12
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 19
@@ -1759,7 +1759,7 @@ ac 0
 x 19
 y 13
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 19
@@ -2120,7 +2120,7 @@ ac 0
 x 21
 y 12
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 21
@@ -2135,7 +2135,7 @@ ac 0
 x 21
 y 13
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 21
@@ -2293,7 +2293,7 @@ ac 0
 x 22
 y 12
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 22
@@ -2308,7 +2308,7 @@ ac 0
 x 22
 y 13
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 22
@@ -2545,7 +2545,7 @@ ac 0
 x 24
 y 6
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 24
@@ -2560,7 +2560,7 @@ ac 0
 x 24
 y 7
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 24
@@ -2635,7 +2635,7 @@ ac 0
 x 24
 y 17
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 24
@@ -2650,7 +2650,7 @@ ac 0
 x 24
 y 18
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 24
@@ -2728,7 +2728,7 @@ ac 0
 x 25
 y 6
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 25
@@ -2743,7 +2743,7 @@ ac 0
 x 25
 y 7
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 25
@@ -2818,7 +2818,7 @@ ac 0
 x 25
 y 17
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch flagstone
 x 25
@@ -2833,7 +2833,7 @@ ac 0
 x 25
 y 18
 speed -0.180000
-armour 0
+resist_physical 0
 end
 arch magic_mouth
 msg
diff --git a/sisters/tower2 b/sisters/tower2
index d34d7a41a..cba6c732b 100644
--- a/sisters/tower2
+++ b/sisters/tower2
@@ -142,7 +142,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -196,7 +196,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -387,7 +387,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -437,7 +437,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -521,7 +521,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -622,7 +622,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -739,7 +739,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -857,7 +857,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1169,7 +1169,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1229,7 +1229,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1335,7 +1335,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1403,7 +1403,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1516,7 +1516,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1570,7 +1570,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1752,7 +1752,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
@@ -1806,7 +1806,7 @@ monster 1
 move_type walk
 see_invisible 1
 unaggressive 1
-armour 16
+resist_physical 16
 arch rock
 end
 arch rock
diff --git a/sisters/tower3 b/sisters/tower3
index 5d2e209fb..469b71c1f 100644
--- a/sisters/tower3
+++ b/sisters/tower3
@@ -132,7 +132,7 @@ x 1
 y 5
 path_denied 32768
 value 30000
-armour 24575
+resist_physical 24575
 end
 arch flagstone
 x 1
diff --git a/test/anthony/raffles_cascade b/test/anthony/raffles_cascade
index d966ca393..f28e7fb34 100644
--- a/test/anthony/raffles_cascade
+++ b/test/anthony/raffles_cascade
@@ -858,7 +858,7 @@ y 1
 resist_death 100
 value 100000
 weight 5000
-armour 10
+resist_physical 10
 end
 arch swall_2_1_2
 x 12