From 1caef32f48f37d265e141800319f58260f9500f2 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Fri, 19 Apr 2024 13:54:55 +0200
Subject: [PATCH] refactor arms
---
arms.sty | 3 ++-
main.tex | 21 ++++++++++++++++++++-
stats.sty | 12 ++++++++----
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/arms.sty b/arms.sty
index 5149b987..73956863 100644
--- a/arms.sty
+++ b/arms.sty
@@ -20,6 +20,7 @@
\newcounter{armourWeight}
\newcommand\weaponName{}
+\newcommand\armourName{}
\newcommand\weapon[4][]{%
\setcounter{weaponBonus}{#3}%
@@ -80,7 +81,7 @@
%}
\newcommand\armour[4][]{
- #2% Name
+ \renewcommand\armourName{#2}% Name
\setcounter{armourDR}{#3}%
\setcounter{covering}{#4}%
\setcounter{armourWeight}{#4}%
diff --git a/main.tex b/main.tex
index 56fb1c5a..750ecc66 100644
--- a/main.tex
+++ b/main.tex
@@ -55,7 +55,13 @@
\hrulefill
- Weapon: \weaponName
+ \ifdefempty{\weaponName}{}{%
+ Weapon: \weaponName%
+ }
+
+ \ifdefempty{\armourName}{}{%
+ Armour: \armourName%
+ }
{\scshape
\glsentrytext{ap} \arabic{ap},
@@ -66,15 +72,28 @@
\glsentrytext{dr} \arabic{dr} (\arabic{covering})
\fi%
}
+ \par
+ \hrulefill
+ \par
+ \hrulefill
}
+\npc{\F\Hu}{Alice}
+\statblock{1}{2}{3}%
+ {{-3}{-2}{-1}}%
+ {
+ \setcounter{Wyldcrafting}{1}
+ }
+ {\adrenalinesurge, \mightydraw}
+
\npc{\M\Hu}{Bob}
\statblock{1}{2}{3}%
{{-3}{-2}{-1}}%
{
\setcounter{Academics}{1}
\longsword
+ \partialleather
}
{\adrenalinesurge, \mightydraw}
diff --git a/stats.sty b/stats.sty
index a6809a05..39fc07be 100644
--- a/stats.sty
+++ b/stats.sty
@@ -414,8 +414,12 @@
%% clear: weaponsknack1 and 2,
%%
%
-\newcommand{\mind}[3]{
-\setcounter{Intelligence}{#1}\setcounter{Wits}{#2}\setcounter{Charisma}{#3}
+\newcommand{\body}[3]{%
+ \setcounter{Strength}{#1}\setcounter{Dexterity}{#2}\setcounter{Speed}{#3}%
+}
+
+\newcommand{\mind}[3]{%
+ \setcounter{Intelligence}{#1}\setcounter{Wits}{#2}\setcounter{Charisma}{#3}%
}
\newtoggle{snapCaster}
@@ -639,7 +643,7 @@
\foreach \s in {Air,Earth,Fate,Fire,Water}%
{\ifnum\value{\s}>0 \addtocounter{mp}{3}\fi}
-\begin{tabular}{p{.15\textwidth}>{\raggedright\arraybackslash}p{.75\textwidth}}
+\begin{tabular}{p{.18\textwidth}>{\raggedright\arraybackslash}p{.75\textwidth}}
\hiderowcolors
\iftoggle{verbose}{
@@ -664,7 +668,7 @@
\ifdefempty{\equipment}{}
{
\setcounter{attackXPtotal}{\value{Charisma}}% Must store Charisma while talisman shows spells
- \ent{Equipment} & \equipment, \weaponName \\
+ \ent{Equipment} & \equipment, \weaponName, \armourName \\
}
}%
{}
--
GitLab