Merge commit 'b96b4889' into dev

monsters.tex

@@ -1506,32 +1506,36 @@
 {}
 }
 
-\newcommand{\donkey}[1][\npc{\C}{Donkey}]{
+\newcommand{\warhorse}[1][\npc{\C}{War Horse}]{
 	#1
 	\randomtwo
-	\addtocounter{enc}{1}
 	\randomtwoB
-\animal{\arabic{r2}}% STRENGTH
-{-1}% DEXTERITY 
+	\addtocounter{enc}{2}
+	\addtocounter{r2b}{2}
+\animal{\arabic{enc}}% STRENGTH
+{0}% DEXTERITY 
 {\arabic{r2b}}% SPEED
-{1}% WITS
+{\arabic{r2}}% WITS
 {1}% DR
-{1}% AGGRESSION
-{Athletics 2, Survival 1}% SKILLS
+{\ifodd\value{r2}1\else 2\fi}% AGGRESSION
+{Athletics 2, Survival 1, Vigilance 1}% SKILLS
 {\quadraped}% ABILITIES
 {}
 }
 
-\newcommand{\warhorse}[1][\npc{\C}{War Horse}]{
+\newcommand{\donkey}[1][\npc{\C}{Donkey}]{
 	#1
-\animal{3}% STRENGTH
-{0}% DEXTERITY 
-{4}% SPEED
+	\randomtwo
+	\addtocounter{enc}{1}
+	\randomtwoB
+\animal{\arabic{r2}}% STRENGTH
+{-1}% DEXTERITY 
+{\arabic{r2b}}% SPEED
 {1}% WITS
 {1}% DR
 {1}% AGGRESSION
-{Athletics 2, Survival 2, Vigilance 1}% SKILLS
-{}% ABILITIES
+{Athletics 2, Survival 1}% SKILLS
+{\quadraped}% ABILITIES
 {}
 }