diff --git a/config/monsters.tex b/config/monsters.tex index 00aad80b6f943442d40801a0911d6fcc71bc500d..453bb4d7b6f4acc835b00b878c5a66311db3e451 100644 --- a/config/monsters.tex +++ b/config/monsters.tex @@ -127,7 +127,7 @@ \newcommand{\quarterstaff}{Quarterstaff\addtocounter{str}{1}\addtocounter{spd}{1}\addtocounter{dex}{2}\renewcommand{\weaponknackone}{\addtocounter{spd}{2}}} \newcommand{\greataxe}{Greataxe\addtocounter{str}{3}\addtocounter{spd}{1}\addtocounter{dex}{1}} \newcommand{\greatclub}{Greatclub\addtocounter{str}{4}\addtocounter{spd}{1}\addtocounter{dex}{1}} -\newcommand{\longbow}{Longbow\addtocounter{str}{1}} +\newcommand{\longbow}{Longbow} % ARMOUR \newcommand{\partialleather}{partial leather armour \addtocounter{dr}{3}} @@ -375,7 +375,8 @@ } \newcommand{\web}{ - Web (Strength plus Athletics, TN 9 to break free as a movement action), + \setcounter{random}{7}\addtocounter{random}{\value{str}} + Web (Strength + Athletics, TN \arabic{random} to break free as a movement action), } diff --git a/config/preamble.tex b/config/preamble.tex index e6f602c5db4ca02f739eca38b8a8278dd0e00b4f..1beee15f9ce0bf3bc164100b36b27e9e5e9fe3be 100644 --- a/config/preamble.tex +++ b/config/preamble.tex @@ -26,7 +26,7 @@ \usepackage{colortbl} \usepackage[poster]{tcolorbox} \tcbuselibrary{breakable,raster} -\tcbset{enhanced,drop shadow east,colback=white,breakable,arc=6mm,outer arc=1mm} +\tcbset{before upper=\setlength{\parskip}{1em},enhanced,drop shadow east,colback=white,breakable,arc=6mm,outer arc=1mm} %%%%%%%%%% Section Headers %%%%%%%%%% @@ -53,6 +53,7 @@ %%%%%%%%%% Encounter Numbers \newcounter{encnum} +\newcommand{\lescounter}{\addtocounter{enc}{-1}} \setcounter{encnum}{1} \newcommand{\encsymbol}{\ding{168}} \newcommand{\encnum}{\ifnumcomp{\value{encnum}}{=}{1}{$A$}{\arabic{encnum}}\encsymbol\addtocounter{encnum}{1}} @@ -85,7 +86,7 @@ {8pt} {\Large\bfseries\filcenter} -\titleformat{\subsection}{\needspace{8em}\large\bfseries}{}{1em}{}[\rule{.9\linewidth}{.2pt}] +\titleformat{\subsection}{\needspace{8em}\center\large\bfseries}{}{1em}{}[\rule{.9\linewidth}{.2pt}] % \titleformat{\subsubsection} {\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{} @@ -167,6 +168,12 @@ \newcommand{\sphere}[1]{\setcounter{spelllevel}{0}\renewcommand{\currentsphere}{#1}\index{#1}\section{\currentsphere}} \newcommand{\spelllevel}{\addtocounter{spelllevel}{1}\subsection{\currentsphere~ Level \arabic{spelllevel}}\noindent} \newcommand{\enhancement}[2]{\paragraph{(#1) #2:}} +\newcommand{\magicitem}[7]{\textbf{#1} + + \textit{Spells: #2, }\textit{Casting: #3, }\textit{Type: #4, }\textit{Intelligence #5, }\textit{Wits #6, }\textit{#7 MP}% Type can be 'pocket spell', 'magical item', or 'artefact'. + \vspace{.3em} + +} \newcommand{\spell}[3]{\subsubsection{#1} @@ -177,6 +184,7 @@ % Toggles for knacks %%%%%%%%%%%%%%%%%%%% Environments %%%%%%%%%%%%%%%%%%%% + \newenvironment{boxtext}{\noindent}{} \newenvironment{speechtext}{\begin{quotation}\noindent}{\end{quotation}} @@ -299,5 +307,3 @@ Roll & Result \\ \newcommand{\longline}{\line(1,0){340}\par\vspace{.2cm}} - - diff --git a/config/script.sh b/config/script.sh index 417af6bfc06c5d18135c6f372cc7c0451b8801b6..08ae44f5ac27d9650ffe924b6b5c5f4057e58944 100755 --- a/config/script.sh +++ b/config/script.sh @@ -2,7 +2,7 @@ # Don't run this script unless you know what you're doing. git checkout master -for i in gr aie aif fb +for i in gr aie aif core do git merge $i git checkout $i