More semanticization

artificer.tex

@@ -53,29 +53,6 @@
 
 \leftbanner{Bonds}
 
-\begin{quote}
-\textbf{V:}\enspace\hrulefill
-
-\enspace\hrulefill
-
-\textbf{V:}\enspace\hrulefill
-
-\enspace\hrulefill
-
-\textbf{V:}\enspace\hrulefill
-
-\enspace\hrulefill
-
-\textbf{V:}\enspace\hrulefill
-
-\enspace\hrulefill
-
-\textbf{V:}\enspace\hrulefill
-
-\enspace\hrulefill
-\end{quote}
-
-
 \vfill\null
 \columnbreak
 
@@ -179,8 +156,7 @@
 \end{multicols}
 
 \begin{multicols}{2}
-\leftbanner{Advanced Moves (2-5)}
-When you \textbf{gain a level from 2--5}, choose from these moves.
+\firstAdvances
 
 \begin{amove}{Carrying Harness}
   You affix mechanical tools, plates, chains, and flippy gizmos to
@@ -244,11 +220,11 @@ When you \textbf{gain a level from 2--5}, choose from these moves.
 \end{amove}
 
 \begin{amove}{Rocket Man}
-  When you need to be somewhere really quickly, roll +DEX. On a hit,
-  you are there the moment before you need to be. On a 7-9, also
-  choose one:
+  When you \condition{need to be somewhere really quickly}, roll
+  +DEX. \onHit, you are there the moment before you need to
+  be. \onPartial, also choose one:
   \begin{itemize}
-  \item You needed a burst of speed to get there in time - spend 1
+  \item You needed a burst of speed to get there in time---spend 1
     Charge.
   \item Your reckless charge puts you in a tight spot.
   \end{itemize}
@@ -260,10 +236,7 @@ When you \textbf{gain a level from 2--5}, choose from these moves.
 
 \columnbreak
 
-\rightbanner{Advanced Moves (6-10)}
-
-When you \textbf{gain a level from 6--10}, choose from these moves or
-the level 2--5 moves.
+\secondAdvances
 
 \begin{amove}{A Little Trick I Picked Up}
   Gain one non-multiclass move from the Thief, Mage, or Wizard class
@@ -287,12 +260,11 @@ the level 2--5 moves.
 
 \begin{amove}{I'll Make My Own Friends}
   When you spend some downtime assembling a robotic hireling, roll
-  +INT.  \onSuccess, it has +3 Loyalty and 5 points worth of
-  skills, divided as you see fit.  \textbf{On a 7-9}, it has +2
-  Loyalty and 3 points worth of skills, divided as you see fit.
-  \textbf{On a miss}, it has +1 Loyalty and 1 point in a skill of the
-  GM's choosing. In any case, your new hireling has "Cost: Regular
-  repairs and fine-tuning."
+  +INT.  \onSuccess, it has +3 Loyalty and 5 points worth of skills,
+  divided as you see fit.  \onPartial, it has +2 Loyalty and 3 points
+  worth of skills, divided as you see fit.  \onMiss, it has +1 Loyalty
+  and 1 point in a skill of the GM's choosing. In any case, your new
+  hireling has "Cost: Regular repairs and fine-tuning."
 \end{amove}
 
 \begin{amove}{Increased Voltage}

assets/prelude.tex

@@ -193,6 +193,9 @@
 \newcommand{\onHit}{\textbf{On a 7+}}
 \newcommand{\onMiss}{\textbf{On a miss}}
 
+\newcommand{\moveReplaces}[1]{\textbf{Replaces}: \move{#1}}
+\newcommand{\moveRequires}[1]{\textbf{Requires}: \move{#1}}
+
 \newcommand{\onMassiveSuccessFor}[1]{%
   When you use \move{#1} and \textbf{roll a 12+}}
 

witch.tex

@@ -90,8 +90,8 @@ option includes an Elemental tag, which you can select when weaving a
 \begin{basicmove}{Black Magic (INT)}
   When you \condition{weave a spell to inflict pain}, choose two tags
   from the list and roll +INT. If you do not pick any Range tags, the
-  Range defaults to \itag{hand}. \textbf{On a hit}, deal 1d8 damage,
-  plus all effects of the added tags. \textbf{On a 7-9}, also choose
+  Range defaults to \itag{hand}. \onHit, deal 1d8 damage,
+  plus all effects of the added tags. \onPartial, also choose
   one:
   \begin{itemize}
   \item You draw unwanted attention or put someone in a spot