From f35badb900abf6e8f29764031ff44e096eacc8d2 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Fri, 1 Sep 2023 22:14:54 +0200
Subject: [PATCH] stop break in front of resisted spells
---
docs.tex | 8 ++++----
magic.sty | 11 +++++------
spells/fate1.tex | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/docs.tex b/docs.tex
index e9dd3e42..335787fa 100644
--- a/docs.tex
+++ b/docs.tex
@@ -171,19 +171,19 @@ After inputting that, you can get the spell, and the `printindex' command will c
Alternatively, pull in a bunch of spells from a sphere at a particular level with:
-\verb"\showSpells{fate1,air2}"
+\verb"\showSpells{fate1,air2,mind2}"
-\showSpells{fate1,air2}
+\showSpells{fate1,air2,mind2}
\ldots which shows Air spells of level 2, and Fate at level 1.
Alternatively, input the spells after a creature, with:
-\verb"\creatureSpells{fate1,air2}"
+\verb"\creatureSpells{fate1,air2,mind2}"
\demilich
-\creatureSpells{fate1,air2}
+\creatureSpells{fate1,air2,mind2}
\subsubsection{Magical Items}
diff --git a/magic.sty b/magic.sty
index 265dd76b..448da3e5 100644
--- a/magic.sty
+++ b/magic.sty
@@ -91,17 +91,16 @@
}
}{
- \item[\textbf{#1}]
- \hphantom{#4}%
+ \item[\textbf{#1}]%
+ \vphantom{#4}%
\setArea%
\setRange%
- (Spheres:~#2, Cost:~\arabic{spelllevel}, Range: \spellRange\iftoggle{duplicated}{, Targets: \spellArea}{})
-
- \ifdefparam{#5}{
- Roll #5, \tn, or #6.
+ \ifdefparam{#5}{%
+ Roll #5, \tn[\arabic{spellResTN}], or #6.
}{
\MakeUppercase#6.
}
+ (Spheres:~#2, Cost:~\arabic{spelllevel}, Range: \spellRange\iftoggle{duplicated}{, Targets: \spellArea}{})
}
}
diff --git a/spells/fate1.tex b/spells/fate1.tex
index 1558f3fa..804efdc8 100644
--- a/spells/fate1.tex
+++ b/spells/fate1.tex
@@ -2,7 +2,7 @@
{\mFate}% Spheres
{Wax}% Action
{}% Enhancements
- {Empathy}% Skill
+ {\tn}% Skill
{target gains $1D6$ \glspl{fp}}% Description
{
The mage blesses the target with high hopes for their future, bestowing $1D6$ \glspl{fp} immediately.
--
GitLab