diff --git a/config/monsters.tex b/config/monsters.tex
index e031549c95e0054b4ffcff53acb54bd34e801359..5b114bdecdf6979335c08ad567d37cafaac4c0a2 100644
--- a/config/monsters.tex
+++ b/config/monsters.tex
@@ -22,21 +22,42 @@
\newcommand{\lootBig}{%
\iftoggle{bestiarychapter}{%
\ifodd\thepage $3D6-2$\else$2D6+4$\fi gp}{%
-\randomdozen\addtocounter{r12}{5}\arabic{r12}gp}%
+\randomdozen\addtocounter{r12}{8}\arabic{r12}gp}%
}
\newcommand{\lootMagic}{%
\iftoggle{bestiarychapter}{}%
- {\ifnumcomp{\value{r2}}{>}{1}{\ifodd\value{r3}%
- \ifodd\value{r4}%
- Townmaster's Hat\else
- Wild Seeds\fi\else
- Bag of Holding\fi}%
- {\ifodd\value{r3}%
- \ifodd\value{r4}%
- Portal Scroll\else
- Deck of Cards\fi\else
- Bag of Tricks\fi}}}
+ {\ifnumcomp{\value{r2}}{>}{1}{%
+ \ifodd\value{r3}%
+ \ifodd\value{r4}%
+ \ifodd\value{r3b}%
+ Townmaster's Hat\else%
+ Deck of Cards%
+ \fi%
+ \else%
+ Wild Seeds\fi%
+ \else%
+ \ifodd\value{r2b}%
+ Bag of Holding%
+ \else%
+ Taming Flute%
+ \fi%
+ \fi}%
+ {\ifodd\value{r3}%
+ \ifodd\value{r4}%
+ Portal Scroll\else%
+ Sleeping Dust%
+ \fi%
+ \else%
+ \ifodd\value{r2b}%
+ \ifodd\value{r2b}%
+ Ring of Asphyxiation\else%
+ Ghost Shield%
+ \fi%
+ \else%
+ Bag of Tricks%
+ \fi%
+ \fi}}}
\newcommand{\lootJewellery}{%
\iftoggle{bestiarychapter}{jewellery worth \ifodd\value{r2}$3D6$sp\else$1D6+2$gp\fi}%
@@ -833,7 +854,9 @@
\fi}\fi
}% SKILLS
{\ifnumcomp{\value{r4}}{=}{2}{\Dagger, shortbow, }{\rapier, dagger, }%
- \lootJewellery}% EQUIPMENT
+ \lootJewellery\ifnum\value{r12}>12%
+ , \lootMagic%
+ \fi}% EQUIPMENT
{\mana{\value{age}}\addtocounter{mp}{\value{age}}}
}
@@ -855,7 +878,7 @@
{\ifodd\value{mp} 1\else 0\fi}% COMBAT
{Projectiles \arabic{r2b}, Academics 3, Empathy 3, Deceit \arabic{enc}, Performance \arabic{r2}, \ifodd\value{r2}Stealth \else Tactics \fi \arabic{r2b}, Vigilance 2%
\Path{Blood}{Aldaron \arabic{r3}, Enchantment 5, Fate \arabic{r3}, Forces \arabic{r4}, Invocation 1, Polymorph 2}}% SKILLS
- {\Dagger, \lootJewellery\ifodd\thepage, \randomtwo\lootJewellery\fi}% EQUIPMENT
+ {\Dagger, \lootJewellery\ifodd\thepage, \randomtwo\lootJewellery\ifodd\value{r4}, \lootMagic\fi\fi}% EQUIPMENT
{\mana{6}}
}
@@ -896,7 +919,9 @@
{\arabic{enc}}}% CHARISMA
{0}% DR
{0}% COMBAT
- {\ifodd\value{r2}\else Projectiles \arabic{enc}, \fi Academics 3, \ifodd\value{chapter} Crafts \arabic{enc}, \fi Deceit \arabic{age}, Stealth \arabic{enc}
+ {\ifodd\value{r2}%
+ \else Projectiles \arabic{enc}, \fi%
+ Academics 3, \ifodd\value{chapter} Crafts \arabic{enc}, \fi Deceit \arabic{age}, Stealth \arabic{enc}
\Path{Alchemy}{Conjuration \arabic{age}, \ifodd\value{r2} Force \arabic{enc}, \else Invocation \arabic{enc}, \fi Illusion \arabic{age}}}% SKILLS
{\lootBig, \ifodd\thepage\lootMagic\fi}% EQUIPMENT
{\mana{6}}
@@ -1155,7 +1180,7 @@
{Academics \arabic{r3}, \ifodd\value{r3} Deceit \arabic{r2}, Tactics \arabic{enc}\else Empathy \arabic{r2}, Vigilance \arabic{enc}\fi
\Path{Alchemy}{\ifodd\value{r2b} Conjuration \arabic{r3}, Force \arabic{r4}\else Invocation \arabic{r4}\fi, \ifodd\thepage Illusion \arabic{r3}\fi
}}% SKILLS
-{\lootMedium\ifodd\thepage\lootMagic\else mana stone with 4 mp\fi}% EQUIPMENT
+{\lootMedium, \ifodd\thepage\lootMagic\else mana stone with 4 mp\fi}% EQUIPMENT
{\mana{6}\lockedmana{\value{r2}}}
}
@@ -1470,18 +1495,18 @@
{0}% DEXTERITY
{\arabic{enc}}% SPEED
{{-3}% INTELLIGENCE
-{-2}% WITS
+{-1}% WITS
{-4}}% CHARISMA
{0}% DR
{\arabic{r2b}}% AGGRESSION
{Beast Ken \arabic{r2}, \ifodd\value{r2}Crafts \else Tactics \fi \arabic{r2}}% SKILLS
{\ifodd\value{r2}
- \greatclub
+ Nothing.
\else
\ifodd\value{r3}
\greatsword
\else
- Nothing.
+ \greatclub
\fi
\fi
\ifnumcomp{\thechapter}{>}{8}{, \thepage sp}{}}% EQUIPMENT
@@ -1490,27 +1515,31 @@
\newcommand{\undeadogre}[1][\npc{\D\N}{Undead Ogre}]{
#1
- \animal{6}% STRENGTH
+ \randomtwo
+ \addtocounter{enc}{4}
+ \animal{\arabic{enc}}% STRENGTH
{-2}% DEXTERITY
{0}% SPEED
{-4}% WITS
{2}% DR
{2}% AGGRESSION
- {Deceit 1}% SKILLS
- {None}% ABILITIES
+ {}% SKILLS
+ {Undead}% ABILITIES
{}%
}
\newcommand{\ghoul}[1][\npc{\D\T}{\arabic{r12} Ghouls}]{
#1
-\randomtwo
-\animal{\arabic{enc}}% STRENGTH
+ \randomtwo
+ \randomtwoB
+ \addtocounter{enc}{-3}
+\animal{\arabic{r2b}}% STRENGTH
{-2}% DEXTERITY
-{-2}% SPEED
+{\arabic{enc}}% SPEED
{-2}% WITS
{2}% DR
{2}% AGGRESSION
-{}% STRENGTH
+{}% SKILLS
{Undead}% ABILITIES
{}
}
@@ -1527,14 +1556,20 @@
{0}% WITS
{-5}}% CHARISMA
{2}% DR
-{2}% AGGRESSION
-{Aggression 2, Beast Ken 1, Survival 1, Tactics \arabic{r2}, Vigilance 1}% SKILLS
+{2}% COMBAT
+{Aggression \arabic{enc}, \ifodd\thepage Beast Ken \else Deceit \fi \arabic{r3}, Survival \arabic{r3b}, Tactics \arabic{r2}, Vigilance 1}% SKILLS
{\ifodd\value{r2}%
\longsword%
+ \ifodd\value{r4}%
+ , \partialleather%
+ \fi%
\else%
\greatsword, dagger%
+ \ifodd\value{r4}%
+ \partialchain%
+ \fi%
\fi%
-\ifodd\thepage, \lootBig\fi}% EQUIPMENT
+\ifodd\thepage, \lootJewellery\fi}% EQUIPMENT
{}
}
@@ -1551,7 +1586,7 @@
{\arabic{r2b}}% WITS
{-5}}% CHARISMA
{2}% DR
-{\arabic{r2}}% AGGRESSION
+{\arabic{r2}}% COMBAT
{Aggression 2, Projectiles \arabic{r2}, Academics \arabic{r3}, Deceit 1, Medicine \arabic{r2b}, Vigilance \arabic{r2}
\Path{Devotion (Qualm\"e)}{\ifodd\value{r4} Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r2} Enchantment \arabic{r3}\else \fi, Necromancy 4}}% SKILLS
{\Dagger, mana stone holding 6 MP, \ifodd\thechapter\lootJewellery\fi}% EQUIPMENT
@@ -1564,8 +1599,9 @@
\addtocounter{enc}{1}
\randomtwoB
\randomthree
+ \addtocounter{age}{-2}
\person{\arabic{r2}}% STRENGTH
-{-1}% DEXTERITY
+{\arabic{age}}% DEXTERITY
{-2}% SPEED
{{\arabic{enc}}% INTELLIGENCE
{\arabic{r2b}}% WITS
@@ -1573,8 +1609,18 @@
{2}% DR
{\arabic{r2}}% AGGRESSION
{Aggression 2, Projectiles \arabic{r2}, Academics \arabic{r3}, Deceit 1, Medicine \arabic{r2b}, Vigilance \arabic{r2}
-\Path{Devotion (Qualm\"e)}{\ifodd\value{r3}Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r4} Enchantment \arabic{r3}\else \fi, Necromancy 5}}% SKILLS
-{\Dagger, mana stone holding 6 MP, \ifodd\thepage\lootMagic, \fi\ifodd\thechapter\lootJewellery\else\lootBig\fi}% EQUIPMENT
+\Path{Devotion (Qualm\"e)}{\ifodd\value{r3}Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r4} Enchantment \arabic{r3}, \else \fi Necromancy 5}}% SKILLS
+{\ifodd\thechapter%
+ \Dagger, %
+\else
+ \longsword, %
+\fi%
+ \ifodd\value{r4}%
+ \partialplate%
+ \else%
+ \completechain%
+ \fi%
+, mana stone holding 6 MP, \ifodd\thepage\lootMagic, \fi\ifodd\thechapter\lootJewellery\else\lootBig\fi}% EQUIPMENT
{\mana{6}}
}
@@ -1585,8 +1631,10 @@
\randomthree
\addtocounter{age}{1}
\randomthreeB
+ \randomfour
+ \addtocounter{track}{-3}
\person{\arabic{r2}}% STRENGTH
-{-2}% DEXTERITY
+{\arabic{track}}% DEXTERITY
{\arabic{enc}}% SPEED
{{3}% INTELLIGENCE
{\arabic{r3}}% WITS
@@ -1595,8 +1643,17 @@
{\arabic{r3b}}% COMBAT
{Aggression 2, \ifodd\thechapter Projectiles \arabic{r3}, \fi Academics 3, Deceit \arabic{r2b}, Medicine 3, Vigilance \arabic{r3b}
\Path{Alchemy \& Devotion (Qualm\"e)}{\ifodd\value{page}Aldaron \else Conjuration \arabic{age}, Fate \fi\arabic{r3}, Enchantment \arabic{r4}, \ifodd\thechapter Invocation \arabic{r3}, \fi Necromancy 5}}% SKILLS
-{\ifodd\value{r3}\longsword\ifodd\value{r4}\completechain\else\partialplate\fi\else\Dagger\fi, \lootMagic, \lootJewellery, \randomtwo\lootJewellery}% EQUIPMENT
-{\mana{6}\lockedmana{3}\setcounter{spd}{\value{wts}}}
+{\ifnum\value{r3b}>2%
+ \longsword%
+ \ifodd\value{r4}%
+ \completechain%
+ \else%
+ \partialplate%
+ \fi%
+\else%
+ \Dagger%
+\fi, \lootMagic, \lootJewellery, \randomtwo\lootJewellery}% EQUIPMENT
+{\mana{6}\lockedmana{3}}
}
\newcommand{\jelly}[1][\npc{\A}{\ifnum\value{r4}>3 Black\else \ifnum\value{r4}>2 Red \else \ifnum\value{r4}>1 Brown\else Invisible\fi\fi\fi~ Ooze}]{
diff --git a/config/preamble.tex b/config/preamble.tex
index 277c848b417e0bf11f07b3dbe162730b4b1de125..e6a6c6bda25f3b82db9864da51c53f084206d164 100644
--- a/config/preamble.tex
+++ b/config/preamble.tex
@@ -228,7 +228,8 @@ bookmarks=true]%
\newcommand{\spelllevel}{\addtocounter{spelllevel}{1}%
\subsection{\currentsphere~ Level \arabic{spelllevel}}\noindent}
\newcommand{\enhancement}[3]{\paragraph[(#1) #2: #3]{(#1) Enhancement -- #2:}}
-\newcommand{\magicitem}[7]{\vspace{1em}\noindent\textbf{#1}
+\newcommand{\magicitem}[7]{\vspace{2em}\needspace{4em}\noindent\textbf{#1}
+\index{Magical Item!#1}
\noindent
\textit{Spells: #2, }%
@@ -237,17 +238,14 @@ bookmarks=true]%
\textit{Type: #5, }%
\textit{Potence: #6, }%
\textit{MP: #7}%
- % Type can be 'pocket spell', 'magical item', or 'greater item'.
- \vspace{.3em}
-
+ % Type can be 'Pocket Spell', 'Talisman', or 'Artefact'.
+ \needspace{2em}%
}
\newcommand{\manalake}[8]{\subsection{#1 (Level #8)}
\textit{Spells: #2, }\textit{Path: #3, }\textit{Duration: #4, }\textit{Type: #5, }\textit{Potence: #6, }\textit{#7 MP}% Type can be 'pocket spell', 'magical item', or 'artefact'.
\vspace{.3em}
-
-
}
\newcommand{\spell}[4]{\subsubsection[#1: #4]{#1}