Merge commit '2c12c12e' into dev

monsters.tex

@@ -4,9 +4,9 @@
 % If you're unhapy with your dragon, copy-paste the bit where it says \dragon{blah}{bla}, then change those numbers.
 
 \newcounter{bestiarychapter}
+\setcounter{bestiarychapter}{0}
 \newcounter{age}
 \setcounter{age}{1}
-\setcounter{bestiarychapter}{0}
 \setcounter{gold}{0}
 \setcounter{enc}{0}
 
@@ -129,6 +129,7 @@
 \newcommand{\greatclub}{Greatclub\addtocounter{str}{4}\addtocounter{spd}{1}\addtocounter{dex}{1}}
 \newcommand{\longbow}{Longbow\addtocounter{str}{1}}
 
+% ARMOUR
 \newcommand{\partialleather}{partial leather armour \addtocounter{dr}{3}}
 \newcommand{\partialchain}{partial chain armour \addtocounter{dr}{4}}
 \newcommand{\partialplate}{partial plate armour \addtocounter{dr}{5}}
@@ -156,7 +157,7 @@
 \setcounter{int}{#1}\setcounter{wts}{#2}\setcounter{cha}{#3}
 }
 %
-%
+
 %%%%%%%%%%% Person
 %
 \newcommand{\person}[9]{\settoggle{mind}{true}
@@ -390,7 +391,7 @@
 
 
 \newcommand{\auroch}{
-	\animal{2}% STRENGTH
+\animal{2}% STRENGTH
 {-2}% DEXTERITY 
 {3}% SPEED
 {1}% WITS
@@ -402,7 +403,7 @@
 }
 
 \newcommand{\bear}{
-	\animal{5}% STRENGTH
+\animal{5}% STRENGTH
 {-1}% DEXTERITY 
 {4}% SPEED
 {0}% WITS
@@ -509,8 +510,18 @@
 	}
 
 \newcommand{\dwarventrader}{
-	\randomthree\randomtwo
-	\person{\arabic{random}}{1}{-1}{{\ifnumcomp{\value{random}}{=}{2}{1}{0}}{0}{0}}{0}{1}{Crafts \ifodd\value{page} 1 \else 2\fi, Deceit \ifodd\value{chapter} 2 \else 1\fi}{\shortsword\ifnumcomp{\thechapter}{=}{6}{3D6sp}{\setcounter{gold}{\thepage}, \arabic{gold}sp}}{}
+	\randomthree\randomtwo\addtocounter{random}{-1}
+	\person{\arabic{random}}% STRENGTH
+	{1}% DEXTERITY
+	{-1}% SPEED
+	{{\ifnumcomp{\value{random}}{=}{2}{1}{0}}% INTELLIGENCE
+	{0}% WITS
+	{0}}% CHARISMA
+	{0}% DR
+	{1}% COMBAT
+	{Crafts \ifodd\value{page} 1 \else 2\fi, Deceit \ifodd\value{chapter} 2 \else 1\fi}% SKILLS
+	{\shortsword\ifnumcomp{\thechapter}{=}{6}{3D6sp}{\setcounter{gold}{\thepage}, \arabic{gold}sp}}% EQUIPMENT
+	{}
 	}
 %
 \newcommand{\dwarvensoldier}{
@@ -531,12 +542,22 @@
 	}
 
 \newcommand{\dryad}{
-	\person{4}{2}{2}{{4}{2}{1}}{6}{2}{Academics 3, Athletics 1, Crafts 2, Performance 3, Empathy 2, Survival 3\Path{Blood \& Song}{Polymorph 5, Aldaron 4, Fate 3, Metamagic 2}}{\Dagger}{\mana{6}\lockedmana{5}\gdef\armourtype{C}}
+\randomtwo\addtocounter{enc}{2}\randomthree\addtocounter{age}{1}
+	\person{4}% STRENGTH
+	{\arabic{random}}% DEXTERITY
+	{1}% SPEED
+	{{\arabic{age}}% INTELLIGENCE
+	{2}% WITS
+	{1}}% CHARISMA
+	{6}% DR
+	{\arabic{random}}% COMBAT
+	{Academics 3, Athletics 1, Crafts 2, Performance 3, Empathy 2, Survival 3\Path{Blood \& Song}{Polymorph 5, Aldaron 4, Fate 3, Metamagic 2}}% SKILLS
+	{\Dagger}% EQUIPMENT
+	{\mana{6}\lockedmana{5}\gdef\armourtype{C}}
 	}
 
 \newcommand{\elf}{
-	\randomthree
-	\setcounter{enc}{1}\addtocounter{enc}{-\value{age}}
+	\randomthree\setcounter{enc}{1}\addtocounter{enc}{-\value{age}}
 	\person{\value{enc}}%STRENGTH
 	{\value{age}}%DEXTERITY
 	{1}%SPEED

script.sh

 #!/bin/bash
+# Don't run this script unless you know what you're doing.
+
 git checkout master
 for i in gr aie aif fb
 do