diff --git a/preamble.tex b/preamble.tex index 00ebcdd84f7cf7b1cd0f6d3531362c3023015c5f..a0aa4e644371701841afe5f6cbd070ab870315fc 100644 --- a/preamble.tex +++ b/preamble.tex @@ -18,13 +18,6 @@ \usepackage{multicol} \usepackage{graphicx} \usepackage{etoolbox} -\usepackage{hyperref} -\hypersetup{ - colorlinks=false, - bookmarks=true, - pdfpagemode=FullScreen, - pdfstartpage=1, -} \usepackage{titlesec,titletoc} \usepackage{needspace} \usepackage{tikz} @@ -64,6 +57,7 @@ \setcounter{encnum}{1} \newcommand{\encsymbol}{\ding{168}} \newcommand{\encnum}{\ifnumcomp{\value{encnum}}{=}{1}{$A$}{\arabic{encnum}}\encsymbol\addtocounter{encnum}{1}} +\newcommand{\sqarea}{town} \newcommand{\headingtype}{CHAPTER} @@ -272,10 +266,10 @@ Roll & Result \\ %%%%% Side Quests -\newcommand{\sidequest}[1]{\subsection[#1]{#1 -- \encnum}} -\newcommand{\forest}[1]{\subsubsection{(\ding{168} Forest) #1}} -\newcommand{\town}[2][Town Encounter]{\subsubsection[#1]{(\ding{169} Town) #1}} -\newcommand{\villages}[1]{\subsubsection{(\ding{170} Villages) #1}} +\newcommand{\sidequest}[1]{\resumecontents[\sqarea]\subsection[#1]{#1 -- \encnum}} +\newcommand{\forest}[2]{\resumecontents[forest]\subsubsection[#1 -- #2]{(\ding{168} Forest) #1}} +\newcommand{\town}[2]{\resumecontents[town]\subsubsection[#1 -- #2]{(\ding{169} Town) #1}\stopcontents[town]} +\newcommand{\villages}[2]{\resumecontents[villages]\subsubsection[#1 -- #2]{(\ding{170} Villages) #1}} \newcommand{\lowercollege}[1]{\subsubsection{(\ding{170} Lower College) #1}} \newcommand{\uppercollege}[1]{\subsubsection{(\ding{171} Upper College) #1}}