From 48b6fa561d85bb167ec5b181c32bca78fdbe3a4f Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Sat, 11 Nov 2023 01:59:51 +0100
Subject: [PATCH] reformat short spells

---
 magic.sty | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/magic.sty b/magic.sty
index aec9ce97..58e2d025 100644
--- a/magic.sty
+++ b/magic.sty
@@ -136,20 +136,18 @@
 }
 
 \newcommand\shortSpell{%
-  \addtocounter{castingBonus}{7}%
   \item[\spellName]
-  Cost: \arabic{spellCost},
-  \spellEnhancements~
-  \spellAction~
-  \spellSphere
-
-  Resisted by: \spellResistance\ (\tn[\arabic{castingBonus}])
+  \spellSum
 
-  \spellSum \ 
-  \spellNotes
+  (Cost: \arabic{spellCost},
+  \iftoggle{opposedSpell}{
+    \addtocounter{castingBonus}{7}%
+    Resisted by: \spellResistance, \tn[\arabic{castingBonus}]%
+  }{%
+    Roll: \absNum{castingBonus}, \gls{tn} set by \spellResistance.
+  })%
 }
 
-
 \newcommand\spell[7]{%
   \calcSpell{#1}{#2}{#3}{#4}{#5}{#6}{#7}%
   \iftoggle{fullSpells}{%
-- 
GitLab