.gitlab-ci.yml

@@ -6,10 +6,11 @@ build:
   image: $LATEX_IMAGE
   script:
     - make all
-  only:
-    - master
-    - run
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+    - if: $CI_COMMIT_BRANCH == "run"
   artifacts:
     paths:
       - docs.pdf
       - rules.pdf
+      - resources.pdf

README.md

@@ -39,4 +39,6 @@ And when pulling, remember to do:
 
 > git pull --recurse-submodules
 
-[docs]: https://gitlab.com/bindrpg/config/-/jobs/artifacts/master/raw/docs.pdf?job=compile_pdf
+[docs]: https://gitlab.com/bindrpg/config/-/jobs/artifacts/master/raw/docs.pdf?job=build
+[rules]: https://gitlab.com/bindrpg/config/-/jobs/artifacts/master/raw/rules.pdf?job=build
+[resources]: https://gitlab.com/bindrpg/config/-/jobs/artifacts/master/raw/resources.pdf?job=build

layout.sty

@@ -626,7 +626,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 
 \newcommand\flourish{%
   \if@mainmatter%
-  \ifnum\value{adf}>15%
+  \ifnum\value{adf}>18%
     \setcounter{adf}{0}%
   \fi%
   \ifcase\value{adf}%
@@ -634,33 +634,35 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
   \or%
   \adforn{27}%
   \or%
-  \glsentrytext{beasts}%
-  \or%
   \adforn{3}%
   \or%
-  \glsentrytext{poison}%
+  \adforn{25}%
   \or%
-  \adforn{34}%
+  \adforn{5}%
   \or%
-  \glsentrytext{frost}%
+  \adforn{34}%
   \or%
   \adforn{68}%
   \or%
-  \glsentrytext{justice}%
+  \adforn{9}%
   \or%
   \adforn{73}%
   \or%
+  \adforn{11}%
+  \or%
   \adforn{44}%
   \or%
-  \glsentrytext{curiosity}%
+  \adforn{6}%
   \or%
-  \adforn{67}%
+  \adforn{40}%
   \or%
-  \glsentrytext{hate}%
+  \adforn{63}%
   \or%
-  \adforn{55}%
+  \adforn{67}%
+  \or%
+  \adforn{52}%
   \else%
-  \ifodd\thepage\adforn{60}\else\adforn{32}\fi%
+  \adforn{55}%
   \fi%
   \stepcounter{adf}%
   \else%

magic.sty

@@ -118,24 +118,44 @@
   \iftoggle{talisman}{%
     \index[talismans]{\textbf{#1} (\spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Area: \arabic{spellTargets}, Resisted by: \detokenize{#5}, Bonus: \arabic{spellCost}. \spellSum|adfclosedflourishleft~p.~}%
   }{%
-    \index[spells]{\textbf{#1} (Cost: \arabic{spellCost}, \spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Area: \arabic{spellTargets}, Resisted by: \detokenize{#5}, \spellSum.|adfclosedflourishleft~p.~}%
+    \index[spells]{\textbf{#1} (Cost: \arabic{spellCost}, \spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Targets: \arabic{spellTargets}, Resisted by: \detokenize{#5}, \spellSum|adfclosedflourishleft~p.~}%
   }%
 }
 
 \newcommand\fullSpell{%
-  \paragraph{\spellName}
-  (Cost: \arabic{spellCost}.
-  \textit{\spellEnhancements\ \spellAction~ \spellSphere})
-  Range:~\spellRange%
-  \ifnum\value{spellTargets}>1%
-    , Targets:~\arabic{spellTargets}%
-  \fi.
-
-  Resisted by: \spellResistance,
-
+  \needspace{4em}
+  \begin{tabularx}{\linewidth}{YX}
+  \adforn{24}~\textbf{\scshape\large\spellName}~\adforn{52}
+  &
+    \small
+    \noindent
+    \textbf{\scshape Requirements}
+    \spellSphere
+
+    \noindent
+    \textbf{\scshape Cost}
+    \arabic{spellCost} \glsentrytext{mp}
+
+    \noindent
+    \textbf{\scshape Range}
+    \spellRange%
+
+    \ifnumcomp{\value{spellTargets}}{>}{1}{%
+      \noindent
+      \textbf{\scshape Targets}
+      \arabic{spellTargets}%
+    }{}
+
+    \noindent
+    \textbf{\scshape Resisted~by:}
+    \spellResistance
+  \\
+  \end{tabularx}
+  \noindent
   \spellSum.
 
   \spellNotes
+  \vspace{1em}
 }
 
 \newcommand\shortSpell{%

monsters.sty

@@ -1425,6 +1425,36 @@ Academics~1, \ifodd\value{r12} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\va
 {}
 }
 
+\newcommand{\armouredOgre}[1][\addtocounter{r4b}{1}\npc{\T[\arabic{r4b}]\N}{\arabic{r4b} Ogres}]{
+  \randomfourB
+	#1
+	\randomthree\addtocounter{age}{2}
+	\randomtwo
+	\randomtwoB
+\person{\arabic{age}}% STRENGTH
+{0}% DEXTERITY 
+{\arabic{r2}}% SPEED
+{{-\arabic{age}}% INTELLIGENCE
+{-1}% WITS
+{-\arabic{age}}}% CHARISMA
+{0}% DR
+{\arabic{r2b}}% AGGRESSION
+{\ifodd\value{r2}Crafts\else Tactics\fi~\arabic{r2}, Wyldcrafting~\arabic{r2}}% SKILLS
+{
+	\ifodd\value{r3}%
+		\greatsword%
+	\else%
+		\greatclub%
+	\fi%
+\ifodd\value{r2}%
+  , \completechain%
+\else%
+  , \partialchain%
+\fi%
+  \ifnumcomp{\thechapter}{>}{3}{, \lootBig}{}}% EQUIPMENT
+{}
+}
+
 \newcommand{\deepogre}[1][\npc{\T[\arabic{r4b}]\N}{\arabic{r4b} Ogres}]{
 	\randomfourB
   \addtocounter{r4b}{1}

spells/Fate2.tex

@@ -3,7 +3,7 @@
   {Wax}% Action
   {Fate}% Spheres
   {target's Charisma}% Resist with
-  {The mage blesses the targets with high hopes for their future, bestowing \showDam~\glspl{fp} immediately.}% Description
+  {The mage blesses the targets with high hopes for their future, bestowing \showDam~\glspl{fp} immediately}% Description
   {}
 
 \spell{Mass Curse}% Name
@@ -12,8 +12,7 @@
   {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
   {The caster mentions the worst possible future for the targets -- the most unpleasant thing which seems reasonably likely.
-    They then loses \showDam~\glspl{fp}.
-  }% Description
+    They then loses \showDam~\glspl{fp}}% Description
   {}
 
 \spell{Hateful Cry}% Name
@@ -21,5 +20,5 @@
   {Wane}% Action
   {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
-  {One target at \spellRange{} loses \showDam~\glspl{fp}.}% Description
+  {One target at \spellRange{} loses \showDam~\glspl{fp}}% Description
   {}

spells/Fate4.tex

@@ -3,5 +3,5 @@
   {Wax}% Action
   {Fate}% Spheres
   {ambient noise}% Resist with
-  {The caster extends their best wishes to a crowd, and anyone \spellRange\ away but still listening gains \arabic{spellPlusTwo}~\glspl{fp} (or at least up to \arabic{spellTargets} people).}% Description
+  {The caster extends their best wishes to a crowd, and anyone \spellRange\ away but still listening gains \arabic{spellPlusTwo}~\glspl{fp} (or at least up to \arabic{spellTargets} people)}% Description
   {Noisier crowds can present a challenge, and raise the \gls{tn} significantly.}