adjust market weapons

markets/bailey.tex

@@ -146,7 +146,7 @@ Farmers chat, then barter, and finally refer the buyer to a neighbour.
 
 \ifnumcomp{\value{r4b}}{>}{2}{%
   \renewcommand\npcsymbol{\glsentrysymbol{wrecan}}
-  \begin{nametable}[XXXXc]{At \composeHumanName\ the Smith's}
+  \begin{nametable}[lXXXc]{At \composeHumanName\ the Smith's}
     \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline
     \ifnum\value{r12}>10
       \showArmourPrice{\completechain}{28}%
@@ -174,34 +174,37 @@ Farmers chat, then barter, and finally refer the buyer to a neighbour.
   \fi
 }
 
-\end{multicols}
-
 \ifodd\value{r3}
-  \begin{nametable}[XXXXXc]{\composeHumanName's Weaponry}
+  \begin{nametable}[lXXXc]{\composeHumanName's Weaponry}
 
-  \textbf{Name} & \textbf{Attack} & \textbf{Damage} & \textbf{\Glsfmtshort{ap} Cost} & \textbf{\Glsfmttext{weight}} & \textbf{Cost} \\\hline
+  \textbf{Name} & \textbf{Attack} & \textbf{Damage} & \textbf{\Glsfmttext{weight}} & \textbf{Cost} \\\hline
 
-  \Dagger\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{2} \\
+  \showWeapon{\Dagger} & \mkPrice{2} \\
 
   \ifnum\value{r3}=2%
-    \shortsword\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{9} \\
 
-    \spear\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{7} \\
-    \crapGlaive Glaive & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{4} \\
+    \showWeapon{\shortsword} & \mkPrice{9} \\
+
+    \showWeapon{\spear} & \mkPrice{7} \\
+
+    \showWeapon{\weapon[1]{Glaive}{3}{2}} & \mkPrice{4} \\
   \else
-    \glaive\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{9} \\
+    \showWeapon{\glaive} & \mkPrice{9} \\
 
+    \showWeapon{\roundshield} & \mkPrice{3} \\
   \fi
 
-  \quarterstaff\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{3} \\
+    \showWeapon{\quarterstaff} & \mkPrice{3} \\
 
-  \ifodd\value{r3b}\crapLongsword\else\longsword\fi Longsword & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{11} \\
+    \showWeapon{\weapon[1]{Longsword}{2}{2}} & \mkPrice{9} \\
 
   \ifodd\value{r4b}%
-    \buckler\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{3} \\
+    \showWeapon{\buckler} & \mkPrice{3} \\
   \fi
 
   \end{nametable}
 \fi
 
+\end{multicols}
+
 \stepcounter{diceNo}

markets/town.tex

@@ -264,17 +264,23 @@ The item requires one \glsfmttext{interval} to speak to everyone along the way.}
 \end{multicols}
 
 \renewcommand\npcsymbol{\glsentrysymbol{paik}}
-\begin{nametable}[XXXXXX]{\Gls{sunGuard} Arms Sales}
+\begin{nametable}[XXXXX]{\Gls{sunGuard} Arms Sales}
 
-  \textbf{Name} & \textbf{Attack Bonus} & \textbf{Damage Bonus} & \textbf{\Glsfmtshort{ap} Cost} & \textbf{Weight} & \textbf{Cost} \\\hline
+  \textbf{Name} & \textbf{Attack Bonus} & \textbf{Damage Bonus} & \textbf{Weight} & \textbf{Cost} \\\hline
 
-  \Dagger\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{4} \\
+  \showWeapon{\Dagger} & \mkPrice{4} \\
 
-  \shortsword\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{9} \\
+  \showWeapon{\glaive} & \mkPrice{10} \\
 
-  \spear\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{7} \\
+  \showWeapon{\greataxe} & \mkPrice{9} \\
 
-  \longsword\weaponName & \arabic{weaponBonus} & \arabic{weaponDamage} & \arabic{heft} & \arabic{weaponWeight} & \mkPrice{13} \\
+  \showWeapon{\greatsword} & \mkPrice{15} \\
+
+  \showWeapon{\shortsword} & \mkPrice{9} \\
+
+  \showWeapon{\spear} & \mkPrice{7} \\
+
+  \showWeapon{\longsword} & \mkPrice{13} \\
 
 \end{nametable}