diff --git a/main.tex b/main.tex index 8bfc6718b120bfae75ea8ee4f47a7253b9385f38..741852dd9b448e2b0ebdf3458e177abe10e68f46 100644 --- a/main.tex +++ b/main.tex @@ -130,28 +130,31 @@ bottom=10pt, ] \creaturestats - \showSkills - \par + \begin{tabularx}{\linewidth}{lX} + \ent{Skills} & \showSkills \\ \ifnum\value{mp}>0% - \noindent\textbf{Spheres}: + \ent{Spheres} & \foreach \s in {Air,Earth,Fate,Fire,Water}% {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi} + \\ \fi - \par \ifnum\value{knacks}>0 - \textbf{Knacks}: \showKnacks + \ent{Knacks} & \showKnacks \\ \fi \ifdefempty{\Abilities}{}{% - \noindent\textbf{Abilities}: \Abilities + \ent{Abilities} & \Abilities \\ } - \noindent\textbf{Equipment}: - \ifdefempty{\weaponName}{}{% - \weaponName, % + \ifdefempty{\equipment}{}{% + \ent{Equipment} & + \ifdefempty{\weaponName}{}{% + \weaponName, % + }% + \ifdefempty{\armourName}{}{% + \armourName, % + }% + \equipment. }% - \ifdefempty{\armourName}{}{% - \armourName, % - }% - \equipment% + \end{tabularx} \tcblower%%%%%%%%%%%%%%%%%%%% \derivedstats% \end{tcolorbox} @@ -175,27 +178,27 @@ } \newcommand\Animal[6]{ - \traits{#1}% - {#2}% - {{-6}{#3}{-6}}% - { - #4 - } - {#5} - {}% EQUIPMENT - {#6}% ABILITIES + \statblock{ + \traits{#1}% + {#2}% + {{-6}{#3}{-6}}% + { + #4 + } + {#5} + {}% EQUIPMENT + {#6}% ABILITIES + } } -\statblock{ - \Animal{{\T[3]\A}{Moggie}}% - {{2}{1}{3}}% BODY - {2}% WITS - { - \setcounter{Stealth}{3} - }% - {}% - {\quadraped}% ABILITIES -} +\Animal{{\T[3]\A}{Moggie}}% + {{2}{1}{3}}% BODY + {2}% WITS + { + \setcounter{Stealth}{3} + }% + {}% + {\quadraped\mutation{r4}}% ABILITIES \showChar{ \traits{{\F\Hu}{Alice}}% diff --git a/stats.sty b/stats.sty index 936c7dba87fa30f20de96f6ef8e51073c1afc77d..b592fac30d716bccfd78e974192ef3c935deea21 100644 --- a/stats.sty +++ b/stats.sty @@ -77,7 +77,13 @@ \newcommand{\test}{} \newcommand{\skills}{} \newcommand{\equipment}{} +\newcommand{\abilities}{} +\newcommand{\Abilities}{} +\newcommand{\addAbility}[1]{\edef\Abilities{\Abilities{}#1, }} +\newcommand{\Equipment}{} +\newcommand{\addEquipment}[1]{\edef\Equipment{\Equipment{}#1, }} \newcommand{\mods}{} + \newcommand\showCR{} \newcommand\absNum[1]{\ifnum\value{#1}>-1+\fi\arabic{#1}} @@ -910,11 +916,6 @@ %%%%%%%%%%%%%%%%%%%% Creature Abilities -\newcommand{\abilities}{} - -\newcommand{\Abilities}{} - -\newcommand{\addAbility}[1]{\edef\Abilities{\Abilities{}#1, }} \newcommand\hide[1]{% \ifnum\value{dr}>#1%