Merge commit '02507d12' into dev

config/monsters.tex

@@ -1138,6 +1138,7 @@
 \newcommand{\humanbard}[1][\npc{\F}{Bard}]{
 	#1
 	\randomtwo
+	\addtocounter{enc}{1}
 	\randomthree
 	\addtocounter{age}{-1}
 	\randomthreeB
@@ -1151,10 +1152,22 @@
 {\arabic{r3}}}% CHARISMA
 {0}% DR
 {\arabic{r2}}% COMBAT
-{Academics \ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Empathy \arabic{r3}, Deceit \ifodd\thepage 2 \else 1\fi, Performance \ifodd\thechapter 2 \else 1\fi%
-\ifnumcomp{\value{r12}}{>}{9}{%
-\Path{Song}{\ifodd\value{r3} Fate \else Aldaron \fi\arabic{r3b}, \ifodd\value{r3b} Enchantment \arabic{r4}, \fi \ifodd\thepage Illusion \arabic{r3b}\fi} }{}
-}% SKILLS
+{Academics \ifodd\thepage\arabic{r2}\else\arabic{r3b}\fi, Empathy \arabic{enc}, Deceit \ifodd\thepage 2 \else 1\fi, Performance \ifodd\thechapter 2 \else 1\fi%
+
+\ifnum\value{r3}>2
+	\ifnum\value{r12}>6
+		\Path{Alchemy}{\ifodd\value{r3b}%
+			Enchantment%
+		\else%
+			Aldaron%
+		\fi \arabic{r4}, \ifodd\value{r12}%
+			Fate \arabic{enc}%
+		\fi \ifodd\value{gold}%
+			\addtocounter{r2b}{1} Illusion \arabic{r2b}%
+		\fi}
+	\fi
+\else
+\fi}% SKILLS
 {\ifodd\value{r3}\rapier%
 	\else%
 	\Dagger%
@@ -1587,6 +1600,7 @@
 	\randomtwoB
 	\addtocounter{r2b}{-1}
 	\randomthree
+	\randomthreeB
 	\randomfour
 \person{\arabic{r2}}% STRENGTH
 {0}% DEXTERITY 
@@ -1597,7 +1611,7 @@
 {2}% DR
 {\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
+\Path{Devotion (Qualm\"e)}{\ifodd\value{r4} Aldaron \arabic{enc}, \fi Fate \arabic{enc}, \ifodd\value{r2} Enchantment \arabic{r3b}, \else \fi Necromancy 4}}% SKILLS
 {\ifodd\thepage%
 	\Dagger%
 \else%
@@ -1648,6 +1662,8 @@ mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIP
 	#1
 	\randomtwo
 	\addtocounter{enc}{-3}
+	\randomtwoB
+	\addtocounter{r2b}{2}
 	\randomthree
 	\addtocounter{age}{1}
 	\randomthreeB
@@ -1656,24 +1672,24 @@ mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIP
 \person{\arabic{r2}}% STRENGTH
 {\arabic{track}}% DEXTERITY 
 {\arabic{enc}}% SPEED
-{{3}% INTELLIGENCE
+{{\arabic{r2b}}% INTELLIGENCE
 {\arabic{r3}}% WITS
 {-5}}% CHARISMA
 {2}% DR
 {\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
+{Aggression 2, \ifodd\thechapter Projectiles \arabic{r3}, \fi Academics 3, \ifodd\value{gold}Crafts \arabic{r3}, \fi Deceit \arabic{r2b}, Medicine \arabic{r2b}, 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{r2b}, \fi Necromancy 5}}% SKILLS
 {\ifnum\value{r3b}>2%
 	\longsword%
 	\ifodd\value{r4}%
-		\completechain%
+		, \completechain%
 	\else%
-		\partialplate%
+		, \partialplate%
 	\fi%
 \else%
 	\Dagger%
-\fi, \multiply\value{track} by 2%
-, mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
+\fi, \addtocounter{track}{3}\multiply\value{track} by 2%
+mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
 {\mana{8}\lockedmana{\value{r4}}}
 }