From 489ffe89d4b1ddd965617a5e0302cb193cb1140f Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Wed, 8 Nov 2023 20:58:31 +0100
Subject: [PATCH] update standard spell format for all spells

---
 magic.sty           | 67 ++++++++-------------------------------------
 spells/Air1.tex     | 12 ++++----
 spells/Air2.tex     |  4 +--
 spells/Air3.tex     |  4 +--
 spells/Air4.tex     |  4 +--
 spells/AirFire4.tex |  4 +--
 spells/Death1.tex   | 12 ++++----
 spells/Death2.tex   | 20 +++++++-------
 spells/Death3.tex   |  8 +++---
 spells/Death4.tex   |  4 +--
 spells/Earth1.tex   |  4 +--
 spells/Earth2.tex   |  4 +--
 spells/Earth3.tex   |  4 +--
 spells/Earth4.tex   |  4 +--
 spells/Fate1.tex    | 16 +++++------
 spells/Fate2.tex    | 12 ++++----
 spells/Fate3.tex    |  4 +--
 spells/Fate4.tex    |  4 +--
 spells/Fire1.tex    |  8 +++---
 spells/Fire2.tex    | 12 ++++----
 spells/Fire3.tex    |  4 +--
 spells/Fire4.tex    |  4 +--
 spells/Force1.tex   |  4 +--
 spells/Force2.tex   |  4 +--
 spells/Force3.tex   |  4 +--
 spells/Force4.tex   |  4 +--
 spells/Life1.tex    |  4 +--
 spells/Life2.tex    |  8 +++---
 spells/Life3.tex    |  4 +--
 spells/Life4.tex    |  4 +--
 spells/Light1.tex   |  6 ++--
 spells/Light2.tex   | 12 ++++----
 spells/Light3.tex   |  4 +--
 spells/Light4.tex   |  4 +--
 spells/Mind1.tex    |  6 ++--
 spells/Mind2.tex    |  8 +++---
 spells/Mind3.tex    |  4 +--
 spells/Mind4.tex    |  4 +--
 spells/Water1.tex   |  4 +--
 spells/Water2.tex   |  8 +++---
 spells/Water3.tex   |  4 +--
 spells/Water4.tex   |  4 +--
 spells/airFire3.tex |  4 +--
 spells/airFire4.tex |  4 +--
 spells/fateAir4.tex |  4 +--
 45 files changed, 146 insertions(+), 189 deletions(-)

diff --git a/magic.sty b/magic.sty
index 9341d221..d7875b9c 100644
--- a/magic.sty
+++ b/magic.sty
@@ -71,8 +71,7 @@
 
 
 \newcommand\shortSpell{%
-  \paragraph{\spellName}
-
+  \item[\spellName]
   Cost: \arabic{spellCost},
   \spellEnhancements,
   \spellAction~
@@ -85,9 +84,13 @@
 }
 
 
