CS.tex

@@ -160,7 +160,7 @@ circle label/.style = {
           \\
           \\
         }{
-          \sffamily\characterWeapon\weaponName & \sffamily\arabic{weaponBonus} & \sffamily\arabic{damage} & \sffamily\arabic{heft} & \sffamily\arabic{weight} \\
+          \sffamily\characterWeapon\weaponName & \sffamily\arabic{weaponBonus} & \sffamily\arabic{weaponDamage} & \sffamily\arabic{heft} & \sffamily\arabic{weaponWeight} \\
         }
     }{
       \Repeat{2}{
@@ -200,12 +200,12 @@ circle label/.style = {
     \addtolength{\tabcolsep}{-0.2em}
     \begin{tabularx}{\linewidth}{XXXX}
       \hiderowcolors
-      \textbf{\Glsentrytext{dr} / Covering} & \textbf{\Glsentrytext{ap}} &\textbf{Attack} & \textbf{Damage} \\
+      \textbf{\Glsentrytext{dr} / \Glsentrytext{covering}} & \textbf{\Glsentrytext{ap}} &\textbf{Attack} & \textbf{Damage} \\
       \vspace{3em}
       \\
       \\
       \\
-      \iftoggle{examplecharacter}{\sffamily\arabic{dr}}{\underline{\hspace{2em}/\hspace{2em}}}
+      \iftoggle{examplecharacter}{\sffamily\arabic{armourDR}/ \arabic{covering}}{\underline{\hspace{2em}/\hspace{2em}}}
       &
       \iftoggle{examplecharacter}%
       {%
@@ -225,6 +225,7 @@ circle label/.style = {
       \iftoggle{examplecharacter}% Damage
       {%
         \addtocounter{damage}{\value{Strength}}%
+        \addtocounter{damage}{\value{weaponDamage}}%
         \addtocounter{damage}{4}%
         \sffamily\dmg{damage}%
       }%

backpage.tex

@@ -21,10 +21,7 @@
 
 
 \iftoggle{examplecharacter}{
-  \iftoggle{core}{
-    \charSpellList
-  }{}
-
+  \charSpellList
 }{
   \vspace{1em}
   \lineDots[26]

csCommands.sty

@@ -186,3 +186,13 @@
   \renewcommand\characterEquipment{}
   \renewcommand\charSpellList{}
 }
+
+
+\newcommand\printCharacter[1]{
+  \resetCS
+  \settoggle{examplecharacter}{true}
+  \settoggle{allyCharacter}{true}
+  \input{ex_cs/#1.tex}
+  \input{config/CS.tex}
+  \input{config/backpage.tex}
+}

glossary.tex

@@ -3,12 +3,10 @@
 % Alter topicmcols style
 
 %\renewcommand*{\glstopicPostSkip}{---}
-\renewcommand*{\glstopicPreSkip}{\bigLine\medskip}
+\renewcommand*{\glstopicPreSkip}{\bigLine\medskip\needspace{10\baselineskip}}
 \renewcommand*{\glstopicSubPreLocSep}{~\adforn{38}~}
 \renewcommand*{\glstopicInit}{\setlength{\parskip}{10pt}}
 
-
-
 \newglossary*{people}{People}
 \glssetcategoryattribute{people}{indexonlyfirst}{true}
 
@@ -452,7 +450,7 @@ Set the darker die to `\dicef{6}' and roll the other.  If this roll fails, it fa
     The night would allow them to remove \pgls{ep}, but the day would add 6 more, so they won't be moving like that for long},
 }
 
-\longnewglossaryentry{holdingVigil}{
+\longnewglossaryentry{vigil}{
   name={Vigils},
   text={vigil},
   first={vigil through the night},

monsters.sty

@@ -43,7 +43,7 @@
     \set{Brawl}{r2}
     \setcounter{Athletics}{2}
   }% SKILLS
-  {\charge\unstoppable}% KNACKS
+  {\charge, \unstoppable}% KNACKS
   {\quadraped}% ABILITIES
 }
 
@@ -954,27 +954,35 @@
 
 \newcommand{\goblin}[1][\npc{\T[\arabic{r12}]\N}{\arabic{noAppearing} Goblins}]{
   \Person{#1}%
-    {{rn1t0}{r2b}{rn1t2}}% BODY
+    {{r3}{r2b}{rn1t2}}% BODY
     {{rn1t0}{rn3t3}{rn4tn1}}% MIND
     {%
-      \ifodd\value{r3}
+      \addtocounter{Strength}{-3}
+      \ifodd\value{r4}
         \set{Melee}{1}
       \else
         \set{Projectiles}{1}
       \fi
       \set{Brawl}{rn1t2}
       \set{Caving}{r2}
-      \set{Stealth}{r2}
-      \ifodd\value{Strength}
+      \set{Stealth}{r2c}
+      \ifnum\value{Strength}>-2
         \javelin
       \else
         \Dagger
       \fi
     }% SKILLS
     {}% KNACKS
-    {\rock, \lootGoblin, \lootGoblin}% EQUIPMENT
-    {\ifnum\value{noAppearing}<3
-      \mutation{r4}%
+    {\rock, %
+    \ifnum\value{r3c}=3%
+      \rations%
+    \else%
+      \lootGoblin%
+    \fi}% EQUIPMENT
+    {\ifnum\value{noAppearing}<3%
+      \ifodd\value{r2}%
+        \mutation{r4b}%
+      \fi%
     \fi}% ABILITIES
 }
 

stats.sty

@@ -10,6 +10,9 @@
 \newtoggle{perfectArmour}
 \settoggle{perfectArmour}{false}
 
+\newtoggle{weaponMaster}
+\settoggle{weaponMaster}{false}
+
 \newcommand\showNumbers{
   \par
   Str: \arabic{Strength},
@@ -360,7 +363,9 @@
 \newcommand{\unstoppable}{%
   \addtocounter{hp}{2}%
   Unstoppable
-  (+2 \glsentryshortpl{hp}, and +\arabic{knacks} to any Medicine rolls to save them when dying)%
+  (+2 \glsentryshortpl{hp}%
+    \ifnum\value{Intelligence}>-5, and +\arabic{knacks} to any Medicine rolls to save them when dying%
+  \fi)%
 }
 
 \newcommand{\vengeful}{%
@@ -369,7 +374,7 @@
 }
 
 \newcommand{\weaponmaster}[1][\weaponName]{%
-  \addtocounter{att}{0}%
+  \toggletrue{weaponMaster}%
   Weapon Master
   (+1 to #1 attacks)%
 }
@@ -437,6 +442,7 @@
 
 \newcommand{\clean}{%
   \global\togglefalse{snapCaster}%
+  \global\togglefalse{weaponMaster}%
   \knacks{}%
   \foreach \s in {Air,Earth,Fate,Fire,Water,Projectiles,Melee,Brawl,Academics,Alchemy,Athletics,Caving,Crafts,Cultivation,Deceit,Empathy,Flight,Medicine,Performance,Larceny,Seafaring,Stealth,Vigilance,Wyldcrafting}%
     {\setcounter{\s}{0}}%
@@ -487,7 +493,12 @@
   \addtocounter{hp}{\value{Strength}}%
   \addtocounter{hp}{-\value{wounds}}%
   % Stats for allies don't need to show Melee +1 as 'TN 8 to hit', they just need to show '+1'.
-  \ifnum\value{weaponBonus}>0\set{att}{Melee}\else\set{att}{Brawl}\fi%
+  \ifnum\value{weaponBonus}>0%
+    \set{att}{Melee}%
+    \iftoggle{weaponMaster}{\stepcounter{att}}{}%
+  \else%
+    \set{att}{Brawl}%
+  \fi%
   \addtocounter{att}{\value{Dexterity}}%
   \addtocounter{att}{\value{weaponBonus}}%
   \set{toHit}{att}%