diff --git a/arms.sty b/arms.sty index 3a26c17efcb43413da0c12724d51d9c4b1377344..6952e78a9260441caaf81faa966193bb81a0a299 100644 --- a/arms.sty +++ b/arms.sty @@ -80,7 +80,7 @@ } \newcommand\showArmour[1]{% - #1 \armourName & \arabic{armourDR} & \arabic{covering} & \arabic{armourWeight} + #1 \expandafter\MakeUppercase\armourName & \arabic{armourDR} & \arabic{covering} & \arabic{armourWeight} } \newcommand{\boulder}{\weapon[\addtocounter{armourWeight}{3}]{Boulder}{-3}{5}} @@ -144,30 +144,30 @@ \armour{partial leather}{3}{3}% } -\newcommand{\completeleather}{ +\newcommand{\completeleather}{% \armour{complete leather}{3}{5}% } -\newcommand{\partialchain}{ +\newcommand{\partialchain}{% \armour{partial chain}{4}{3}% } -\newcommand{\completechain}{ +\newcommand{\completechain}{% \armour{complete chain}{4}{5}% } -\newcommand{\partiallisk}{ +\newcommand{\partiallisk}{% \armour{partial lisk-hide}{4}{3}% } -\newcommand{\completelisk}{ +\newcommand{\completelisk}{% \armour{complete lisk-hide}{4}{5}% } -\newcommand{\partialplate}{ +\newcommand{\partialplate}{% \armour{partial plate}{5}{3}% } -\newcommand{\completeplate}{ +\newcommand{\completeplate}{% \armour{complete plate}{5}{5}% } diff --git a/market.sty b/market.sty index b059285dd0c7e5143aab21e8e9ea258492277d3e..01082dc0206f084a6928ab894d7cdd391b67c19c 100644 --- a/market.sty +++ b/market.sty @@ -45,7 +45,7 @@ } \newcommand\showArmourPrice[2]{% - #1\armourName & \arabic{armourDR} & \arabic{covering} & \arabic{armourWeight} & \mkPrice{#2} \\% + #1\expandafter\MakeUppercase\armourName & \arabic{armourDR} & \arabic{covering} & \arabic{armourWeight} & \mkPrice{#2} \\% } \newcommand\rareArmour[3][9]{