-\newcommand\showFullSpell[7]{%
+\newcommand\spell[7]{%
   \calcSpell{#1}{#2}{#3}{#4}{#5}{#6}{#7}%
-  \fullSpell%
+  \iftoggle{fullSpells}{%
+    \fullSpell%
+  }{%
+    \shortSpell%
+  }%
 }
 
 % We use spellPotency to track spell effects which are typically larger than the spell's level.
@@ -139,54 +142,6 @@
 % 6 = Description
 % 7 = Longer notes
 
-\newcommand{\spell}[7]{
-  \global\settoggle{distant}{false}%
-  \global\settoggle{duplicated}{false}%
-  \global\settoggle{insubstantial}{false}%
-  \setcounter{spelllevel}{1}%
-  \foreach \s in {#4}{%
-    \stepcounter{spelllevel}%
-  }%
-  \setcounter{spellPotency}{\value{spelllevel}}%
-    \addtocounter{spellPotency}{3}%
-  \setcounter{spellResTN}{7}%
-  \iftoggle{genExamples}{
-    \subsubsection{#1}%
-    \label{#1}%
-
-    {\sffamily(#4%
-    \ifnum\value{spelllevel}>1~\fi #3
-    #2)}
-    \gls{mp} Cost:~\arabic{spelllevel},
-    Resisted by: #5,
-    \setRange%
-    Range:~\spellRange
-    \setArea%
-    \iftoggle{duplicated}{%
-      \ignorespaces, Targets:~\spellArea, %
-    }{}%
-
-    \afterparnoindent
-    #7
-
-    \vphantom{\dmg{spellPotency}}
-    \index[spells]{\textbf{#1}: #6 (Cost: \arabic{spelllevel}, Range:~\spellRange, Resisted by: #5\iftoggle{duplicated}{, Targets: \spellArea}{})|needspace{2em} --- Page }
-  }{
-    \item[\textbf{#1}]%
-    \vphantom{\dmg{spellPotency}}%
-    \vphantom{#4}%
-    \vphantom{#2}%
-    \setArea%
-    \setRange%
-    \ifdefparam{#5}{%
-      Roll #5, \tn[\arabic{spellResTN}], or #6.
-    }{
-      \MakeUppercase#6.
-    }
-    (Spheres:~#2, Cost:~\arabic{spelllevel}, Range:~\spellRange\iftoggle{duplicated}{, Targets:~\spellArea}{})
-  }
-}
-
 \newcommand\spellRange{}
 \newcommand\setRange{%
   \iftoggle{distant}%
@@ -231,6 +186,8 @@
 
 %%%
 
+\newtoggle{fullSpells}
+  \settoggle{fullSpells}{true}
 \newtoggle{insubstantial}
   \settoggle{insubstantial}{false}
 \newtoggle{distant}
@@ -311,7 +268,7 @@
 
 \newcommand\creatureSpells[2][]{
   \begin{description}
-    \settoggle{genExamples}{false}
+    \settoggle{fullSpells}{false}
     #1
     \foreach \s in {#2}{
       \IfFileExists{config/spells/\s.tex}{
@@ -324,7 +281,7 @@
 \newcommand\showStdSpells{
   \setcounter{enc}{0}
   \begin{description}
-    \settoggle{genExamples}{false}
+    \settoggle{fullSpells}{false}
     \foreach\n in {3,2,1}{
       \ifnum\value{enc}<3
         \foreach \s in {Earth,Air,Fire,Water,Fate}{
@@ -341,7 +298,7 @@
 
 \newcommand\showSpells[1]{
   \needspace{3em}
-  \settoggle{genExamples}{true}
+  \settoggle{fullSpells}{true}
   \foreach \s in {#1}{
     \input{config/spells/\s.tex}
   }
diff --git a/spells/Air1.tex b/spells/Air1.tex
index f69a0413..c42e1c17 100644
--- a/spells/Air1.tex
+++ b/spells/Air1.tex
@@ -1,7 +1,7 @@
 \spell{Wind Chill}% Name
-  {\mAir}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {targets lose \arabic{spelllevel} \gls{ap} and get pushed back \arabic{spelllevel}~\glspl{ap} minus Strength}% Description
   {
@@ -10,9 +10,9 @@
   }
 
 \spell{Noxious Fog}% Name
-  {\mAir}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Air}% Spheres
   {the wind speed}% Resist with
   {a pocket of foul air inflicts \arabic{spellPotency}~\glspl{fatigue} each round}% Description
   {
@@ -26,9 +26,9 @@
   }
 
 \spell{Bubble}% Name
-  {\mAir}% Spheres
-  {Warp}% Action
   {}% Enhancements
+  {Warp}% Action
+  {Air}% Spheres
   {the density of the liquid}% Resist with
   {a small bubble surrounds the caster}% Description
   {
diff --git a/spells/Air2.tex b/spells/Air2.tex
index 991fe788..d955956a 100644
--- a/spells/Air2.tex
+++ b/spells/Air2.tex
@@ -1,8 +1,8 @@
 
 \spell{Wind Blast}% Name
-  {\mAir}% Spheres
+  {duplicated}% Enhancements
   {Wax}% Action
-  {\duplicated}% Enhancements
+  {Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {targets lose \arabic{spelllevel} \glspl{ap} and get pushed back \arabic{spelllevel} minus Strength squares}% Description
   {
diff --git a/spells/Air3.tex b/spells/Air3.tex
index 14735ce0..bc5f8a3e 100644
--- a/spells/Air3.tex
+++ b/spells/Air3.tex
@@ -1,7 +1,7 @@
 \spell{Putrid Visage}% Name
-  {\mAir}% Spheres
+  {detailed,duplicated}% Enhancements
   {Wane}% Action
-  {\detailed,\duplicated}% Enhancements
+  {Air}% Spheres
   {wind speed}% Resist with
   {Stinking cloud covers \spellArea, inflicting \arabic{spelllevel}~\glspl{fatigue} to anyone in the area breathing it in}% Description
   {
diff --git a/spells/Air4.tex b/spells/Air4.tex
index 8c53cfb4..51aa1c41 100644
--- a/spells/Air4.tex
+++ b/spells/Air4.tex
@@ -1,7 +1,7 @@
 \spell{Safe Passage}% Name
-  {\mAir}% Spheres
+  {detailed, distant, duplicated}% Enhancements
   {Warp}% Action
-  {\detailed, \distant, \duplicated}% Enhancements
+  {Air}% Spheres
   {wind or tide's potence}% Resist with
   {a path appears, surrounded by clouds, which repels anything which might harm those who walk it (projectiles receive a minus \arabic{spelllevel} penalty, and other attacks receive minus \arabic{spelllevel} \glspl{ap}}% Description
   {
diff --git a/spells/AirFire4.tex b/spells/AirFire4.tex
index eabe5a1a..d1cf5fcc 100644
--- a/spells/AirFire4.tex
+++ b/spells/AirFire4.tex
@@ -1,7 +1,7 @@
 \spell{Night's Teeth}% Name
-  {\mFire, \mAir}% Spheres
+  {detailed, duplicated, divergent}% Enhancements
   {Wane}% Action
-  {\detailed, \duplicated, \divergent}% Enhancements
+  {Fire, Air}% Spheres
   {\roll{Wits}{Vigilance}}% Resist with
   {lanterns flare, burning \spellArea\ any nearby targets for \rollConv\ Damage, then shadowy spirits latch onto their face, inflicting \arabic{spelllevel} \glspl{fatigue}}% Description
   {
diff --git a/spells/Death1.tex b/spells/Death1.tex
index df48852c..942526d2 100644
--- a/spells/Death1.tex
+++ b/spells/Death1.tex
@@ -1,7 +1,7 @@
 \spell{Boke}% Name
-  {\mFate, \mAir}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Fate, Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {target gains 1 \glsentrytext{fatigue}}% Description
   {
@@ -10,9 +10,9 @@
   }
 
 \spell{Sloth}% Name
-  {\mFate, \mAir}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Fate, Air}% Spheres
   {target's \glsentrytext{fatigue} penalty}% Resist with
   {target ignores all \glsentrytext{fatigue} penalties for \pgls{interval}}% Description
   {
@@ -22,9 +22,9 @@
   }
 
 \spell{Torpor}% Name
-  {\mFate, \mAir}% Spheres
-  {Warp}% Action
   {}% Enhancements
+  {Warp}% Action
+  {Fate, Air}% Spheres
   {target's \glsentrytext{fatigue} penalty}% Resist with
   {target's gains \glsentrytext{dr} 1}% Description
   {
diff --git a/spells/Death2.tex b/spells/Death2.tex
index 97565352..28001eff 100644
--- a/spells/Death2.tex
+++ b/spells/Death2.tex
@@ -1,7 +1,7 @@
 \spell{Choke}% Name
-  {\mFate, \mAir}% Spheres
+  {detailed}% Enhancements
   {Wax}% Action
-  {\detailed}% Enhancements
+  {Fate, Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {target loses \arabic{spelllevel} \glspl{hp}}% Description
   {
@@ -10,9 +10,9 @@
   }
 
 \spell{Infectious Migraine}% Name
-  {\mFate, \mAir}% Spheres
+  {duplicated}% Enhancements
   {Wax}% Action
-  {\duplicated}% Enhancements
+  {Fate, Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {\spellArea\ targets lose \arabic{spelllevel} \glspl{fatigue}}% Description
   {
@@ -20,9 +20,9 @@
   }
 
 \spell{Corpse Stench}% Name
-  {\mFate, \mAir}% Spheres
+  {distant}% Enhancements
   {Witness}% Action
-  {\distant}% Enhancements
+  {Fate, Air}% Spheres
   {time since death}% Resist with
   {Detect any close corpses}% Description
   {
@@ -31,9 +31,9 @@
   }
 
 \spell{Preservation}% Name
-  {\mFate, \mAir}% Spheres
+  {detailed}% Enhancements
   {Wane}% Action
-  {\detailed}% Enhancements
+  {Fate, Air}% Spheres
   {target's current \glsentrytext{fatigue} penalty}% Resist with
   {Stop \glspl{fatigue}, poisons, venom or rot}% Description
   {
@@ -44,9 +44,9 @@
   }
 
 \spell{Soul Specks}% Name
-  {\mFate, \mAir}% Spheres
+  {Fate, Air}% Spheres
   {Warp}% Action
-  {\detailed}% Enhancements
+  {detailed}% Enhancements
   {Vigilance}% Resist with
   {Gain \gls{dr} 2, ignore up to \arabic{spelllevel}~\gls{fatigue} penalties, and see as the dead see}% Description
   {
diff --git a/spells/Death3.tex b/spells/Death3.tex
index 8c84b039..af54515b 100644
--- a/spells/Death3.tex
+++ b/spells/Death3.tex
@@ -1,7 +1,7 @@
 \spell{Stench Sort}% Name
-  {\mFate, \mAir}% Spheres
+  {distant, detailed}% Enhancements
   {Witness}% Action
-  {\distant, \detailed}% Enhancements
+  {Fate, Air}% Spheres
   {time since death}% Resist with
   {Detect the corpse of a named species within \spellRange}% Description
   {
@@ -10,9 +10,9 @@
   }
 
 \spell{Death Sight}% Name
-  {\mFate, \mAir}% Spheres
+  {distant, detailed}% Enhancements
   {Warp}% Action
-  {\distant, \detailed}% Enhancements
+  {Fate, Air}% Spheres
   {current \glsentrytext{fatigue} penalty}% Resist with
   {Gain \gls{dr} 2, ignore up to \arabic{spelllevel}~\gls{fatigue} penalties, and see as the dead see}% Description
   {
diff --git a/spells/Death4.tex b/spells/Death4.tex
index 9dc36c2b..bf1ae734 100644
--- a/spells/Death4.tex
+++ b/spells/Death4.tex
@@ -1,7 +1,7 @@
 \spell{Viscious Wind}% Name
-  {\mFate, \mAir}% Spheres
+  {distant, duplicated, divergent}% Enhancements
   {Wax}% Action
-  {\distant, \duplicated, \divergent}% Enhancements
+  {Fate, Air}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {\spellArea\ targets lose \arabic{spelllevel} \glspl{fatigue}, while wind removes \arabic{spelllevel} \glspl{ap}}% Description
   {
diff --git a/spells/Earth1.tex b/spells/Earth1.tex
index 54b4e13c..5eb02c59 100644
--- a/spells/Earth1.tex
+++ b/spells/Earth1.tex
@@ -1,7 +1,7 @@
 \spell{Slide}% Name
-  {\mEarth}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Earth}% Spheres
   {\roll{Dexterity}{Athletics}}% Resist with
   {targets standing on snow or mud fall prone}% Description
   {
diff --git a/spells/Earth2.tex b/spells/Earth2.tex
index 0d5dd439..36383162 100644
--- a/spells/Earth2.tex
+++ b/spells/Earth2.tex
@@ -1,7 +1,7 @@
 \spell{Snowbinding}% Name
-  {\mEarth}% Spheres
+  {detailed}% Enhancements
   {Wax}% Action
-  {\detailed}% Enhancements
+  {Earth}% Spheres
   {by \gls{weight}}% Resist with
   {the caster forms snow or sand into a weapon blade. It shatters if it deals over \arabic{spellPotency} Damage}% Description
   {
diff --git a/spells/Earth3.tex b/spells/Earth3.tex
index 64785a04..afab8ea5 100644
--- a/spells/Earth3.tex
+++ b/spells/Earth3.tex
@@ -1,7 +1,7 @@
 \spell{Sky-Call}% Name
-  {\mEarth}% Spheres
+  {distant,detailed}% Enhancements
   {Wane}% Action
-  {\distant,\detailed}% Enhancements
+  {Earth}% Spheres
   {\roll{Wits}{Caving}}% Resist with
   {the ceiling cracks, inflicting \rollConv\ Damage on a single target below}% Description
   {
diff --git a/spells/Earth4.tex b/spells/Earth4.tex
index c289a148..55e7ce26 100644
--- a/spells/Earth4.tex
+++ b/spells/Earth4.tex
@@ -1,7 +1,7 @@
 \spell{Snowcastle}% Name
-  {\mEarth}% Spheres
+  {detailed, distant, duplicated}% Enhancements
   {Wax}% Action
-  {\detailed, \distant, \duplicated}% Enhancements
+  {Earth}% Spheres
   {weather conditions}% Resist with
   {during a snowstorm, the caster guides every snowflake to settle into a great ice-castle}% Description
   {
diff --git a/spells/Fate1.tex b/spells/Fate1.tex
index ae358b55..0dbdbb3b 100644
--- a/spells/Fate1.tex
+++ b/spells/Fate1.tex
@@ -1,7 +1,7 @@
 \spell{Blessing}% Name
-  {\mFate}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Fate}% Spheres
   {the target's Charisma}% Resist with
   {\spellArea~target gains \rollConv~\glspl{fp}}% Description
   {
@@ -9,9 +9,9 @@
   }
 
 \spell{Curse}% Name
-  {\mFate}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
   {lose \rollConv~\glspl{fp}}% Description
   {
@@ -21,9 +21,9 @@
 
 
 \spell{Twisted Fate}% Name
-  {\mFate}% Spheres
-  {Warp}% Action
   {}% Enhancements
+  {Warp}% Action
+  {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
   {target gains 1 monster encounter}% Description
   {
@@ -36,9 +36,9 @@
   }
 
 \spell{Fathom}% Name
-  {\mFate}% Spheres
-  {Witness}% Action
   {}% Enhancements
+  {Witness}% Action
+  {Fate}% Spheres
   {\roll{Charisma}{Deceit}}% Resist with
   {check if target carries \glspl{fp}}% Description
   {
diff --git a/spells/Fate2.tex b/spells/Fate2.tex
index 23d2aaa1..4b06290d 100644
--- a/spells/Fate2.tex
+++ b/spells/Fate2.tex
@@ -1,7 +1,7 @@
 \spell{Mass Blessing}% Name
-  {\mFate}% Spheres
+  {duplicated}% Enhancements
   {Wax}% Action
-  {\duplicated}% Enhancements
+  {Fate}% Spheres
   {target's Charisma}% Resist with
   {\spellArea{} targets gain \arabic{spelllevel} \glspl{fp}}% Description
   {
@@ -9,9 +9,9 @@
   }
 
 \spell{Mass Curse}% Name
-  {\mFate}% Spheres
+  {duplicated}% Enhancements
   {Wane}% Action
-  {\duplicated}% Enhancements
+  {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
   {\spellArea\ targets lose \rollConv~\glspl{fp}}% Description
   {
@@ -20,9 +20,9 @@
   }
 
 \spell{Hateful Cry}% Name
-  {Fate}% Spheres
+  {distant}% Enhancements
   {Wane}% Action
-  {\distant}% Enhancements
+  {Fate}% Spheres
   {\roll{Charisma}{Tactics}}% Resist with
   {target loses \rollConv~\glspl{fp}}% Description
   {
diff --git a/spells/Fate3.tex b/spells/Fate3.tex
index d86b368e..f7065c57 100644
--- a/spells/Fate3.tex
+++ b/spells/Fate3.tex
@@ -1,7 +1,7 @@
 \spell{Itching Cornea}% Name
-  {\mFate}% Spheres
+  {duplicated,detailed}% Enhancements
   {Wane}% Action
-  {\duplicated,\detailed}% Enhancements
+  {Fate}% Spheres
   {Charisma + target Skill}% Resist with
   {\spellArea{} targets gain a -1 penalty to the next \arabic{spelllevel} rolls which use the target spell.}% Description
   {The caster cries a weirdly-specific doom, like `may your feet grow fungus', or `I hope your spells come out backwards', and the next \arabic{spelllevel} times the target uses that Skill, they receive a -1 penalty.
diff --git a/spells/Fate4.tex b/spells/Fate4.tex
index d217fd61..73d5b207 100644
--- a/spells/Fate4.tex
+++ b/spells/Fate4.tex
@@ -1,7 +1,7 @@
 \spell{Highest Blessing}% Name
-  {\mFate}% Spheres
+  {duplicated, detailed, distant}% Enhancements
   {Wax}% Action
-  {\duplicated, \detailed, \distant}% Enhancements
+  {Fate}% Spheres
   {ambient noise}% Resist with
   {targets receive \rollConv~\glspl{fp}}% Description
   {
diff --git a/spells/Fire1.tex b/spells/Fire1.tex
index 7c0cd398..92d45ea9 100644
--- a/spells/Fire1.tex
+++ b/spells/Fire1.tex
@@ -1,7 +1,7 @@
 \spell{Furious Flame}% Name
-  {\mFire}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Fire}% Spheres
   {\roll{Wits}{Athletics}}% Resist with
   {target fire flares, inflicting \rollConv\ Damage on all around}% Description
   {
@@ -14,9 +14,9 @@
   }
 
 \spell{Douse}% Name
-  {\mFire}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Fire}% Spheres
   {size of the flame}% Resist with
   {target fire goes out}% Description
   {
diff --git a/spells/Fire2.tex b/spells/Fire2.tex
index 65055fd9..788b4097 100644
--- a/spells/Fire2.tex
+++ b/spells/Fire2.tex
@@ -1,7 +1,7 @@
 \spell{Sinister Flame}% Name
-  {\mFire}% Spheres
+  {detailed}% Enhancements
   {Wax}% Action
-  {\detailed}% Enhancements
+  {Fire}% Spheres
   {\roll{Wits}{Athletics}}% Resist with
   {a fire becomes claws and grabs someone, inflicting \rollConv\ Damage on someone}% Description
   {
@@ -9,9 +9,9 @@
   }
 
 \spell{Toothless Fire}% Name
-  {\mFire}% Spheres
+  {duplicated}% Enhancements
   {Warp}% Action
-  {\duplicated}% Enhancements
+  {Fire}% Spheres
   {intensity of the flame}% Resist with
   {target fires stop consuming a certain type of material}% Description
   {
@@ -22,9 +22,9 @@
   }
 
 \spell{Party Kill}% Name
-  {\mFire}% Spheres
+  {duplicated}% Enhancements
   {Wane}% Action
-  {\duplicated}% Enhancements
+  {Fire}% Spheres
   {size of the flame}% Resist with
   {\spellArea\ fires go out}% Description
   {
diff --git a/spells/Fire3.tex b/spells/Fire3.tex
index 87a46459..88188c1c 100644
--- a/spells/Fire3.tex
+++ b/spells/Fire3.tex
@@ -1,7 +1,7 @@
 \spell{Brilliant Bull}% Name
-  {\mFire}% Spheres
+  {detailed, duplicated}% Enhancements
   {Wax}% Action
-  {\detailed, \duplicated}% Enhancements
+  {Fire}% Spheres
   {\roll{Speed}{Athletics}}% Resist with
   {up to \spellArea\ fires in the area take the form of a raging, red, bull, dealing \rollConv\ Damage to anyone near them}% Description
   {
diff --git a/spells/Fire4.tex b/spells/Fire4.tex
index 5cde4a08..de8bd960 100644
--- a/spells/Fire4.tex
+++ b/spells/Fire4.tex
@@ -1,7 +1,7 @@
 \spell{Festival of Fire}% Name
-  {\mFire}% Spheres
+  {detailed, duplicated, distant}% Enhancements
   {Wax}% Action
-  {\detailed, \duplicated, \distant}% Enhancements
+  {Fire}% Spheres
   {\roll{Wits}{Vigilance}}% Resist with
   {up to \spellArea\ fires, \spellRange\ away, explode in the form of dancing creatures, dealing \rollConv\ Damage to anyone nearby}% Description
   {
diff --git a/spells/Force1.tex b/spells/Force1.tex
index 6ff117a9..3e73a28f 100644
--- a/spells/Force1.tex
+++ b/spells/Force1.tex
@@ -1,7 +1,7 @@
 \spell{Telekinetic Fist}% Name
-  {\mEarth,\mFire}% Spheres
-  {Wax}% Action
   {}% Enhancements
+  {Wax}% Action
+  {Earth,Fire}% Spheres
   {\roll{Dexterity}{Brawl}}% Resist with
   {the caster increases any force acting on a target, increasing the Damage by \arabic{spelllevel}. This requires acting at the same \glspl{ap} level}% Description
   {
diff --git a/spells/Force2.tex b/spells/Force2.tex
index a856dc85..db7405ea 100644
--- a/spells/Force2.tex
+++ b/spells/Force2.tex
@@ -1,7 +1,7 @@
 \spell{Hidden Door}% Name
-  {\mEarth,\mFire}% Spheres
+  {duplicated}% Enhancements
   {Warp}% Action
-  {\duplicated}% Enhancements
+  {Earth,Fire}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {a magical portal, connecting two places within \spellRange. Creatures with a \gls{weight} of \arabic{spellArea} or less can fit through}% Description
   {
diff --git a/spells/Force3.tex b/spells/Force3.tex
index e6948fd9..dbf89809 100644
--- a/spells/Force3.tex
+++ b/spells/Force3.tex
@@ -1,7 +1,7 @@
 \spell{Hunting Arrow}% Name
-  {\mEarth,\mFire}% Spheres
+  {detailed,distant}% Enhancements
   {Wax}% Action
-  {\detailed,\distant}% Enhancements
+  {Earth,Fire}% Spheres
   {\roll{Speed}{Vigilance}}% Resist with
   {A target attack gains a +\arabic{spelllevel} bonus to hit and Damage. The spell must be cast at the same \glspl{ap} step as the arrow flies}% Description
   {
diff --git a/spells/Force4.tex b/spells/Force4.tex
index 06f68881..e97a4a7b 100644
--- a/spells/Force4.tex
+++ b/spells/Force4.tex
@@ -1,7 +1,7 @@
 \spell{Children Sit}% Name
-  {\mEarth,\mFire}% Spheres
+  {detailed,distant,duplicated}% Enhancements
   {Wane}% Action
-  {\detailed,\distant,\duplicated}% Enhancements
+  {Earth,Fire}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {the target takes a -\arabic{spelllevel} \gls{ap} penalty. They can spend 1 \gls{ap} to reduce the spell's effects by 1}% Description
   {
diff --git a/spells/Life1.tex b/spells/Life1.tex
index b255fe2c..1add0b17 100644
--- a/spells/Life1.tex
+++ b/spells/Life1.tex
@@ -1,7 +1,7 @@
 \spell{Treamours}% Name
-  {\mEarth,\mWater}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Earth,Water}% Spheres
   {current \glspl{hp}}% Resist with
   {the target's Strength or Speed Bonus reduces by \arabic{spelllevel}}% Description
   {
diff --git a/spells/Life2.tex b/spells/Life2.tex
index 1e697972..f7bdd571 100644
--- a/spells/Life2.tex
+++ b/spells/Life2.tex
@@ -1,7 +1,7 @@
 \spell{Atrophy}% Name
-  {\mEarth,\mWater}% Spheres
+  {duplicated}% Enhancements
   {Wane}% Action
-  {\duplicated}% Enhancements
+  {Earth,Water}% Spheres
   {current \glspl{hp}}% Resist with
   {the target's Strength or Speed Bonus reduces by \arabic{spelllevel}}% Description
   {
@@ -13,9 +13,9 @@
   }
 
 \spell{Breaths in the Air}% Name
-  {\mEarth,\mWater}% Spheres
+  {distant}% Enhancements
   {Witness}% Action
-  {\distant}% Enhancements
+  {Earth,Water}% Spheres
   {target's strangeness}% Resist with
   {the caster detects any life around \spellRange\ away}% Description
   {
diff --git a/spells/Life3.tex b/spells/Life3.tex
index 6aae78d6..e5886f81 100644
--- a/spells/Life3.tex
+++ b/spells/Life3.tex
@@ -1,7 +1,7 @@
 \spell{Goblin Gala}% Name
-  {\mEarth,\mWater}% Spheres
+  {Earth,Water}% Spheres
   {Wax}% Action
-  {\detailed,\duplicated}% Enhancements
+  {detailed,duplicated}% Enhancements
   {current \glspl{hp}}% Resist with
   {the targets' Strength or Speed becomes half current score, plus \arabic{spelllevel}. The target develops a super-appetatite, receiving double the usual \glspl{fatigue}}% Description
   {
diff --git a/spells/Life4.tex b/spells/Life4.tex
index d78be150..0bc4032b 100644
--- a/spells/Life4.tex
+++ b/spells/Life4.tex
@@ -1,7 +1,7 @@
 \spell{Pact of Ice}% Name
-  {\mEarth,\mWater}% Spheres
+  {detailed, duplicated, divergent}% Enhancements
   {Warp}% Action
-  {\detailed, \duplicated, \divergent}% Enhancements
+  {Earth,Water}% Spheres
   {current \glspl{hp}}% Resist with
   {\spellArea\ people or plants cool so much that they freeze nearby water}% Description
   {
diff --git a/spells/Light1.tex b/spells/Light1.tex
index 0757ed69..8ef54fe4 100644
--- a/spells/Light1.tex
+++ b/spells/Light1.tex
@@ -1,5 +1,5 @@
 \spell{Sparkle}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wax}% Action
   {}% Enhancements
   {surrounding darkness}% Resist with
@@ -9,7 +9,7 @@
   }
 
 \spell{Shadow}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wane}% Action
   {}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
@@ -25,7 +25,7 @@
   }
 
 \spell{Little Big}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Warp}% Action
   {}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
diff --git a/spells/Light2.tex b/spells/Light2.tex
index bf617d5c..f8b69e7d 100644
--- a/spells/Light2.tex
+++ b/spells/Light2.tex
@@ -1,7 +1,7 @@
 \spell{Sun Flare}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wax}% Action
-  {\duplicated}% Enhancements
+  {duplicated}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
   {Room fills with light}% Description
   {
@@ -11,9 +11,9 @@
   }
 
 \spell{Were Light}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wax}% Action
-  {\detailed}% Enhancements
+  {detailed}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
   {any spark blooms into a warm light}% Description
   {
@@ -24,9 +24,9 @@
   }
 
 \spell{Shadow Puppet}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wane}% Action
-  {\detailed}% Enhancements
+  {detailed}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
   {A shadow forms a silhouette}% Description
   {
diff --git a/spells/Light3.tex b/spells/Light3.tex
index cf0bbdca..118a9f12 100644
--- a/spells/Light3.tex
+++ b/spells/Light3.tex
@@ -1,7 +1,7 @@
 \spell{Puppet Show}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Wane}% Action
-  {\detailed, \duplicated}% Enhancements
+  {detailed, duplicated}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
   {\spellArea\ shadows form a silhouette}% Description
   {
diff --git a/spells/Light4.tex b/spells/Light4.tex
index 18861b8d..e1463b22 100644
--- a/spells/Light4.tex
+++ b/spells/Light4.tex
@@ -1,7 +1,7 @@
 \spell{Reinforcements}% Name
-  {\mFire, \mAir}% Spheres
+  {Fire, Air}% Spheres
   {Warp}% Action
-  {\detailed, \duplicated, \distant}% Enhancements
+  {detailed, duplicated, distant}% Enhancements
   {\roll{Wits}{Vigilance}}% Resist with
   {\arabic{spelllevel} targets in the distance receive chimerical copies}% Description
   {
diff --git a/spells/Mind1.tex b/spells/Mind1.tex
index 5cb3734f..66e7b41a 100644
--- a/spells/Mind1.tex
+++ b/spells/Mind1.tex
@@ -1,5 +1,5 @@
 \spell{Fascination}% Name
-  {\mFate, \mWater}% Spheres
+  {Fate, Water}% Spheres
   {Wax}% Action
   {}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
@@ -15,7 +15,7 @@
   }
 
 \spell{Confusion}% Name
-  {\mFate, \mWater}% Spheres
+  {Fate, Water}% Spheres
   {Wane}% Action
   {}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
@@ -27,7 +27,7 @@
   }
 
 \spell{Shadow Check}% Name
-  {\mFate, \mWater}% Spheres
+  {Fate, Water}% Spheres
   {Witness}% Action
   {}% Enhancements
   {}% Resist with
diff --git a/spells/Mind2.tex b/spells/Mind2.tex
index 7004ac2a..9ca01722 100644
--- a/spells/Mind2.tex
+++ b/spells/Mind2.tex
@@ -1,7 +1,7 @@
 \spell{Chaos}% Name
-  {\mWater, \mFate}% Spheres
+  {Water, Fate}% Spheres
   {Wane}% Action
-  {\duplicated}% Enhancements
+  {duplicated}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
   {\spellArea\ targets suffer -\arabic{spelllevel}~\glspl{ap}}% Description
   {
@@ -13,9 +13,9 @@
   }
 
 \spell{Fear}% Name
-  {\mWater, \mFate}% Spheres
+  {Water, Fate}% Spheres
   {Wane}% Action
-  {\divergent}% Enhancements
+  {divergent}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
   {the target loses \arabic{spelllevel}~\glspl{ap} and \rollConv~\glspl{fp}}% Description
   {
diff --git a/spells/Mind3.tex b/spells/Mind3.tex
index 6b670b22..db090a10 100644
--- a/spells/Mind3.tex
+++ b/spells/Mind3.tex
@@ -1,7 +1,7 @@
 \spell{Stranger Danger}% Name
-  {\mWater, \mFate}% Spheres
+  {Water, Fate}% Spheres
   {Wane}% Action
-  {\distant, \duplicated}% Enhancements
+  {distant, duplicated}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
   {\spellArea\ targets \spellRange\ away suffer -\arabic{spelllevel}~\glspl{ap}}% Description
   {
diff --git a/spells/Mind4.tex b/spells/Mind4.tex
index e2cf892c..ffe18c8b 100644
--- a/spells/Mind4.tex
+++ b/spells/Mind4.tex
@@ -1,7 +1,7 @@
 \spell{Keening}% Name
-  {\mWater, \mFate}% Spheres
+  {Water, Fate}% Spheres
   {Wane}% Action
-  {\distant, \detailed, \divergent}% Enhancements
+  {distant, detailed, divergent}% Enhancements
   {\roll{Wits}{Academics}}% Resist with
   {the target takes a -\arabic{spelllevel} penalty to Mind Attributes when presented with a particular stimulus, and takes a -1 penalty to the next \arabic{spelllevel} actions interacting with it}% Description
   {
diff --git a/spells/Water1.tex b/spells/Water1.tex
index 7d197e25..c74f1603 100644
--- a/spells/Water1.tex
+++ b/spells/Water1.tex
@@ -1,7 +1,7 @@
 \spell{Cold Steam}% Name
-  {\mWater}% Spheres
-  {Wane}% Action
   {}% Enhancements
+  {Wane}% Action
+  {Water}% Spheres
   {ambient temperature}% Resist with
   {up to a barrel of water turns into mist}% Description
   {
diff --git a/spells/Water2.tex b/spells/Water2.tex
index 020498a4..65abd6b2 100644
--- a/spells/Water2.tex
+++ b/spells/Water2.tex
@@ -1,7 +1,7 @@
 \spell{Acid Bath}% Name
-  {\mWater}% Spheres
+  {duplicated}% Enhancements
   {Warp}% Action
-  {\duplicated}% Enhancements
+  {Water}% Spheres
   {water's speed}% Resist with
   {\spellArea\ barrels' worth of water become acidic (2 Damage per round contact)}% Description
   {
@@ -15,9 +15,9 @@
   }
 
 \spell{Detect Water}% Name
-  {\mWater}% Spheres
+  {distant}% Enhancements
   {Witness}% Action
-  {\distant}% Enhancements
+  {Water}% Spheres
   {}% Resist with
   {caster detects liquid within \spellRange}% Description
   {
diff --git a/spells/Water3.tex b/spells/Water3.tex
index a2805f38..d227cc94 100644
--- a/spells/Water3.tex
+++ b/spells/Water3.tex
@@ -1,8 +1,8 @@
 
 \spell{Desert Ghosts}% Name
-  {\mWater}% Spheres
+  {duplicated, detailed}% Enhancements
   {Wane}% Action
-  {\duplicated, \detailed}% Enhancements
+  {Water}% Spheres
   {low temperature}% Resist with
   {\spellArea\ \arabic{spellArea} barrels' worth of water evaporate, and turn into ghastly apparitions with distorted features.  Ranged attacks take a -\arabic{spelllevel} penalty.}% Description
   {
diff --git a/spells/Water4.tex b/spells/Water4.tex
index 2131e4dc..2ec05e7e 100644
--- a/spells/Water4.tex
+++ b/spells/Water4.tex
@@ -1,7 +1,7 @@
 \spell{Flooding}% Name
-  {\mWater}% Spheres
+  {distant, duplicated, detailed}% Enhancements
   {Wax}% Action
-  {\distant, \duplicated, \detailed}% Enhancements
+  {Water}% Spheres
   {\roll{Strength}{Athletics}}% Resist with
   {surrounding water rises like demonic hands to drown select targets, losing them \arabic{spelllevel} \glspl{ap}}% Description
   {
diff --git a/spells/airFire3.tex b/spells/airFire3.tex
index 86a8bec5..015da180 100644
--- a/spells/airFire3.tex
+++ b/spells/airFire3.tex
@@ -1,7 +1,7 @@
 \spell{Hearth Blast}% Name
-  {\mAir\ and \mFire}% Spheres
+  {Air\ and Fire}% Spheres
   {Wax}% Action
-  {\divergent, \duplicated}% Enhancements
+  {divergent, duplicated}% Enhancements
   {the size of the fire}% Resist with
   {A fire explodes over \spellArea\ targets who lose \arabic{spelllevel}~\glspl{ap} and take \arabic{spelllevel} Damage}% Description
   {
diff --git a/spells/airFire4.tex b/spells/airFire4.tex
index bdcafc2a..235834bf 100644
--- a/spells/airFire4.tex
+++ b/spells/airFire4.tex
@@ -1,7 +1,7 @@
 \spell{Storm Blast}% Name
-  {\mAir\ and \mFire}% Spheres
+  {Air\ and Fire}% Spheres
   {Wax}% Action
-  {\detailed, \divergent, \duplicated}% Enhancements
+  {detailed, divergent, duplicated}% Enhancements
   {the storm's ferocity}% Resist with
   {\spellArea\ targets lose \arabic{spelllevel} \glspl{ap} while lightning hits them for \arabic{spelllevel} Damage}% Description
   {
diff --git a/spells/fateAir4.tex b/spells/fateAir4.tex
index 48933033..aec7bfca 100644
--- a/spells/fateAir4.tex
+++ b/spells/fateAir4.tex
@@ -1,7 +1,7 @@
 \spell{Death Mist}% Name
-  {\mFate,\mAir}% Spheres
+  {Fate,Air}% Spheres
   {Wane}% Action
-  {\duplicated,\detailed,\divergent}% Enhancements
+  {duplicated,detailed,divergent}% Enhancements
   {\roll{Charisma}{Vigilance}}% Resist with
   {A stinking cloud covers \spellArea, inflicting \arabic{spelllevel}~\glspl{fatigue} to anyone in the area breathing it in, and removing \rollConv~\glspl{fp}}% Description
   {
-- 
GitLab