From 59c7be2d253b0cc090d8c41f4b6e241371388391 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Sat, 20 Apr 2024 06:23:18 +0200
Subject: [PATCH] refactor statblock spheres

---
 main.tex  | 21 ++++++++++++++++++---
 stats.sty |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/main.tex b/main.tex
index efa712a4..04686dce 100644
--- a/main.tex
+++ b/main.tex
@@ -33,6 +33,8 @@
     \stepcounter{knacks}%
   }
   \renewcommand\showKnacks{#4}
+  \foreach \s in {Air,Earth,Fate,Fire,Water}%
+    {\ifnum\value{\s}>0 \addtocounter{mp}{3}\fi}
   %
   \renewcommand\equipment{#5}
   \computeStats
@@ -51,6 +53,12 @@
 
   \showSkills
 
+  \ifnum\value{mp}>0%
+    \textbf{Spheres}:
+    \foreach \s in {Air,Earth,Fate,Fire,Water}%
+      {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi}
+  \fi
+
   \showKnacks
 
   \hrulefill
@@ -72,9 +80,12 @@
     \glsentrytext{ap} \arabic{ap},
     \iftoggle{allyCharacter}{$2D6$\ifnum\value{att}>-1 +\fi}{}%
     Att \arabic{att},
-    Dam \dmg{damage},
+    Dam \dmg{damage}%
     \ifnum\value{dr}>0%
-      \glsentrytext{dr} \arabic{dr} (\arabic{covering})
+      , \glsentrytext{dr} \arabic{dr} (\arabic{covering})%
+    \fi%
+    \ifnum\value{mp}>0%
+      , \glsentrytext{mp} \arabic{mp}, %
     \fi%
   }
   \end{exampletext}
@@ -83,13 +94,17 @@
 
 \npc{\F\Hu}{Alice}
 \statblock{{1}{2}{3}}%
-  {{-3}{-2}{-1}}%
+  {{3}{0}{2}}%
   {
     \setcounter{Wyldcrafting}{1}
+    \setcounter{Fire}{1}
+    \setcounter{Air}{3}
   }% SKILLS
   {\adrenalinesurge, \mightydraw}% KNACKS
   {butter}% EQUIPMENT
 
+\showStdSpells
+
 \npc{\M\Hu}{Bob}
 \statblock{{1}{2}{3}}%
   {{-3}{-2}{-1}}%
diff --git a/stats.sty b/stats.sty
index 3c176fd4..ca0ca3e3 100644
--- a/stats.sty
+++ b/stats.sty
@@ -64,7 +64,7 @@
 \newcommand{\mods}{}
 \newcommand\showCR{}
 
-\newcommand\absNum[1]{\ifnum\value{#1}>0+\fi\ifnum\value{#1}=0\else\arabic{#1}\fi}
+\newcommand\absNum[1]{\ifnum\value{#1}>-1+\fi\arabic{#1}}
 
 % we calculate damage here because we can't display 1d6+6 damage - it has to turn into 2d6+2 damage.
 
-- 
GitLab