From 26363116a08cba7697be6acc81c475c8bc811c94 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Sun, 22 Jan 2023 04:06:57 +0100
Subject: [PATCH] tighten statblocks

---
 monsters.sty |  9 +++++----
 stats.sty    | 21 +++++----------------
 test.tex     |  1 +
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/monsters.sty b/monsters.sty
index 4dc938f9..015cadf3 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -1217,12 +1217,13 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 {-2}% WITS
 {2}% DR
 {2}% AGGRESSION
-{}% SKILLS
+{
+  \ifnumcomp{\value{r3b}}{=}{1}%
+    {\\ \ent{Equipment:} & \lootSmall \\}%
+    {}
+}% SKILLS
 {Undead}% ABILITIES
 {
-\ifnumcomp{\value{r3b}}{=}{1}%
-	{\textbf{Equipment:} & \lootSmall \\}%
-	{}
 }%
 }
 
diff --git a/stats.sty b/stats.sty
index d94d3ca6..6476dbab 100644
--- a/stats.sty
+++ b/stats.sty
@@ -247,7 +247,7 @@
 		]
 
 	\creaturestats
-
+  \vspace{-1em}
 	\derivedstats
 	\end{tcolorbox}
 
@@ -341,7 +341,6 @@
 %% print the equipment
 %
 \newcommand{\creaturestats}{
-	\vspace{.1cm}
 
 % Reference versions (which always are non-verbose) don't
 % have the space for full-sized stats.
@@ -370,12 +369,7 @@
 	\setcounter{hp}{\value{str}}
 \end{tabularx}
 
-	\addtocounter{hp}{6}
-
-\vspace{.1cm}
-\raggedright
-\noindent
-\begin{tabularx}{\linewidth}{p{0.2\linewidth}X}
+\begin{tabularx}{\linewidth}{lX}
 
 	\ent{Skills} & \ifnumcomp{\value{att}}{=}{0}{}{\iftoggle{mind}{Combat \arabic{att}, }{Aggression \arabic{att}, }} \skills \\
 	\iftoggle{mind}{\ent{Equipment} & \equipment \\}{\ent{Abilities} & \abilities \\}
@@ -398,8 +392,6 @@
 	\addtocounter{attb}{7}
 }
 
-\vspace{.1cm}
-
 \iftoggle{verbose}{%
 	\end{small}%
 }{%
@@ -420,10 +412,8 @@
 %
 \newcommand{\derivedstats}{
 	\iftoggle{debug}{str is \arabic{str}, strb is \arabic{strb}.}{}
-
-	\hrule
-
-	\vspace{.1cm}
+	\hrulefill
+	\hrulefill
 
 \addtocounter{att}{\value{dex}}
 \addtocounter{attb}{\value{dexb}}
@@ -454,6 +444,7 @@
 			{ \Repeat{\value{mp}}{\ding{111}}, }%
 		}
 	\fi
+	\addtocounter{hp}{6}
 	\mbox{\arabic{hp} HP \iftoggle{bestiarychapter}{}{%
 	\ \Repeat{\value{hp}}{\ding{111}}%
 		}%
@@ -494,8 +485,6 @@
 % attackXPtotal= strb x spdb x damb
 \vspace{.1cm}
 
-\hrule
-\vspace{.1cm}
 	\setcounter{attackXPtotal}{\value{attb}}
 
 	\multiply\value{attackXPtotal} by \value{spdb}
diff --git a/test.tex b/test.tex
index e1bbea6e..8b608b3a 100644
--- a/test.tex
+++ b/test.tex
@@ -15,6 +15,7 @@
 \subsection{This Document}
 
 This is a test document, to make sure new code works before sticking it in a project.
+Current day should equal \arabic{r4b}.
 
 \npc{\M}{Random Guy}
 \person{1}% STRENGTH
-- 
GitLab