diff --git a/market.sty b/market.sty index e7ffa39e19d1c128afb9e0273ecb6ffea76f93ac..09e759af8189b5d4b97eefdb5af1215028bb8d3e 100644 --- a/market.sty +++ b/market.sty @@ -1,25 +1,25 @@ \newcommand\mkPrice[2][sp]{% \randomize% - \setcounter{track}{#2}% - \ifnum\value{track}<7% + \setcounter{gold}{#2}% + \ifnum\value{gold}<7% \ifnum\value{temperature}=0% - \addtocounter{track}{3} + \addtocounter{gold}{3} \fi% \else% - \addtocounter{track}{\value{rn3t3}}% - \ifnum\value{track}<14% - \addtocounter{track}{\value{r3b}}% - \addtocounter{track}{\value{rn1t2}}% + \addtocounter{gold}{\value{rn3t3}}% + \ifnum\value{gold}<14% + \addtocounter{gold}{\value{r3b}}% + \addtocounter{gold}{\value{rn1t2}}% \else% - \ifnum\value{track}<34% - \addtocounter{track}{\value{r4t6}}% + \ifnum\value{gold}<34% + \addtocounter{gold}{\value{r4t6}}% \else% - \addtocounter{track}{\value{r12}}% + \addtocounter{gold}{\value{r12}}% \fi% \fi% \fi% - \ifnum0<\value{track}% - \arabic{track}~\glspl{#1}% + \ifnum0<\value{gold}% + \arabic{gold}~\glspl{#1}% \else% \textit{free}! \fi% diff --git a/markets/town.tex b/markets/town.tex index 00b5b8425d86d6b615dd1f45044e2775cceb1718..b18dbc6c191743cd259576dadffcecf53e55d4dd 100644 --- a/markets/town.tex +++ b/markets/town.tex @@ -19,6 +19,9 @@ The item requires one \glsfmttext{interval} to speak to everyone along the way.} \marketItem[cp]{Sewing equipment}{0}{5} \marketItem{Rope, 50'}{1}{2} \rareMarketItem[10]{Silk rope, 50'}{0}{8}% + \rareMarketItem[7]{Green hat}{0}{4}% + \rareMarketItem[8]{Orange hat}{0}{5}% + \rareMarketItem[9]{Purple hat}{0}{7}% \marketItem[cp]{Bandages}{0}{2} \ifnum\value{temperature}=0 \marketItem[cp]{Salty \rations}{1}{5} @@ -93,21 +96,6 @@ The item requires one \glsfmttext{interval} to speak to everyone along the way.} \end{nametable} -\renewcommand\npcsymbol{\flourish} -\begin{nametable}[Lcc]{At the Docks} - - \textbf{Items} & \textbf{\Glsentrytext{weight}} & \textbf{Cost} \\\hline - \footnotesize Fake \glsfmtplural{fodder} town-pass\footnotemark[1] & 0 & \mkPrice{4} \\ - \rareMarketItem{\footnotesize Air \Glsentrytext{ingredient} (\glsentrytext{griffin} wings)\footnotemark[1]}{1}{13}% - \rareMarketItem{\footnotesize Fire \Glsentrytext{ingredient} (bear's heart)\ifodd\value{r3}\footnotemark[1]\else\footnotemark[4]\fi}{1}{13} % - \ifnum\value{temperature}=0\rareMarketItem{\footnotesize Earth \Glsentrytext{ingredient} (\glsentrytext{basilisk} hide)\footnotemark[1]}{1}{13}\fi % - \rareMarketItem{\footnotesize Water \Glsentrytext{ingredient} (\glsentrytext{woodspy} beak)\ifodd\value{r3b}\footnotemark[1]\else\footnotemark[4]\fi}{1}{13} % - \rareMarketItem{\footnotesize Fate \Glsentrytext{ingredient} (\ifnum\value{temperature}=0 human blood from the \glsentrytext{court}\else brown ooze\fi)\footnotemark[1]}{1}{14} - - \footnotesize Lock-pick set\footnotemark[1] & 1 & \mkPrice{10} \\ - -\end{nametable} - \renewcommand\npcsymbol{\glsentrysymbol{yonder}} \begin{nametable}[Lcc]{At the \glsentrytext{templeOfCuriosity}} @@ -294,6 +282,21 @@ The item requires one \glsfmttext{interval} to speak to everyone along the way.} \showArmourPrice{\partialchain}{14}% \end{nametable} +\renewcommand\npcsymbol{\flourish} +\begin{nametable}[Lcc]{At the Docks} + + \textbf{Items} & \textbf{\Glsentrytext{weight}} & \textbf{Cost} \\\hline + Fake \glsfmtplural{fodder} town-pass\footnotemark[1] & 0 & \mkPrice{4} \\ + \rareMarketItem{Air \Glsentrytext{ingredient} (\glsentrytext{griffin} wings)\footnotemark[1]}{1}{13}% + \rareMarketItem{Fire \Glsentrytext{ingredient} (bear's heart)\ifodd\value{r3}\footnotemark[1]\else\footnotemark[4]\fi}{1}{13} % + \ifnum\value{temperature}=0\rareMarketItem{Earth \Glsentrytext{ingredient} (\glsentrytext{basilisk} hide)\footnotemark[1]}{1}{13}\fi % + \rareMarketItem{Water \Glsentrytext{ingredient} (\glsentrytext{woodspy} beak)\ifodd\value{r3b}\footnotemark[1]\else\footnotemark[4]\fi}{1}{13} % + \rareMarketItem{Fate \Glsentrytext{ingredient} (\ifnum\value{temperature}=0 human blood from the \glsentrytext{court}\else brown ooze\fi)\footnotemark[1]}{1}{14} + + Lock-pick set\footnotemark[1] & 1 & \mkPrice{10} \\ + +\end{nametable} + \renewcommand\npcsymbol{\glsentrysymbol{wrecan}} \begin{nametable}[Lcccc]{At the Tanner's} \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{\glsentrytext{covering}} & \textbf{Weight} & \textbf{Cost} \\\hline