Update Farmer for new playbook api

farmer.tex

@@ -5,25 +5,19 @@
 \pbBaseHP{8}
 \pbDamage{6}
 
-\newcommand{\Names}{
-  Dwarf: Idar, Talin, Lorsôth, Arngish, Sumum,
-  Tarag, Zasit, Dungren, Gûrast
+\pbNames{Dwarf}{Idar, Talin, Lorsôth, Arngish, Sumum,
+  Tarag, Zasit, Dungren, Gûrast}
 
-  Human: Emmet, Adkins, Roisia, Brise, Decima,
-  Potkin, Silja, Henrik, Taro
+\pbNames{Human}{Emmet, Adkins, Roisia, Brise, Decima,
+  Potkin, Silja, Henrik, Taro}
 
-  Rihamm: Yaro, Umudrar, Produs, Aqeramm, Qedrim,
-  Bashiren, Ebra, Eduss
-}
-\newcommand{\Look}{
-  Sparkling Eyes, Sharp Eyes, or Weary Eyes
+\pbNames{Rihamm}{Yaro, Umudrar, Produs, Aqeramm, Qedrim,
+  Bashiren, Ebra, Eduss}
 
-  Jaunty Cap, Long Hair, or Close-Cropped Hair
-
-  Ragged Clothes, Bulky Clothes, or Bare-Chested
-
-  Rugged Body, Round Body, or Fit Body
-}
+\pbLook{Sparkling Eyes, Sharp Eyes, or Weary Eyes}
+\pbLook{Jaunty Cap, Long Hair, or Close-Cropped Hair}
+\pbLook{Ragged Clothes, Bulky Clothes, or Bare-Chested}
+\pbLook{Rugged Body, Round Body, or Fit Body}
 
 \begin{document}
 
@@ -184,8 +178,6 @@
     \end{choices}
   \end{quote}
 
-\ 
-
 \columnbreak
 
 \ 
@@ -239,22 +231,6 @@
   plate armor!)
 \end{amove}
 
-\begin{amove}{My Back Is Broad}
-  When you \condition{take damage from an enemy}, select one of your
-  allies. That ally takes \forward{+1} to attack the enemy.
-\end{amove}
-
-\begin{amove}{Gimme Shelter}
-  When you \condition{safely harbor and protect someone through dire
-    or mortal danger}, mark XP.
-\end{amove}
-
-\begin{amove}{Stardew Valley}
-  You can always find food and drink in a natural setting. So long as
-  you're sleeping in the wilderness, you don't need to consume a
-  ration.
-\end{amove}
-
 \begin{amove}{Wild Horses}
   When you have \condition{time and safety in the wilderness}, you can
   find and tame a wild beast. For the rest of your current journey, it
@@ -273,10 +249,19 @@
   You can travel with at most one wild beast at a time.
 \end{amove}
 
-
 \vfill\null
 \columnbreak
 
+\begin{amove}{My Back Is Broad}
+  When you \condition{take damage from an enemy}, select one of your
+  allies. That ally takes \forward{+1} to attack the enemy.
+\end{amove}
+
+\begin{amove}{Gimme Shelter}
+  When you \condition{safely harbor and protect someone through dire
+    or mortal danger}, mark XP.
+\end{amove}
+
 \secondAdvances
 
 \begin{amove}{Master Gardener}
@@ -288,6 +273,13 @@
   gain +1 ration for every member of your travelling-party.
 \end{amove}
 
+\begin{amove}{Stardew Valley}
+  You can always find food and drink in a natural setting. So long as
+  you're sleeping in the wilderness, you don't need to consume a
+  ration.
+\end{amove}
+
+
 \begin{amove}{Menagerie}
   \moveRequires{Friend to Beasts}
 
@@ -330,12 +322,12 @@
   \move{Defy Danger} rolls associated with that enemy.
 \end{amove}
 
-\begin{amove}{Story of Seasons}
-  When you \move{Make Camp}, you can choose a player in your
-  travelling-party---possibly yourself---and ask them to tell a short
-  story: maybe a tale of past adventures, a family story, or a
-  folktale. If they do, then everyone who listens takes \forward{+1}.
-\end{amove}
+% \begin{amove}{Story of Seasons}
+%   When you \move{Make Camp}, you can choose a player in your
+%   travelling-party---possibly yourself---and ask them to tell a short
+%   story: maybe a tale of past adventures, a family story, or a
+%   folktale. If they do, then everyone who listens takes \forward{+1}.
+% \end{amove}
 
 \vfill\null
 \end{multicols}