Update fighter (sans names and look)

fighter.tex

@@ -7,12 +7,15 @@
 \newcommand{\BaseLoad}{12}
 \newcommand{\Damage}{10}
 
+\newcommand{\Names}{names}
+\newcommand{\Look}{look}
+
 \begin{document}
 \openup -0.2em
 
 \charbanner
 
-\begin{multicols}{2}
+\begin{minipage}[t]{3.2in}
 \leftbanner{Folk}
 
 \begin{amove}{Dwarf}
@@ -56,51 +59,27 @@
 
 \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
-
+\end{minipage}
+\begin{minipage}[t]{4.6in}
 
 \rightbanner{Starting Moves}
 
 \begin{basicmove}{Bend Bars, Lift Gates}
-  When you use pure strength to destroy an inanimate obstacle,
-  roll+Str. \textbf{On a 10+}, choose 3. \textbf{On a 7-9}, choose 2.
-
-  • It doesn’t take a very long time
-
-  • Nothing of value is damaged
-
-  • It doesn’t make an inordinate amount of noise
-
-  • You can fix the thing again without a lot of effort
+  When you \condition{use pure strength to destroy an inanimate obstacle},
+  roll+Str. \onSuccess, choose 3. \onPartial, choose 2.
+
+  \begin{itemize}
+  \item It doesn’t take a very long time
+  \item Nothing of value is damaged
+  \item It doesn’t make an inordinate amount of noise
+  \item You can fix the thing again without a lot of effort
+  \end{itemize}
 \end{basicmove}
 
 
 \begin{basicmove}{Armored}
-  You ignore the clumsy tag on armor you wear.
+  You ignore the \itag{clumsy} tag on armor you wear.
 \end{basicmove}
 
 
@@ -176,7 +155,7 @@
 \end{basicmove}
 
 \vfill\null
-\end{multicols}
+\end{minipage}
 \clearpage
 
 \gearbanner
@@ -216,12 +195,10 @@
 
 \end{multicols}
 
-\begin{multicols}{2}
-\leftbanner{Advanced Moves (2-5)}
-
-When you \textbf{gain a level from 2--5}, choose from these moves.
+\widebanner{Advanced Moves}
 
-\
+\begin{multicols}{2}
+\firstAdvances
 
 \begin{amove}{Merciless}
   When you deal damage, deal +1d4 damage.
@@ -231,16 +208,16 @@ When you \textbf{gain a level from 2--5}, choose from these moves.
   When you consult the spirits that reside within your signature
   weapon, they will give you an insight relating to the current
   situation, and might ask you some questions in return,
-  roll+CHA. \textbf{On a 10+}, the GM will give you good
-  detail. \textbf{On a 7-9}, the GM will give you an impression.
+  roll+CHA. \onSuccess, the GM will give you good detail. \onPartial,
+  the GM will give you an impression.
 \end{amove}
 
 \begin{amove}{Armor Mastery}
-  When you make your armor take the brunt of damage dealt to you, the
-  damage is negated but you must reduce the armor value of your armor
-  or shield (your choice) by 1. The value is reduced each time you
-  make this choice. If the reduction leaves the item with 0 armor it
-  is destroyed.
+  When you \condition{make your armor take the brunt of damage dealt
+    to you}, the damage is negated but you must reduce the armor value
+  of your armor or shield (your choice) by 1. The value is reduced
+  each time you make this choice. If the reduction leaves the item
+  with 0 armor it is destroyed.
 \end{amove}
 
 \begin{amove}{Improved Weapon}
@@ -248,17 +225,17 @@ When you \textbf{gain a level from 2--5}, choose from these moves.
 \end{amove}
 
 \begin{amove}{Seeing Red}
-  When you discern realities during combat, you take +1.
+  When you \move{Discern Realities} during combat, you take +1.
 \end{amove}
 
 \begin{amove}{Interrogator}
