From 014f4efd215748f81ae92d2d8eb662e5ef4db1c0 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@tutamail.com>
Date: Tue, 26 Nov 2019 18:50:14 +0100
Subject: [PATCH] Squashed commit of the following:

commit 0419eb3e9486351ed5a081d62ddcc1aa486f929a
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Tue Nov 26 18:49:05 2019 +0100

    fix dwarven rune master

commit 2f28cefe334eebc2774de3ece3d5827143011263
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Wed Nov 27 00:33:09 2019 +0700

    review bestiary section

commit 6e4e85310915c4595fbf42a5463afd45d00a97e7
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Tue Nov 26 20:33:38 2019 +0700

    ether formatting
---
 monsters.tex | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/monsters.tex b/monsters.tex
index 43853456..305211fe 100644
--- a/monsters.tex
+++ b/monsters.tex
@@ -407,7 +407,7 @@
 }
 %
 \newcommand{\griffin}{
-	\animal{\ifodd\value{page} 2\else 1\fi}{-2}{\ifodd\value{page} 2\else 1\fi}{2}{0}{2}{Athletics 2, Survival 1\knacks{\charge}}{Flight}
+	\animal{\ifodd\value{page} 2\else \ifodd\value{chapter} 3\else 1\fi\fi}{-2}{\ifodd\value{page} 2\else 1\fi}{2}{0}{2}{Athletics 2, Survival 1\knacks{\charge}}{Flight}
 }
 %
 \newcommand{\mouthdigger}{
@@ -438,16 +438,24 @@
 
 \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{page} 2 \else 1\fi}{\shortsword\ifnumcomp{\thechapter}{=}{6}{3D6sp}{\setcounter{gold}{\thepage}, \arabic{gold}sp}}{}
+	\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}}{}
 	}
 %
 \newcommand{\dwarvensoldier}{
 	\randomtwo
-	\person{\arabic{random}}{\arabic{enc}}{0}{{0}{0}{-1}}{0}{2}{Crafts 1, Tactics 1}{\greataxe, \completeplate}{\knacks{Chosen Enemy: Goblins}}
+	\person{\arabic{random}}% STRENGTH
+	{\arabic{enc}}% DEXTERITY
+	{0}%Speed
+	{{0}{0}{-1}}% MENTAL ATTRIBUTES
+	{0}{2}{Crafts 1, Tactics 1}{\greataxe, \completeplate}{\knacks{Chosen Enemy: Goblins}}
 	}
 
 \newcommand{\dwarvenrunemaster}{
-	\person{0}{1}{0}{{2}{0}{0}}{0}{1}{Academics 2, Crafts 1, Tactics 2\Path{Runes}{Metamagic 4, Fate 3, Force 2, Conjuration 1}}{\shortsword\partialchain\ifnumcomp{\thechapter}{=}{6}{4D6sp}{\setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter\arabic{gold}sp}}{\mana{4}}
+	\person{0}{1}{0}% PHYSICAL ATTRIBUTES
+	{{\ifodd\value{page}2\else\1\fi}% INTELLIGENCE
+	{\ifodd\value{chapter}1\else0\fi}{0}}%  WITS
+	{\ifodd\value{enc}-1\else0\fi}% CHARISMA
+	{1}{Academics 2, Crafts 1, Tactics 2\Path{Runes}{Metamagic 4, Fate 3, Force 2, Conjuration 1}}{\shortsword\partialchain\ifnumcomp{\thechapter}{=}{6}{4D6sp}{\setcounter{gold}{\thepage}\multiply\value{gold} by \thechapter\arabic{gold}sp}}{\mana{4}}
 	}
 
 \newcommand{\dryad}{
-- 
GitLab