From 8b881416d09d33e8e365e34bee1ce3941eada087 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Sat, 11 May 2024 00:15:26 +0200
Subject: [PATCH] fit more statblocks together

---
 monsters.sty |  5 +++--
 stats.sty    | 34 ++++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/monsters.sty b/monsters.sty
index 56faad16..8bdc8d4a 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -1147,7 +1147,7 @@
   {{r3}{rn1t2}{0}}% BODY
   {r2}% WITS
   {%
-    \ifnum\value{noAppearing}>5
+    \ifnum\value{noAppearing}>2
       \set{Strength}{r2c}
     \fi
     \set{Wyldcrafting}{rn1t2}
@@ -1159,10 +1159,11 @@
 
 \newcommand{\ghast}[1][\npc{\D\Hu}{Ghast}]{
   \Person{#1}%
-    {{r3}{0}{0}}% BODY
+    {{r2}{0}{0}}% BODY
     {{rn1t2}{-1}{0}}% MIND
     {%
       \ifnum\value{noAppearing}<3
+        \set{Strength}{r3c}
         \set{Brawl}{r3c}
         \set{Combat}{rn3t3}
         \set{Athletics}{r3b}
diff --git a/stats.sty b/stats.sty
index 87b289ba..e7bdabae 100644
--- a/stats.sty
+++ b/stats.sty
@@ -30,6 +30,10 @@
 }
 
 \newcommand\afterStatBlock{%
+  \needspace{3em}
+  \iftoggle{genExamples}{}{
+    \showBoxes
+  }%
   \ifdefempty{\NPCdescription}{}{%
     \begin{multicols}{2}%
     \raggedright%
@@ -43,9 +47,6 @@
     \textbf{Mannerism:}~\mannerism%
     \end{multicols}%
   }%
-  \iftoggle{genExamples}{}{
-    \showBoxes
-  }
 }
 
 %      _        _   
@@ -246,8 +247,12 @@
   \setcounter{track}{\value{noAppearing}}%
   \begin{tabular}{rr}%
   \hiderowcolors%
+      \ifodd\value{track}%
+      \else%
+        \npcsymbol
+      \fi%
     \whileboolexpr{test {\ifnumcomp{\value{track}}{>}{0}}}{%%
-      \ifnumodd{\value{track}}{ & \small\hpStat{freeHP} \\}{\small\hpStat{freeHP}}%%
+      \ifnumodd{\value{track}}{ \small\hpStat{freeHP}}{& \small\hpStat{freeHP} \\}%%
       \addtocounter{track}{-1}%
     }%
   \end{tabular}%
@@ -672,16 +677,21 @@
           {}%
           { (\arabic{covering}!)}, }%
       }{}%
-    HP~\arabic{hp},
-    \ifnum\value{mp}>0%
-      MP \arabic{mp},
-    \fi%
+    \iftoggle{genExamples}{%
+      HP~\arabic{hp},
+      \ifnum\value{mp}>0%
+        MP \arabic{mp},
+      \fi%
+    }{}
     \ifnum\value{sp}>0%
     SP \arabic{sp}, %
     \fi%
-    \ifnum\value{Intelligence}>0%
-      \Glsentrytext{weight}~held~\arabic{weight},%
-    \fi%
+    \iftoggle{genExamples}{%
+      \ifnum\value{Intelligence}>-1%
+        \Glsentrytext{weight}~held~\arabic{weight},%
+      \fi%
+    }{}
+    {\hfil\small\textcolor{\pageSideColor}{\calculateXP}}%
   \end{center}
 }
 %
@@ -707,7 +717,7 @@
       \addtocounter{xp}{\value{covering}}%
       \addtocounter{xp}{-15}%
       \roundUp{xp}%
-      \flushright\glsentrytext{cr}~\arabic{xp}%
+      \glsentrytext{cr}~\arabic{xp}%
     }%
   }%
 }
-- 
GitLab