-  When you parley using threats of impending violence as leverage, you
-  may use STR instead of CHA.
+  When you \move{Parley} using threats of impending violence as
+  leverage, you may use STR instead of CHA.
 \end{amove}
 
 \begin{amove}{Scent of Blood}
-  When you hack and slash an enemy, your next attack against that same
-  foe deals +1d4 damage.
+  When you \move{Hack and Slash} an enemy, your next attack against
+  that same foe deals +1d4 damage.
 \end{amove}
 
 \begin{amove}{Multiclass Dabbler}
@@ -281,21 +258,16 @@ When you \textbf{gain a level from 2--5}, choose from these moves.
 \vfill\null
 \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}{Bloodthirsty}
-\textbf{Replaces}: Merciless
+\textbf{Replaces}: \move{Merciless}
 
 When you deal damage, deal +1d8 damage.
 \end{amove}
 
 \begin{amove}{Armored Perfection}
-\textbf{Replaces}: Armor Mastery
+\textbf{Replaces}: \move{Armor Mastery}
 
 When you choose to let your armor take the brunt of damage dealt to
 you, the damage is negated and you take +1 forward against the
@@ -305,24 +277,24 @@ choice. If the reduction leaves the item with 0 armor it is destroyed.
 \end{amove}
 
 \begin{amove}{Evil Eye}
-  \textbf{Requires}: Seeing Red
+  \textbf{Requires}: \move{Seeing Red}
 
-  When you enter combat, roll+CHA. \textbf{On a 10+}, hold
-  2. \textbf{On a 7-9}, hold 1. Spend your hold to make eye contact
-  with an NPC present, who freezes or flinches and can’t act until you
-  break it off. \textbf{On a 6-}, your enemies immediately identify
-  you as their biggest threat.
+  When you \condition{enter combat}, roll+CHA. \onSuccess, hold
+  2. \onPartial, hold 1. Spend your hold to make eye contact with an
+  NPC present, who freezes or flinches and can’t act until you break
+  it off. \onMiss, your enemies immediately identify you as their
+  biggest threat.
 \end{amove}
 
 \begin{amove}{Taste of Blood}
-\textbf{Replaces}: Scent of Blood
+\textbf{Replaces}: \move{Scent of Blood}
 
-When you hack and slash an enemy, your next attack against that same
-foe deals +1d8 damage.
+When you \move{Hack and Slash} an enemy, your next attack against that
+same foe deals +1d8 damage.
 \end{amove}
 
 \begin{amove}{Multiclass Initiate}
-\textbf{Required}: Multiclass Dabbler
+\textbf{Required}: \move{Multiclass Dabbler}
 
 Get one move from another class. Treat your level as one lower for
 choosing the move.
@@ -335,22 +307,23 @@ You gain +2 armor.
 \end{amove}
 
 \begin{amove}{Through Death’s Eyes}
-  When you go into battle, roll+WIS. \textbf{On a 10+}, name someone
-  who will live and someone who will die. \textbf{On a 7-9}, name
+  When you \condition{go into battle}, roll+WIS. \onSuccess, name
+  someone who will live and someone who will die. \onPartial, name
   someone who will live or someone who will die. Name NPCs, not player
   characters. The GM will make your vision come true, if it’s even
-  remotely possible. \textbf{On a 6-}, you see your own death and
-  consequently take -1 ongoing throughout the battle.
+  remotely possible. \onMiss, you see your own death and consequently
+  take -1 ongoing throughout the battle.
 \end{amove}
 
 \begin{amove}{Eye for Weaponry}
-  When you look over an enemy’s weaponry, ask the GM how much damage
-  they do.
+  When you \condition{look over an enemy’s weaponry}, ask the GM how
+  much damage they do.
 \end{amove}
 
 \begin{amove}{Superior Warrior}
-  When you hack and slash on a 12+ you deal your damage, avoid their
-  attack, and impress, dismay, or frighten your enemy.
+  When you \move{Hack and Slash}, \onMassiveSuccess, you deal your
+  damage, avoid their attack, and impress, dismay, or frighten your
+  enemy.
 \end{amove}