change armour rules to covering no.

arms.sty

@@ -127,7 +127,7 @@
 
 %% For perfect armour, stick \perfect Armour in the additional notes category of a \person (#9).
 
-\newcommand{\perfectArmour}{\gdef\armourtype{(Perfect)}}
+\newcommand{\perfectArmour}{\setcounter{covering}{8}}
 
 \newcommand{\partialelvish}{partial leather armour%
 	\ifnumcomp{\value{dr}}{>}{2}%
@@ -139,32 +139,22 @@
   \armour{partial leather}{3}{2}%
 }
 
-\newcommand{\completeleather}{full leather armour\gdef\armourtype{C}%
-	\ifnumcomp{\value{dr}}{>}{3}%
-	{\addtocounter{dr}{2}}%
-	{\divide\value{dr} by 2 \addtocounter{dr}{3}}%
+\newcommand{\completeleather}{
+  \armour{complete leather}{3}{4}%
 }
 
-\newcommand{\partialchain}{partial chainmail%
-	\ifnumcomp{\value{dr}}{>}{4}%
-	{\addtocounter{dr}{2}}%
-	{\divide\value{dr} by 2 \addtocounter{dr}{4}}%
+\newcommand{\partialchain}{
+  \armour{partial chain}{4}{2}%
 }
 
-\newcommand{\completechain}{complete chain armour\gdef\armourtype{C}%
-	\ifnumcomp{\value{dr}}{>}{4}%
-	{\addtocounter{dr}{2}}%
-	{\divide\value{dr} by 2 \addtocounter{dr}{4}}%
+\newcommand{\completechain}{
+  \armour{complete chain}{4}{4}%
 }
 
-\newcommand{\partialplate}{partial plate armour%
-	\ifnumcomp{\value{dr}}{>}{5}%
-	{\addtocounter{dr}{3}}%
-	{\divide\value{dr} by 2 \addtocounter{dr}{5}}%
+\newcommand{\partialplate}{
+  \armour{partial plate}{5}{2}%
 }
 
-\newcommand{\completeplate}{complete plate armour\gdef\armourtype{C}%
-	\ifnumcomp{\value{dr}}{>}{5}%
-	{\addtocounter{dr}{3}}%
-	{\divide\value{dr} by 2 \addtocounter{dr}{5}}%
+\newcommand{\completeplate}{
+  \armour{complete plate}{5}{4}%
 }

monsters.sty

@@ -226,7 +226,7 @@
 	\lockedmana{\value{r3b}}%
 	\setcounter{sp}{\value{gold}}%
 	\fi%
-	\gdef\armourtype{C}}
+  }
 	}
 
 \newcommand{\dwarventrader}[1][\npc{\T[\arabic{r12}]\Dw\M}{\arabic{r12} Dwarven Traders}]{
@@ -327,7 +327,7 @@
       \fi%
     }}% SKILLS
 	{\ifodd\thepage\Dagger, \lootJewellery\else\spear\fi}% EQUIPMENT
-	{\lockedmana{5}\gdef\armourtype{C}}
+	{\lockedmana{5}}
 	}
 
 \newcommand{\elf}[1][\npc{\T[\arabic{r2c}]\El\F}{\arabic{r2c} Elves}]{

stats.sty

@@ -288,7 +288,6 @@
 \newcommand{\saurecanta}{\addtocounter{mp}{3}Saurecanta}
 
 \newcommand{\lockedmana}[1]{\setcounter{mpLocked}{#1}}
-\newcommand{\armourtype}{N}
 
 \newcommand{\knacks}[1]{ \\
 	\ent{Knacks:} & #1 
@@ -450,9 +449,6 @@
 
   \clean
 
-  \renewcommand{\armourtype}{P}
-  \gdef\armourtype{P}
-
   \iftoggle{verbose}{
     \begin{tcolorbox}[
       title={\name},
@@ -519,12 +515,10 @@
 	\renewcommand{\skills}{#7}
 	\renewcommand{\abilities}{#8}
 	\renewcommand{\mods}{#9}
+  \setcounter{covering}{4}
 
 	\clean
 
-  \renewcommand{\armourtype}{C}
-  \gdef\armourtype{C}
-
   \iftoggle{verbose}{
     \begin{tcolorbox}[title={\name},
       before upper={\parindent0pt},
@@ -577,7 +571,6 @@
 	\setcounter{heft}{1}
 	\setcounter{damage}{0}
 	\setcounter{knacks}{0}
-	\renewcommand{\armourtype}{N}
 	\setcounter{mp}{0}
 	\setcounter{mpLocked}{0}
 	\setcounter{xpbonus}{0}
@@ -668,13 +661,12 @@
   \setcounter{enc}{\value{att}},%
   \addtocounter{damage}{\value{str}}
   \mbox{Dam \dmg{damage}, }%
-    \ifnumcomp{\value{dr}}{>}{0}{\mbox{DR \arabic{dr}~\armourtype} 
-      \ifdefstring{\armourtype}{C}{%
-        \addtocounter{enc}{5} (\arabic{enc}!)%
-      }{%
-        \ifdefstring{\armourtype}{P}{\addtocounter{enc}{3} (\arabic{enc}!)}{}%
-      }%
-    \ignorespaces,}{}%
+    \ifnumcomp{\value{dr}}{>}{0}{%
+      \setcounter{enc}{\value{att}}%
+      \addtocounter{enc}{\value{covering}}%
+      \stepcounter{enc}%
+      \mbox{DR \arabic{dr} (\arabic{enc}!)}%
+    }{}%
   \addtocounter{hp}{6}%
   \addtocounter{damage}{4}%
   \ifnum\value{mp}>0%