Fix armour defense bonus handling.

In particular, (a) defense bonus rolls for armour with defense (say) 20
now go from 0 to 20, not 1 to 20, and (b) the special cases for -1 and
+1 armour go away; +5 armour has an additional 0-5 bonus, not 1-5.