From 61a58ad41f7ed6e106cfb0bd205550b8085a6cd6 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Mon, 18 Dec 2023 01:26:40 +0100
Subject: [PATCH] reformat spells

---
 magic.sty        | 42 +++++++++++++++++++++++++++++++-----------
 spells/Fate2.tex |  7 +++----
 spells/Fate4.tex |  2 +-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/magic.sty b/magic.sty
index fbb9a5ba..d24be527 100644
--- a/magic.sty
+++ b/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{%
diff --git a/spells/Fate2.tex b/spells/Fate2.tex
index af942d8a..a12b678e 100644
--- a/spells/Fate2.tex
+++ b/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
   {}
diff --git a/spells/Fate4.tex b/spells/Fate4.tex
index 5284f6f8..03721508 100644
--- a/spells/Fate4.tex
+++ b/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.}
-- 
GitLab