diff --git a/Makefile b/Makefile index 50b353f..339909e 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ $(SENTINEL): cards.sql for card in legs/first/*.tex; do echo $${card%tex}pdf >> $(GENERATED_DIR)/first.list; done for card in legs/second/*.tex; do echo $${card%tex}pdf >> $(GENERATED_DIR)/second.list; done for card in legs/third/*.tex; do echo $${card%tex}pdf >> $(GENERATED_DIR)/third.list; done - mkdir $(DECK_EXPORT_DIRS) + mkdir -p $(DECK_EXPORT_DIRS) touch $@ %.d: %.list @@ -88,6 +88,9 @@ clean: -find outputs -name '*.pdf' -delete -find outputs -name '*].png' -delete -find outputs -name '*.d' -delete + -find legs -name '*.pdf' -delete + -find legs -name '*].png' -delete + -find legs -name '*-raw.png' -delete -find . -name '*.aux' -delete -find . -name '*.log' -delete -rm -rf $(GENERATED_DIR) diff --git a/iditaboard.tex b/iditaboard.tex index 7374bfa..a9276d7 100644 --- a/iditaboard.tex +++ b/iditaboard.tex @@ -271,9 +271,17 @@ \scoped[shift={(\left,\bottom)}]{\drawbackground} -\scoped[shift={(-7.5,3.75)}]{\cardtrackindicator{firstleg}{First Leg}} -\scoped[shift={(1.5,-3.75)},yscale=-1]{\cardtrackindicator{secondleg}{\rotatebox[origin=c]{180}{Second Leg}}} -\scoped[shift={(10.5,3.75)}]{\cardtrackindicator{thirdleg}{Third Leg}} +\scoped[shift={(-10.5,-3.75)},yscale=-1]{\cardtrackindicator{firstleg}{\rotatebox[origin=c]{180}{First Leg}}} +\scoped[shift={(-7.5,3.75)}]{\cardtrackindicator{firstleg}{Second Leg}} +\scoped[shift={(1.5,-3.75)},yscale=-1]{\cardtrackindicator{secondleg}{\rotatebox[origin=c]{180}{Third Leg}}} +\scoped[shift={(4.5,3.75)}]{\cardtrackindicator{secondleg}{Fourth Leg}} +\scoped[shift={(13.5,-3.75)},yscale=-1]{\cardtrackindicator{thirdleg}{\rotatebox[origin=c]{180}{Fifth Leg}}} +\scoped[shift={(16.5,3.75)}]{\cardtrackindicator{thirdleg}{Sixth Leg}} + +\node at (-12, 0) {\includegraphics[width=1cm]{images/icons/legend.png}}; +\node at (-9, 0) {\includegraphics[width=1cm]{images/icons/legend.png}}; +\node at (-6, 0) {\includegraphics[width=1cm]{images/icons/legend.png}}; +\node at (-3, 0) {\includegraphics[width=1cm]{images/icons/legend.png}}; \node at (-12.0,7.5) {\fontsize{24}{24}\bebas Start}; \node at (18.0,-7.5) {\fontsize{24}{24}\bebas End}; diff --git a/iditacard.cls b/iditacard.cls index 3a85f11..f832114 100644 --- a/iditacard.cls +++ b/iditacard.cls @@ -126,16 +126,16 @@ \newcommand{\speed}[1]{\raisebox{-0.1em}{\includegraphics[height=1em]{icons/speed.png}} #1} \newcommand{\move}[1]{\raisebox{-0.1em}{\includegraphics[height=1em,width=2em]{icons/move.png}} #1} -\newcommand{\discardonkill}{Discarded when killed} +\newcommand{\discardonkill}{\mbox{Discarded when killed}} \newcommand{\inplayatstart}{Play when the game starts} -\newcommand{\immortal}{Cannot Die} -\newcommand{\safepass}{Passing does not incur damage} -\newcommand{\passdie}{Dies when passing} -\newcommand{\nohold}{Cannot hold attachments} -\newcommand{\nostarvation}{Remove your \useicon{starve}} -\newcommand{\nohypothermia}{Remove your \useicon{hypo}} -\newcommand{\damage}[1]{Take #1 damage} -\newcommand{\doubledistance}{Double the final distance} +\newcommand{\immortal}{\mbox{Cannot Die}} +\newcommand{\safepass}{\mbox{Passing does not incur} damage} +\newcommand{\passdie}{\mbox{Dies when passing}} +\newcommand{\nohold}{\mbox{Cannot hold attachments}} +\newcommand{\nostarvation}{\mbox{Remove your \useicon{starve}}} +\newcommand{\nohypothermia}{\mbox{Remove your \useicon{hypo}}} +\newcommand{\damage}[1]{\mbox{Take #1 damage}} +\newcommand{\doubledistance}{\mbox{Double the final distance}} \newcommand{\damagetext}{Destroy this card \vskip 0.5em When you discard this card, end your turn immediately} \newcommand{\healthcosts}[1]{\begin{tikzpicture}[x=1in,y=1in]\node [centered, minimum width=0.5in, inner sep=0pt] at (0,0) {\includegraphics[width=0.5in]{icons/deck.png}}; \node [centered, inner sep=0pt] at (0,0) {#1}; \end{tikzpicture}} diff --git a/legs/first/fishing_hole.tex b/legs/first/fishing_hole.tex index 7e7e46d..5ef832e 100644 --- a/legs/first/fishing_hole.tex +++ b/legs/first/fishing_hole.tex @@ -5,9 +5,9 @@ \begin{document} \begin{leg} \legname{Fishing Hole} - \onlegspace{3}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{7}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\daydraw{3}} \end{leg} \end{document} diff --git a/legs/first/hospital.tex b/legs/first/hospital.tex index e085335..4e5fd6a 100644 --- a/legs/first/hospital.tex +++ b/legs/first/hospital.tex @@ -5,8 +5,8 @@ \begin{document} \begin{leg} \legname{Hospital} - \onlegspace{3}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} \onlegspace{7}{\includegraphics[width=1cm]{icons/starve.png}} \legeffect{\freecardtype{personal}} \end{leg} diff --git a/legs/first/new_moon.tex b/legs/first/new_moon.tex index dfcf88c..8944d37 100644 --- a/legs/first/new_moon.tex +++ b/legs/first/new_moon.tex @@ -5,8 +5,8 @@ \begin{document} \begin{leg} \legname{New Moon} - \onlegspace{3}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} \onlegspace{7}{\includegraphics[width=1cm]{icons/hypo.png}} \legeffect{\freecardtype{dog}} \end{leg} diff --git a/legs/first/volcano.tex b/legs/first/volcano.tex index b24c505..40dd88c 100644 --- a/legs/first/volcano.tex +++ b/legs/first/volcano.tex @@ -5,9 +5,9 @@ \begin{document} \begin{leg} \legname{Volcano} - \onlegspace{3}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{7}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\allowednot{\includegraphics[width=1cm]{icons/hypo.png}}} \end{leg} \end{document} diff --git a/legs/second/downhill.tex b/legs/second/downhill.tex index 9ba244a..15a6c5d 100644 --- a/legs/second/downhill.tex +++ b/legs/second/downhill.tex @@ -7,7 +7,6 @@ \legname{Downhill} \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} \legeffect{\speed{3}} diff --git a/legs/second/junkyard.tex b/legs/second/junkyard.tex index cbdc14a..95c00e9 100644 --- a/legs/second/junkyard.tex +++ b/legs/second/junkyard.tex @@ -5,11 +5,10 @@ \begin{document} \begin{leg} \legname{Junkyard} - \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{2}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{4}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{6}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{8}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\healthcosts{-1}} \end{leg} \end{document} diff --git a/legs/second/park.tex b/legs/second/park.tex index e3f0080..90e0f4b 100644 --- a/legs/second/park.tex +++ b/legs/second/park.tex @@ -4,10 +4,9 @@ \begin{document} \begin{leg} - \legname{Junkyard} + \legname{Park} \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} \legeffect{\freecardtype{attachment}} diff --git a/legs/second/solar_farm.tex b/legs/second/solar_farm.tex index d6c5ea8..732c3bd 100644 --- a/legs/second/solar_farm.tex +++ b/legs/second/solar_farm.tex @@ -5,11 +5,10 @@ \begin{document} \begin{leg} \legname{Solar Farm} - \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{2}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{4}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{6}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{8}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\energycosts{-1}} \end{leg} \end{document} diff --git a/legs/second/town.tex b/legs/second/town.tex index 77df679..c966ac2 100644 --- a/legs/second/town.tex +++ b/legs/second/town.tex @@ -6,9 +6,8 @@ \begin{leg} \legname{Town} \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{4}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{6}{\includegraphics[width=1cm]{icons/starve.png}} \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} \legeffect{\freecardtype{food}} \end{leg} diff --git a/legs/second/village.tex b/legs/second/village.tex index c923e35..f4f7f06 100644 --- a/legs/second/village.tex +++ b/legs/second/village.tex @@ -6,9 +6,8 @@ \begin{leg} \legname{Village} \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{4}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{6}{\includegraphics[width=1cm]{icons/hypo.png}} \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} \legeffect{\healthcosts{-1}} \end{leg} diff --git a/legs/third/cliff.tex b/legs/third/cliff.tex index 203b6af..bea7fff 100644 --- a/legs/third/cliff.tex +++ b/legs/third/cliff.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{Cliff} - \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/starve.png}} \legeffect{\allowednot{\cardtypetext{personal}{}}} \end{leg} \end{document} diff --git a/legs/third/exposed.tex b/legs/third/exposed.tex index 5fc8975..7fb9365 100644 --- a/legs/third/exposed.tex +++ b/legs/third/exposed.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{Exposed} - \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/hypo.png}} \legeffect{\daydraw{-3}} \end{leg} \end{document} diff --git a/legs/third/mountainside.tex b/legs/third/mountainside.tex index f9a46bc..8230dd4 100644 --- a/legs/third/mountainside.tex +++ b/legs/third/mountainside.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{Mountainside} - \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/damage.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/starve.png}} \legeffect{\healthcosts{-1}} \end{leg} \end{document} diff --git a/legs/third/river.tex b/legs/third/river.tex index b8fb5af..92a7ca8 100644 --- a/legs/third/river.tex +++ b/legs/third/river.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{River} - \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/hypo.png}} \legeffect{\energycosts{-1}} \end{leg} \end{document} diff --git a/legs/third/swamp.tex b/legs/third/swamp.tex index 98ec385..cd7b09e 100644 --- a/legs/third/swamp.tex +++ b/legs/third/swamp.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{Swamp} - \onlegspace{2}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\speed{-3}} \end{leg} \end{document} diff --git a/legs/third/wasteland.tex b/legs/third/wasteland.tex index ca510b0..abc094a 100644 --- a/legs/third/wasteland.tex +++ b/legs/third/wasteland.tex @@ -5,10 +5,11 @@ \begin{document} \begin{leg} \legname{Wasteland} - \onlegspace{2}{\includegraphics[width=1cm]{icons/hypo.png}} - \onlegspace{4}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{6}{\includegraphics[width=1cm]{icons/starve.png}} - \onlegspace{8}{\includegraphics[width=1cm]{icons/hypo.png}} + \onlegspace{1}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{3}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{5}{\includegraphics[width=1cm]{icons/damage.png}} + \onlegspace{7}{\includegraphics[width=1cm]{icons/starve.png}} + \onlegspace{9}{\includegraphics[width=1cm]{icons/damage.png}} \legeffect{\allowednot{\cardtypetext{food}{}}} \end{leg} \end{document} diff --git a/scripts/generate_cards.sh b/scripts/generate_cards.sh index 7993942..935d382 100755 --- a/scripts/generate_cards.sh +++ b/scripts/generate_cards.sh @@ -23,13 +23,13 @@ while IFS="|" read -r name energy health risk flavour image typename effects dec \\art{$image} EOF - [ "$energy" -gt 0 ] && echo " \\energy{$energy}" >>"$fname" - [ "$health" -gt 0 ] && echo " \\health{$health}" >>"$fname" - [ "$risk" -gt 0 ] && echo " \\risk{$risk}" >>"$fname" + [ "$energy" -gt 0 ] && echo " \\energy{${energy//99/all}}" >>"$fname" + [ "$health" -gt 0 ] && echo " \\health{${health//99/all}}" >>"$fname" + [ "$risk" -gt 0 ] && echo " \\risk{${risk//99/all}}" >>"$fname" cat <>"$fname" \\name{$name} - \\text{$effects} + \\text{${effects//99/all}} \\flava{$flavour} \\type{$typename} \\end{card}