From d98d7713085e09390274fe7cbfd9b60b26aa3a92 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Thu, 9 Mar 2023 05:12:11 +0100
Subject: [PATCH] formatting

---
 charts.tex  |  80 +++++++++++++++++++++++++++++++++++++++++
 combat.tex  |  21 +++++------
 rules.tex   | 101 ++++++----------------------------------------------
 spheres.tex |  17 +++++----
 4 files changed, 108 insertions(+), 111 deletions(-)

diff --git a/charts.tex b/charts.tex
index f8da207a..aa2cbcf4 100644
--- a/charts.tex
+++ b/charts.tex
@@ -459,6 +459,86 @@
   \end{nametable}
 }
 
+\newcommand{\servicesChart}{
+
+\begin{tcolorbox}[tabularx={XX},title=Services,bottom=10pt,left=3pt,right=3pt,code={\rowcolors{2}{}{gray!10}}]
+
+  \textbf{Apothacary} & 1 \gls{sp} / level of Intelligence + Medicine \\\hline
+
+  Poison cure & 1 \gls{sp} \\
+
+  Poison & 4 \gls{sp} \\\hline
+
+  \textbf{Fence} & \\\hline
+
+  Common item & 20\% of the item's total value \\
+
+  Identifiable valuables & 40\% of the item's total value \\
+
+  Magical item & Varies considerably, 50\% chance the item is refused \\\hline
+
+  \textbf{Boat Trip} & \\\hline
+
+  Popular trading route & $2D6-2$ \gls{sp} (reroll each day) \\
+
+  Standard stream & $3D6$ \gls{cp} \\\hline
+
+  \textbf{Guide} &  150 \gls{cp}/ day \\\hline
+
+  \iftoggle{aif}{
+    Inner villages & 50 \gls{cp} \\
+    Near the \gls{edge} & 5 \gls{sp} \\
+    Beyond the \gls{edge} & 15 \gls{sp} \\
+  }{
+    Dangerous area & 1 \gls{sp} \\
+
+    Uncharted area & 50 \gls{cp} \\
+  }
+  \hline
+  \textbf{Hospitality} &  \\\hline
+
+  Public House & 0 \gls{cp} \\
+
+  Meal & 5 \gls{cp} \\
+
+  Barn with breakfast & 10 \gls{cp} \\
+
+  City Inn & 40 \gls{cp} \\
+
+  Fancy Room & 1 \gls{sp} \\\hline
+
+  \textbf{Minstrel} &  15 \gls{cp}/ performance \\\hline
+
+  Large audience & 500 \gls{cp} \\
+
+  Massive audience & 1 \gls{gp} \\
+
+  Creating a new song & 2 \gls{sp} \\
+
+  Illegal song & 5 \gls{sp} \\\hline
+
+  \textbf{Sellsword} & 10 \gls{sp}/ day \\\hline
+
+  Opponent & \gls{xp}$^3$ \gls{sp} \\
+
+  Illegal Murder & 10 \gls{sp} \\\hline
+
+  \textbf{Tracker} &  5 \glsentrytext{sp} / day \\\hline
+
+  \iftoggle{aif}{
+    Inner villages & 1 \gls{sp} \\
+    Near the \gls{edge} & 10 \gls{sp} \\
+    Beyond the \gls{edge} & 20\gls{sp} \\
+  }{
+    Dangerous area & 2 \gls{sp} \\
+
+    Uncharted area & 4 \gls{sp} \\
+  }\hline
+
+\end{tcolorbox}
+}
+
+
 
 \newcommand\tempoChart{
   \begin{rollchart}
diff --git a/combat.tex b/combat.tex
index 1d1b4551..ae0aa430 100644
--- a/combat.tex
+++ b/combat.tex
@@ -588,15 +588,6 @@ The \gls{tn} to stop the bleeding is always 6 plus the number of \glspl{fatigue}
 \paragraph{Starvation} is another special case.
 \glspl{fatigue} inflicted from starvation are marked with an `$S$', and each of these points only heal once the character has had a full meal.
 
-\iftoggle{verbose}{%
-  \fatiguechart
-}{
-  \begin{figure*}[t!]
-  \footnotesize
-  \fatiguechart
-  \end{figure*}
-}
-
 \subsection{Healing Fatigue}
 \index{Resting}
 
@@ -604,13 +595,19 @@ When the party take any part of the day to rest, they can heal a number of \glsp
 \footnote{The day is divided into four parts. See page \pageref{time}.}
 
 \iftoggle{verbose}{
-
   In most cases, \glspl{fatigue} will heal faster than they accumulate, so tiredness can be safely ignored while are in ideal circumstances.
   However, persistent battles, sprints, and poisons can quickly incapacitate the most seasoned warriors.
-
-
 }{}
 
+\iftoggle{verbose}{%
+  \fatiguechart
+}{
+  \begin{figure*}[t!]
+  \footnotesize
+  \fatiguechart
+  \end{figure*}
+}
+
 \end{multicols}
 
 \startcontents[Manoeuvres]
diff --git a/rules.tex b/rules.tex
index 45dc24ca..343e678e 100644
--- a/rules.tex
+++ b/rules.tex
@@ -447,94 +447,7 @@ Characters cannot carry any item which gives them a -5 Encumbrance rating or hig
 They can, however, drag items with up to a \gls{weightrating} of up to 10 points above their Strength Attribute (rough surfaces can increase the requirement substantially).
 
 \iftoggle{verbose}{
-  \pic{Roch_Hercka/dwarf_encumbrance}{\label{roch:dwarf}}
-}{} 
-
-\iftoggle{verbose}{
-  \input{story/encumbrance.tex}
-}{}
-
-\newcommand{\servicesChart}{
-
-\begin{tcolorbox}[tabularx={XX},title=Services,bottom=10pt,left=3pt,right=3pt,code={\rowcolors{2}{}{gray!10}}]
-
-  \textbf{Apothacary} & 1 \gls{sp} / level of Intelligence + Medicine \\\hline
-
-  Poison cure & 1 \gls{sp} \\
-
-  Poison & 4 \gls{sp} \\\hline
-
-  \textbf{Fence} & \\\hline
-
-  Common item & 20\% of the item's total value \\
-
-  Identifiable valuables & 40\% of the item's total value \\
-
-  Magical item & Varies considerably, 50\% chance the item is refused \\\hline
-
-  \textbf{Boat Trip} & \\\hline
-
-  Popular trading route & $2D6-2$ \gls{sp} (reroll each day) \\
-
-  Standard stream & $3D6$ \gls{cp} \\\hline
-
-  \textbf{Guide} &  150 \gls{cp}/ day \\\hline
-
-  \iftoggle{aif}{
-    Inner villages & 50 \gls{cp} \\
-    Near the \gls{edge} & 5 \gls{sp} \\
-    Beyond the \gls{edge} & 15 \gls{sp} \\
-  }{
-    Dangerous area & 1 \gls{sp} \\
-
-    Uncharted area & 50 \gls{cp} \\
-  }
-  \hline
-  \textbf{Hospitality} &  \\\hline
-
-  Public House & 0 \gls{cp} \\
-
-  Meal & 5 \gls{cp} \\
-
-  Barn with breakfast & 10 \gls{cp} \\
-
-  City Inn & 40 \gls{cp} \\
-
-  Fancy Room & 1 \gls{sp} \\\hline
-
-  \textbf{Minstrel} &  15 \gls{cp}/ performance \\\hline
-
-  Large audience & 500 \gls{cp} \\
-
-  Massive audience & 1 \gls{gp} \\
-
-  Creating a new song & 2 \gls{sp} \\
-
-  Illegal song & 5 \gls{sp} \\\hline
-
-  \textbf{Sellsword} & 10 \gls{sp}/ day \\\hline
-
-  Opponent & \gls{xp}$^3$ \gls{sp} \\
-
-  Illegal Murder & 10 \gls{sp} \\\hline
-
-  \textbf{Tracker} &  5 \glsentrytext{sp} / day \\\hline
-
-  \iftoggle{aif}{
-    Inner villages & 1 \gls{sp} \\
-    Near the \gls{edge} & 10 \gls{sp} \\
-    Beyond the \gls{edge} & 20\gls{sp} \\
-  }{
-    Dangerous area & 2 \gls{sp} \\
-
-    Uncharted area & 4 \gls{sp} \\
-  }\hline
-
-\end{tcolorbox}
-}
-
-\iftoggle{verbose}{
-  \begin{figure*}[t!]
+  \begin{figure*}[b!]
   \servicesChart
   \end{figure*}
 }{
@@ -544,6 +457,14 @@ They can, however, drag items with up to a \gls{weightrating} of up to 10 points
   \end{figure*}
 }
 
+\iftoggle{verbose}{
+  \pic{Roch_Hercka/dwarf_encumbrance}{\label{roch:dwarf}}
+}{} 
+
+\iftoggle{verbose}{
+  \input{story/encumbrance.tex}
+}{}
+
 \iftoggle{verbose}{
   \input{story/equipment.tex}
   \input{story/cc.tex}
@@ -570,6 +491,8 @@ The Failure Margin should indicate just how bad the henchman is, so the \gls{gm}
 \subsection{Cultures \& Exchange Rates}
 \index{Exchange Rates}
 
+Different cultures have different exchange rates -- the elven versions of standard equipment are always artistically engraved and in high demand; the elves also value the coinage and materials of outsiders very little, so they will not part with their items for human or dwarvish gold easily.
+As a result, their -- and other -- culture's items are more expensive than human items.
 \sidebox{
   \begin{rollchart}
     Race & Multiplier \\\hline
@@ -584,8 +507,6 @@ The Failure Margin should indicate just how bad the henchman is, so the \gls{gm}
   \end{rollchart}
 }
 
-Different cultures have different exchange rates -- the elven versions of standard equipment are always artistically engraved and in high demand; the elves also value the coinage and materials of outsiders very little, so they will not part with their items for human or dwarvish gold easily.
-As a result, their -- and other -- culture's items are more expensive than human items.
 
 The costs of the items here are based on the most common race -- humans.
 Other races have a multiplier effect based on how expensive their equipment is.
diff --git a/spheres.tex b/spheres.tex
index fdec8663..7a81df36 100644
--- a/spheres.tex
+++ b/spheres.tex
@@ -876,7 +876,11 @@ When cast over a full area, all are effected, and movement becomes extremely dif
 \begin{multicols}{2}
 
 \iftoggle{verbose}{
-  \widePic{Roch_Hercka/illusion_trogdor}
+  \widePic{Roch_Hercka/flashing_light}
+}{}
+
+\iftoggle{verbose}{
+  \widePic[t]{Roch_Hercka/illusion_trogdor}
 }{}
 
 \noindent
@@ -940,11 +944,6 @@ When cast as a \textit{Wide} spell, a full group can lose the ability to communi
 \spell{Light}{Continuous}{Academics}{Blind enemies and light the way}
 \label{light}
 
-\iftoggle{verbose}{
-
-  \widePic{Roch_Hercka/flashing_light}
-}{}
-
 \noindent
 The mage casts a dim light, about the strength of a torch, which floats around a single point (but never very steadily).
 This light can blind an opponents in the darkness by casting it directly in their face.
@@ -980,6 +979,9 @@ The spell only targets the immediate sight of someone, so the target still casts
 
 \begin{multicols}{2}
 
+\iftoggle{verbose}{
+  \sidepic[40]{Roch_Hercka/conjuration_left}{\label{roch:invocation}}
+}{}
 \noindent
 This is the first choice of spheres for any battle-mage.
 It is designed specifically to destroy targets with balls of lightning and fire.
@@ -1004,9 +1006,6 @@ Larger fires require a \textit{Wide Extinguish} spell.
 \label{fireball}
 \spell{Fireball}{Instant}{Projectiles}{Burn an enemy for $3 + Lv + Int$ Damage}
 
-\iftoggle{verbose}{
-  \sidepic[40]{Roch_Hercka/conjuration_left}{\label{roch:invocation}}
-}{}
 The mage throws out a ball of flaming, crackling ball of energy, which strikes and burns the target.
 The Damage is 3 Damage, plus the spell's Level, plus the caster's Intelligence Bonus.
 
-- 
GitLab