Merge commit '1cee73c8' into dev

glossary.tex

@@ -113,7 +113,7 @@
 
 \newglossaryentry{redfall}{name={Redfall},first={Redfall (a village in the North)},description={is rather out-of-the-way village, famed for its red-earth clay and waterfall}}
 
-\newglossaryentry{college}{name={The Collage of Alchemy},text={the Collage of Alchemy},first={the Collage of Alchemy},description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
+\newglossaryentry{college}{name={The College of Alchemy},text={the Collage of Alchemy},first={the Collage of Alchemy},description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
 
 \newglossaryentry{pig}{name={The Mincing Pig},text={the Mincing Pig},first={the Mincing Pig Tavern},description={boasts the reputation as the loudest tavern in town, placed close to the entrance.  Many people don't get farther than `the Pig' when coming to town}}
 
@@ -138,4 +138,3 @@
 
 \newglossaryentry{whitewastes}{name={The White Wastes},text={the White Wastes},description={The snow-covered mountainous region a day's march from \glsentrytext{college}, where the undead swarm}}
 
-

monsters.tex

@@ -433,7 +433,7 @@
 	\ifnumcomp{\thechapter}{<}{6}{\setcounter{age}{6}}{\ifnumcomp{\thechapter}{>}{9}{\setcounter{age}{7}}{\setcounter{age}{\thechapter}}}
 	\person{\arabic{age}}{3}{4}{{3}{4}{2}}{4\addtocounter{age}{-5}}{\arabic{age}}{Aggression 2, Projectiles \addtocounter{age}{1}\arabic{age}, Academics \arabic{age}, Athletics 1, Deceit \arabic{age}, Tactics 2, Vigilance 3}{%
 		\ifnumcomp{\value{bestiarychapter}}{=}{\thechapter}{$3D6\times 100$gp, sitting in a lair.}{\setcounter{gold}{\thepage}\addtocounter{gold}{-50}\multiply\value{gold} by \value{list}\multiply\value{gold} by \thechapter \ifnumcomp{\value{gold}}{>}{0}{ \arabic{gold}gp in lair in assorted change}{None}}}%
-		{\knacks{\combatcaster\backtothewall\ifnumcomp{\value{age}}{>}{3}{\laststand}{}}\abilities{Flight}\Path{Blood}{Enchantment \addtocounter{age}{-1}\arabic{age}, Invocation \addtocounter{age}{1} \ifnumcomp{\value{age}}{<}{3}{3}{\arabic{age}} }\addtocounter{age}{1}\multiply\value{age} by 2 \mana{\arabic{age}}\gdef\armourtype{C}}
+		{\knacks{\combatcaster, \backtothewall\ifnumcomp{\value{age}}{>}{3}{\laststand}{}},\abilities{Flight}\Path{Blood}{Enchantment \addtocounter{age}{-1}\arabic{age}, Invocation \addtocounter{age}{1} \ifnumcomp{\value{age}}{<}{3}{3}{\arabic{age}} }\addtocounter{age}{1}\multiply\value{age} by 2 \mana{\arabic{age}}\gdef\armourtype{C}}
 	}
 
 \newcommand{\dwarventrader}{