From 8dedd4f17b5ebab47c8a0a705cb9d70a078ff3fd Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Tue, 5 Dec 2023 21:24:38 +0100
Subject: [PATCH] fix lootMagic spacing
---
loot.sty | 4 +---
magic.sty | 18 +++++++++---------
talismans.sty | 18 +++++++++---------
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/loot.sty b/loot.sty
index 498238d7..79b2ed0a 100644
--- a/loot.sty
+++ b/loot.sty
@@ -91,15 +91,13 @@
\minersWeed%
\or%3
\oceanPhial%
- \or%
- \labyrinthScroll%
\or%4
\hagFinger%
\or%4
\safetyScroll%
\or%4
\snacklet%
- \else%11
+ \else%
\homeScroll%
\fi%
\ignorespaces\spellName%
diff --git a/magic.sty b/magic.sty
index 1c5bf939..fbb9a5ba 100644
--- a/magic.sty
+++ b/magic.sty
@@ -90,7 +90,7 @@
\addtocounter{spellPlusTwo}{2}%
\setcounter{spellPlusThree}{\value{spellCost}}%
\addtocounter{spellPlusThree}{3}%
- \conDmg{spellPlusThree}
+ \conDmg{spellPlusThree}%
\renewcommand\spellEnhancements{#2}%
\renewcommand\spellAction{#3}%
\renewcommand\spellSphere{#4}%
@@ -111,15 +111,15 @@
\renewcommand\spellSum{#6}%
\renewcommand\spellNotes{#7}%
\setRange%
- \iftoggle{duplicated}{
+ \iftoggle{duplicated}{%
\foreach \i in {1,...,\arabic{spellCost}}%
- {\multiply\value{spellTargets} by \value{spellCost}\addtocounter{spellTargets}{0}}
- }{}
- \iftoggle{talisman}{
- \index[talismans]{\textbf{#1} (\spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Area: \arabic{spellTargets}, Resisted by: \detokenize{#5}, Bonus: \arabic{spellCost}. \spellSum|adfclosedflourishleft~p.~}
+ {\multiply\value{spellTargets} by \value{spellCost}\addtocounter{spellTargets}{0}}%
+ }{}%
+ \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, Area: \arabic{spellTargets}, Resisted by: \detokenize{#5}, \spellSum.|adfclosedflourishleft~p.~}%
+ }%
}
\newcommand\fullSpell{%
@@ -214,7 +214,7 @@
}
\newcommand\talisman[7]{%
- \toggletrue{talisman}
+ \toggletrue{talisman}%
\setcounter{Charisma}{0}%
\calcSpell{#1}{#2}{#3}{#4}{#5}{#6}{#7}%
\setcounter{castingBonus}{\value{spellCost}}%
diff --git a/talismans.sty b/talismans.sty
index 49e074ce..4a4c20d9 100644
--- a/talismans.sty
+++ b/talismans.sty
@@ -1,4 +1,4 @@
-\newcommand\scrollOfFriendship{
+\newcommand\scrollOfFriendship{%
\talisman{Scroll of Friendship}% Name
{duplicated, detailed}% Enhancements
{warp}% Action
@@ -8,7 +8,7 @@
{}% Details
}
-\newcommand\bloodCandle{
+\newcommand\bloodCandle{%
\talisman{Blood Candle}% Name
{duplicated}% Enhancements
{Wax}% Action
@@ -19,7 +19,7 @@
{}% Details
}
-\newcommand\minersWeed{
+\newcommand\minersWeed{%
\talisman{Miner's Tobacco}% Name
{}% Enhancements
{Warp}% Action
@@ -33,7 +33,7 @@
}% Details
}
-\newcommand\oceanPhial{
+\newcommand\oceanPhial{%
\talisman{Ocean's Phial}% Name
{duplicated, distant}% Enhancements
{Wax}% Action
@@ -47,7 +47,7 @@
}% Details
}
-\newcommand\hagFinger{
+\newcommand\hagFinger{%
\talisman{Hag's Finger}% Name
{detailed}% Enhancements
{Wane}% Action
@@ -58,7 +58,7 @@
{}% Details
}
-\newcommand\homeScroll{
+\newcommand\homeScroll{%
\talisman{Home Scroll}% Name
{detailed, distant, duplicated}% Enhancements
{Warp}% Action
@@ -68,7 +68,7 @@
{}% Details
}
-\newcommand\safetyScroll{
+\newcommand\safetyScroll{%
\talisman{Safety Scroll}% Name
{divergent, detailed}% Enhancements
{Wane}% Action
@@ -81,7 +81,7 @@
The scroll is made from dried papyrus, covered in wax, with ink created with mushrooms and a touch of magnetite.}% Details
}
-\newcommand\snacklet{
+\newcommand\snacklet{%
\talisman{Crunchy Snack}% Name
{detailed}% Enhancements
{Wane}% Action
@@ -93,7 +93,7 @@
Underground travellers occasionally travel with a few of these creatures, in order to fit through small underground tunnels.}% Details
}
-\newcommand\labyrinthScroll{
+\newcommand\labyrinthScroll{%
\talisman{Labyrinth Scroll}% Name
{distant, duplicated}% Enhancements
{Warp}% Action
--
GitLab