From ddb9b8350304c781db5691c752e88f6db989b233 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Fri, 19 Jan 2024 22:25:20 +0100
Subject: [PATCH] reformat shields
---
arms.sty | 26 +++++++++++++-------------
monsters.sty | 8 ++++----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arms.sty b/arms.sty
index 41ba417f..785946ba 100644
--- a/arms.sty
+++ b/arms.sty
@@ -45,17 +45,17 @@
% Shields work much like weapons, except that their Bonus is high, their initiative cost is low, but their attack is poor.
-\newcommand\shield[3][]{
- \setcounter{shieldBonus}{#3}
- \addtocounter{shieldBonus}{2}
- \setcounter{shieldWeight}{#3}
- \setcounter{shieldInit}{#3}
- \stepcounter{shieldInit}
- \setcounter{cost}{87}
- #1
+\newcommand\shield[3][]{%
+ \setcounter{shieldBonus}{#3}%
+ \addtocounter{shieldBonus}{2}%
+ \setcounter{shieldWeight}{#3}%
+ \setcounter{shieldInit}{#3}%
+ \stepcounter{shieldInit}%
+ \setcounter{cost}{87}%
+ #1%
\iftoggle{creatureBox}%
- {#2 shield (+\arabic{shieldBonus}/ \arabic{shieldInit})}{
- #2 Shield &
+ {#2 shield (+\arabic{shieldBonus}/ \arabic{shieldInit})}{%
+ \MakeUppercase#2 Shield &%
+\arabic{shieldBonus} &
\arabic{shieldInit} &
\arabic{shieldWeight}
@@ -121,9 +121,9 @@
\newcommand{\woodaxe}{\weapon[\addtocounter{heft}{1}]{Wood Axe}{1}{2}}
% SHIELDS
-\newcommand{\bucklar}{\shield{Bucklar}{0}}
-\newcommand{\roundshield}{\shield{Round}{1}}
-\newcommand{\kiteshield}{\shield{Kite}{2}}
+\newcommand{\bucklar}{\shield{bucklar}{0}}
+\newcommand{\roundshield}{\shield{round}{1}}
+\newcommand{\kiteshield}{\shield{kite}{2}}
% RANGED WEAPONS
\newcommand{\longbow}{Longbow}
diff --git a/monsters.sty b/monsters.sty
index ad1a8897..72c31087 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -872,10 +872,10 @@ Academics~1, \ifodd\value{r12} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\va
\partialleather%
\else%
\partialchain%
-\fi, %
-\ifodd\value{r4}
- \roundshield,
-\fi
+\fi,%
+\ifodd\value{r4}%
+ \roundshield, %
+\fi%
\ifnum\value{enc}=3\lootMedium\else\lootSmall\fi}% EQUIPMENT
{
\ifodd\value{r3}%
--
GitLab