From 5bc88446e5b260756af1719b554150a3233bed64 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Fri, 3 Feb 2023 05:05:36 +0100
Subject: [PATCH] reconfigure weapon damage
---
arms.sty | 35 ++++++++++++++++++++---------------
layout.sty | 1 +
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/arms.sty b/arms.sty
index 3179298d..afc783c0 100644
--- a/arms.sty
+++ b/arms.sty
@@ -5,33 +5,38 @@
% When used in creatures, they raise stats.
% When used in the weapons chart, they display stats.
+\newcounter{weaponBonus}
+
\newcommand\weapon[6][]{
- % If the weight is better than the Damage, use the Weight *as* the Damage, then add 1.
- \setcounter{weight}{#5}
+ % The weapon's bonus to hit is equal to its length + weight / 2.
+ \setcounter{weaponBonus}{#3}%
+ \ifnum#5>0%
+ \addtocounter{weaponBonus}{#5}%
+ \fi
+ \roundUp{weaponBonus}
+ \setcounter{damage}{#4}
\ifnum#5>0
- \setcounter{heft}{#5}
- \else
- \setcounter{heft}{1}
+ \addtocounter{damage}{#5}
\fi
- \setcounter{cost}{#3}
- \divide\value{cost} by 2
- \addtocounter{heft}{\value{cost}}
- \ifnum#4>#5
- \setcounter{damage}{#4}
- \else
- \setcounter{damage}{#5}
+ \roundUp{damage}
+ \setcounter{heft}{#3}
+ \addtocounter{heft}{#5}
+ \roundUp{heft}
+ \ifnum\value{heft}<1
+ \setcounter{heft}{1}
\fi
+ \setcounter{weight}{#5}
\setcounter{cost}{#6}
#1
\iftoggle{creatureBox}{
- \addtocounter{att}{#3}
+ \addtocounter{att}{\value{weaponBonus}}
#2\ignorespaces%
}{
#1
#2 &
- \ifnum#3>0 +\fi
- #3 &
+ \ifnum\value{weaponBonus}>0 +\fi
+ \arabic{weaponBonus} &
\ifnum\value{damage}>0 +\fi\arabic{damage}
& \arabic{heft} &
\arabic{weight} &
diff --git a/layout.sty b/layout.sty
index cda9b376..d76fc9a1 100644
--- a/layout.sty
+++ b/layout.sty
@@ -187,6 +187,7 @@ bookmarks=true]%
\stepcounter{#1}
\fi
\divide\value{#1} by 2
+ \addtocounter{#1}{0}% Think this line's pointless? Try removing it and seeing what happens - I dare you.
}
\def\@Repeat#1{%
--
GitLab