From 75404708b7fa033b6b33fbfb57c9f79cdbe4018d Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Mon, 28 Aug 2023 13:31:51 +0200
Subject: [PATCH] give attribute counters full names
---
CS.tex | 20 ++++++------
csCommands.sty | 7 +++++
layout.sty | 2 +-
monsters.sty | 4 +--
reset_cs.tex | 12 ++++----
stats.sty | 82 +++++++++++++++++++++++---------------------------
test.tex | 12 ++++----
7 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/CS.tex b/CS.tex
index 3c09a9e9..84e69a72 100644
--- a/CS.tex
+++ b/CS.tex
@@ -53,12 +53,12 @@
\addtolength{\tabcolsep}{-0.53em}
\begin{tabular}{lcccccccccc}
& \tiny{-4} & \tiny{-3} & \tiny{-2} & \tiny{-1} & \tiny{0} & \tiny{1} & \tiny{2} & \tiny{3} & \tiny{4} \\
- \showAttribute{Strength}{str}
- \showAttribute{Dexterity}{dex}
- \showAttribute{Speed}{spd}
- \showAttribute{Intelligence}{int}
- \showAttribute{Wits}{wts}
- \showAttribute{Charisma}{cha}
+ \showAttribute{Strength}{Strength}
+ \showAttribute{Dexterity}{Dexterity}
+ \showAttribute{Speed}{Speed}
+ \showAttribute{Intelligence}{Intelligence}
+ \showAttribute{Wits}{Wits}
+ \showAttribute{Charisma}{Charisma}
\end{tabular}
}
@@ -199,15 +199,15 @@ circle label/.style = {
&
\iftoggle{examplecharacter}%
{%
- \addtocounter{spd}{3}%
- \sffamily\arabic{spd}%
+ \addtocounter{Speed}{3}%
+ \sffamily\arabic{Speed}%
}%
{\underline{\hspace{2em}}}
&
\iftoggle{examplecharacter}{\sffamily}{}2D6%
\iftoggle{examplecharacter}% Bonus
{%
- \addtocounter{Combat}{\value{dex}}%
+ \addtocounter{Combat}{\value{Dexterity}}%
\addtocounter{Combat}{\value{weaponBonus}}%
\ifnum\value{Combat}=0\else%
\ifnum\value{Combat}>0+\else-\fi%
@@ -217,7 +217,7 @@ circle label/.style = {
{\underline{\hspace{2em}}} &
\iftoggle{examplecharacter}% Damage
{%
- \addtocounter{damage}{\value{str}}%
+ \addtocounter{damage}{\value{Strength}}%
\addtocounter{damage}{4}%
\sffamily\dmg{damage}%
}%
diff --git a/csCommands.sty b/csCommands.sty
index 952ef9d1..638c5673 100644
--- a/csCommands.sty
+++ b/csCommands.sty
@@ -7,6 +7,13 @@
\newcommand\csComments{}
+\newcounter{Strength}
+\newcounter{Dexterity}
+\newcounter{Speed}
+\newcounter{Intelligence}
+\newcounter{Wits}
+\newcounter{Charisma}
+
\newcounter{Academics}
\setcounter{Academics}{0}
\newcounter{Athletics}
diff --git a/layout.sty b/layout.sty
index 1243a2d6..708796b7 100644
--- a/layout.sty
+++ b/layout.sty
@@ -634,7 +634,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
\newcounter{track}
\setcounter{track}{18}
- \newcommand{\tracker}{\center\noindent\iftoggle{examplecharacter}{\iftoggle{bestiarychapter}{}{\ifnum\value{track}=\value{spd}$\Rightarrow$ \fi}}{}\arabic{track}\addtocounter{track}{-1}\vspace{.54cm}
+ \newcommand{\tracker}{\center\noindent\iftoggle{examplecharacter}{\iftoggle{bestiarychapter}{}{\ifnum\value{track}=\value{Speed}$\Rightarrow$ \fi}}{}\arabic{track}\addtocounter{track}{-1}\vspace{.54cm}
}
diff --git a/monsters.sty b/monsters.sty
index 96e0ddc4..d1af797b 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -1024,7 +1024,7 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
{\arabic{r2}}% AGGRESSION
{Projectiles \arabic{r2}, Wyldcrafting~1}% SKILLS
{\acidSpray}% ABILITIES
-{\addtocounter{str}{1}}
+{\addtocounter{Strength}{1}}
}
\newcommand{\nuraspider}[1][\npc{\A\N}{Nura Spider}]{
@@ -1790,7 +1790,7 @@ mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \
}}% SKILLS
{None}% ABILITIES
{
- \setcounter{gold}{\value{age}}\multiply\value{gold} by 3\addtocounter{gold}{\value{int}}\setcounter{sp}{\value{gold}}%
+ \setcounter{gold}{\value{age}}\multiply\value{gold} by 3\addtocounter{gold}{\value{Intelligence}}\setcounter{sp}{\value{gold}}%
\lockedmana{\value{age}}
\knacks{\snapcaster}
}
diff --git a/reset_cs.tex b/reset_cs.tex
index 0052aa9d..c5eb747b 100644
--- a/reset_cs.tex
+++ b/reset_cs.tex
@@ -1,9 +1,9 @@
-\setcounter{str}{0}
-\setcounter{dex}{0}
-\setcounter{spd}{0}
-\setcounter{int}{0}
-\setcounter{wts}{0}
-\setcounter{cha}{0}
+\setcounter{Strength}{0}
+\setcounter{Dexterity}{0}
+\setcounter{Speed}{0}
+\setcounter{Intelligence}{0}
+\setcounter{Wits}{0}
+\setcounter{Charisma}{0}
\setcounter{Academics}{0}
\setcounter{Athletics}{0}
diff --git a/stats.sty b/stats.sty
index b4c3c234..7bcc837e 100644
--- a/stats.sty
+++ b/stats.sty
@@ -230,12 +230,6 @@
%
% Attributes: str, dex, spd, int, wts, cha
% secondary str, dex and spd
-\newcounter{str}
-\newcounter{dex}
-\newcounter{spd}
-\newcounter{int}
-\newcounter{wts}
-\newcounter{cha}
\newcounter{att}
\newcounter{dr}
\newcounter{knacks}
@@ -429,7 +423,7 @@
%%
%
\newcommand{\mind}[3]{
-\setcounter{int}{#1}\setcounter{wts}{#2}\setcounter{cha}{#3}
+\setcounter{Intelligence}{#1}\setcounter{Wits}{#2}\setcounter{Charisma}{#3}
}
%
@@ -438,10 +432,10 @@
\newcommand{\person}[9]{
\settoggle{creatureBox}{true}
\settoggle{mind}{true}
- \setcounter{str}{#1}
+ \setcounter{Strength}{#1}
\setcounter{hp}{#1}
- \setcounter{dex}{#2}
- \setcounter{spd}{#3}
+ \setcounter{Dexterity}{#2}
+ \setcounter{Speed}{#3}
\mind#4
\setcounter{att}{#6}
\renewcommand{\skills}{#7}
@@ -509,11 +503,11 @@
\newcommand{\animal}[9]{
\settoggle{creatureBox}{true}
\settoggle{mind}{false}
- \setcounter{str}{#1}
+ \setcounter{Strength}{#1}
\setcounter{hp}{#1}
- \setcounter{dex}{#2}
- \setcounter{spd}{#3}
- \setcounter{wts}{#4}
+ \setcounter{Dexterity}{#2}
+ \setcounter{Speed}{#3}
+ \setcounter{Wits}{#4}
\setcounter{dr}{#5}
\setcounter{att}{#6}
\setcounter{encumbrance}{0}
@@ -616,10 +610,10 @@
% but that doesn't work with creature stats, so we suppress it here
\hiderowcolors
- Strength & \arabic{str} & Dexterity & \arabic{dex} & Speed & \arabic{spd} \\
+ Strength & \arabic{Strength} & Dexterity & \arabic{Dexterity} & Speed & \arabic{Speed} \\
\iftoggle{mind}{
- Intelligence & \arabic{int} & Wits & \arabic{wts} & Charisma & \arabic{cha} \\}{%
- && Wits & \arabic{wts} \\
+ Intelligence & \arabic{Intelligence} & Wits & \arabic{Wits} & Charisma & \arabic{Charisma} \\}{%
+ && Wits & \arabic{Wits} \\
}
\end{tabularx}
@@ -683,25 +677,25 @@
\iftoggle{verbose}{\hrulefill}{}
\setlength\topsep{0pt}
\setlength\parskip{0pt}
- \iftoggle{debug}{str: \arabic{str}, dex: \arabic{dex}, spd: \arabic{spd}, att: \arabic{att}, damage: \arabic{damage}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}}{}
+ \iftoggle{debug}{str: \arabic{Strength}, dex: \arabic{Dexterity}, spd: \arabic{Speed}, att: \arabic{att}, damage: \arabic{damage}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}}{}
% Stats for allies don't need to show Combat +1 as 'TN 8 to hit', they just need to show '+1'.
\iftoggle{allyCharacter}{}{
\addtocounter{att}{7}
}
-\addtocounter{att}{\value{dex}}
-\ifnum\value{weight}>\value{str}% now to compute encumbrance
- \addtocounter{str}{5}% we can't have negative values affecting results
+\addtocounter{att}{\value{Dexterity}}
+\ifnum\value{weight}>\value{Strength}% now to compute encumbrance
+ \addtocounter{Strength}{5}% we can't have negative values affecting results
\addtocounter{weight}{5}
- \addtocounter{spd}{-\value{weight}}
- \addtocounter{spd}{\value{str}}
- \addtocounter{str}{-5}% now we return strand weight to the original values
+ \addtocounter{Speed}{-\value{weight}}
+ \addtocounter{Speed}{\value{Strength}}
+ \addtocounter{Strength}{-5}% now we return strand weight to the original values
\addtocounter{weight}{-5}
\fi
\begin{center}
\iftoggle{verbose}{\normalsize}{\large}%
- \setcounter{ap}{\value{spd}}
+ \setcounter{ap}{\value{Speed}}
\addtocounter{ap}{3}
\scshape AP \ifnum\value{ap}<1 $\frac{1}{2}$ \else \arabic{ap}\fi%
\ifnumcomp{\value{heft}}{>}{1}{ (AP Cost: \arabic{heft})}{},
@@ -709,7 +703,7 @@
\iftoggle{allyCharacter}{$2D6$\ifnum\value{att}>-1 +\fi}{}%
\arabic{att}%
\setcounter{enc}{\value{att}},%
- \addtocounter{damage}{\value{str}}
+ \addtocounter{damage}{\value{Strength}}
\addtocounter{damage}{4}%
\mbox{Dam \dmg{damage}, }%
\ifnumcomp{\value{dr}}{>}{0}{%
@@ -720,7 +714,7 @@
}{}%
\addtocounter{hp}{6}%
\ifnum\value{mp}>0%
- \addtocounter{mp}{\value{int}}%
+ \addtocounter{mp}{\value{Intelligence}}%
\setcounter{mpFree}{\value{mp}}
\addtocounter{mpFree}{-\value{mpLocked}}%
\fi%
@@ -760,9 +754,9 @@
%%% = Attack (TN) * Dam + max((spd-hef),mp)^2
\setcounter{attackXPtotal}{\value{att}}%
\multiply\value{attackXPtotal} by \value{damage}%
- \addtocounter{spd}{-\value{heft}}%
- \ifnum\value{spd}>\value{mp}%
- \setcounter{enc}{\value{spd}}
+ \addtocounter{Speed}{-\value{heft}}%
+ \ifnum\value{Speed}>\value{mp}%
+ \setcounter{enc}{\value{Speed}}
\else%
\setcounter{enc}{\value{mp}}
\fi%
@@ -783,7 +777,7 @@
\setcounter{xp}{\value{attackXPtotal}}%
\addtocounter{xp}{\value{defenceXPtotal}}%
- \iftoggle{debug}{str: \arabic{str}, dex: \arabic{dex}, spd: \arabic{spd}, att: \arabic{att}, damage: \arabic{damage}, weight: \arabic{weight}, XP Bonus: \arabic{xpbonus}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}, mp: \arabic{mp} Grand Total: \arabic{xp}}{\iftoggle{verbose}{\hrulefill}}
+ \iftoggle{debug}{str: \arabic{Strength}, dex: \arabic{Dexterity}, spd: \arabic{Speed}, att: \arabic{att}, damage: \arabic{damage}, weight: \arabic{weight}, XP Bonus: \arabic{xpbonus}, Attack total: \arabic{attackXPtotal}, Def Total: \arabic{defenceXPtotal}, mp: \arabic{mp} Grand Total: \arabic{xp}}{\iftoggle{verbose}{\hrulefill}}
\iftoggle{examplecharacter}%
{}%
@@ -799,7 +793,7 @@
}%
% if the creature has a mind, print fate points (if any).
\iftoggle{mind}%
- {\addtocounter{fp}{\value{cha}}%
+ {\addtocounter{fp}{\value{Charisma}}%
\ifnum\value{fp}>2\ignorespaces, \arabic{fp}~FP %
\iftoggle{bestiarychapter}%
{}%
@@ -818,7 +812,7 @@
}
\newcommand\undead{%
- \addtocounter{spd}{-1}%
+ \addtocounter{Speed}{-1}%
\renewcommand\abilities{%
Undead%
\ifnum\value{dr}>1%
@@ -832,9 +826,9 @@
\newcommand{\acidSpray}{%
Acidic Spray
\setcounter{track}{4}%
- \addtocounter{track}{\value{spd}}%
+ \addtocounter{track}{\value{Speed}}%
(\dmg{track} Damage,
- \setcounter{track}{\value{dex}}%
+ \setcounter{track}{\value{Dexterity}}%
\addtocounter{track}{8}%
\glsentrytext{tn} \arabic{track} to dodge)%
}
@@ -842,17 +836,17 @@
\newcommand{\acidBody}{%
Acidic Body (inflict
\setcounter{track}{3}%
- \addtocounter{track}{\value{str}}%
+ \addtocounter{track}{\value{Strength}}%
\dmg{track} Damage each turn of grappling)%
}
\newcommand{\gelRegen}{%
- Regeneration (1 HP/ round, max. \setcounter{hp}{\value{str}}\addtocounter{hp}{6}\roundUp{hp} \arabic{hp})%
+ Regeneration (1 HP/ round, max. \setcounter{hp}{\value{Strength}}\addtocounter{hp}{6}\roundUp{hp} \arabic{hp})%
}
\newcommand\gloopy{%
Viscid (on a tie, the attacker \emph{must} inflict Damage, but the weapon sticks into the body,
- \setcounter{track}{\value{str}}%
+ \setcounter{track}{\value{Strength}}%
\addtocounter{track}{7}%
\tn[\arabic{track}] to pull out)%
}
@@ -872,9 +866,9 @@
\newcommand{\flight}{%
Flight %
\setcounter{enc}{\value{dr}}%
- \addtocounter{enc}{\value{str}}%
- \setcounter{track}{\value{dex}}%
- \addtocounter{track}{\value{spd}}%
+ \addtocounter{enc}{\value{Strength}}%
+ \setcounter{track}{\value{Dexterity}}%
+ \addtocounter{track}{\value{Speed}}%
\ifnum\value{enc}>\value{track}%
(can glide, but not fly)
\else%
@@ -889,7 +883,7 @@
\newcommand{\stench}{%
Stench (breathing in demands Str + Wyldcrafting check, \glsentrytext{tn}%
\setcounter{track}{10}%
- \addtocounter{track}{-\value{spd}}%
+ \addtocounter{track}{-\value{Speed}}%
\arabic{track}%
)
}
@@ -897,7 +891,7 @@
\newcommand{\crazyGas}{%
Gas (hallucinations and
\setcounter{track}{4}%
- \addtocounter{track}{\value{str}}%
+ \addtocounter{track}{\value{Strength}}%
\arabic{track} \glspl{fatigue} per round)%
}
@@ -922,7 +916,7 @@
}
\newcommand{\web}{%
- \setcounter{track}{6}\addtocounter{track}{\value{str}}%
+ \setcounter{track}{6}\addtocounter{track}{\value{Strength}}%
Web (Strength + Athletics, TN \arabic{track} to break free as a movement action)%
}
diff --git a/test.tex b/test.tex
index 24c1b374..cc4591c5 100644
--- a/test.tex
+++ b/test.tex
@@ -292,12 +292,12 @@ This section is non-verbose, so only basic stats are shown.
%%%%% Test Character Sheet
-\setcounter{str}{0}
-\setcounter{dex}{-1}
-\setcounter{spd}{0}
-\setcounter{int}{1}
-\setcounter{wts}{0}
-\setcounter{cha}{1}
+\setcounter{Strength}{0}
+\setcounter{Dexterity}{-1}
+\setcounter{Speed}{0}
+\setcounter{Intelligence}{1}
+\setcounter{Wits}{0}
+\setcounter{Charisma}{1}
\renewcommand\concept{Loner}
\renewcommand\race{Human}
--
GitLab