Skip to content

Commit

Permalink
restart after in scoresheet
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunava
sunava committed Dec 9, 2024
1 parent 0460654 commit 4a9d048
Showing 1 changed file with 65 additions and 59 deletions.
124 changes: 65 additions & 59 deletions setup/macros_scoresheets.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
% The global number of attempts per test
\newcommand{\attempts}{3}

% The Default Timelimit for the Test
\newcommand{\timelimit}{5}

% Show Special Penalties & Bonuses
\newcommand{\specialPenBonus}{true}

% Sets the total penalty for not showing up
\newcommand{\notattendingpenalty}{500}

Expand Down Expand Up @@ -110,9 +104,7 @@
% arbitrary value (disables autocalc)
% - attempts Integer. Number of attempts for the
% scoresheet (default is \global\attempts)
% - timelimit Integer. Timelimit in minutes
% - continue Not implemented
% - specialpenbonus Boolean. Toggles the "Special Penalties & Bonuses"
% - datarecording Boolean. Toggles the "Data Recording"
% item under Special penalties and standard
% bonuses
Expand Down Expand Up @@ -153,6 +145,55 @@
% description
% #3 description A description for the score mark
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
%
% %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% FROM HERE ON, THERE IS NOTHING TO CHANGE %
Expand Down Expand Up @@ -234,8 +275,6 @@
\vspace{0pt}%
\includegraphics[width=\textwidth]{images/logo_RoboCupAtHome.jpg}%
\end{minipage}\\%


}{
% \end{scoresheet}
\vspace{0.5 em}%
Expand Down Expand Up @@ -283,9 +322,7 @@
/scorelist/.is family, /scorelist,
default/.style={
attempts = \attempts,
timelimit = \timelimit,
continue = true,
specialpenbonus = \specialPenBonus,
datarecording = \dataRecordingBonus,
datarecordingpc = \dataRecordingBonusPercentage,
datarecordingbonus = 0,
Expand All @@ -301,9 +338,7 @@
secondtrycc = \secondTryColumnCaption,
},
attempts/.estore in = \scorelistAttempts,
timelimit/.estore in = \scorelistTimelimit,
continue/.estore in = \scorelistContinue,
specialpenbonus/.estore in = \scorelistSpecialPenBonus,
datarecording/.estore in = \scorelistDataRecording,
datarecordingpc/.estore in = \scorelistDataRecordingPercentage,
datarecordingbonus/.estore in = \scorelistDataRecordingBonus,
Expand All @@ -327,12 +362,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\pgfkeys{/scorelist, default, #1}%

\ifShortScoresheet{
The maximum time for this test is \textbf{\scorelistTimelimit{}:00} minutes.
}{%

}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% init variables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -429,7 +458,7 @@
\newcommand{\scorePerTry}{%
\\%
\ifShortScoresheet{}{%
\ifthenelse{ \scorelistAttempts > 1 }{%
\ifthenelse{ \attempts > 1 }{%
\textbi{Score per try} &%
\textit{\thecurrTestScoreTotalWithoutBonus} &%
\attemptScoreLines{\scorelistAttempts}%
Expand Down Expand Up @@ -524,46 +553,24 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Special penalties & bonuses %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{ \equal{\scorelistSpecialPenBonus}{true} }{
\scoreheading{Special Penalties \& Bonuses}


\scoreheading{Special Penalties \& Bonuses}

% not showing up penalty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\penaltyitem{\notattendingpenalty}{Not attending \ifShortScoresheet{(see sec.~\ref{rule:not_attending})}{}}

% require signal for door opening %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{ \equal{\scorelistStartButton}{true} }{
\penaltyitem{\scorelistStartButtonPenalty}{Using alternative start signal \ifShortScoresheet{(see sec.~\ref{rule:start_signal})}{}}
}{}

% data recording bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{%
\thecurrDataRecordingBonus>0 \AND %
\equal{\scorelistDataRecording}{true}%
}{%
\bonusitem{\thecurrDataRecordingBonus}{Contributing with recorded data ($\frac{\sum gathered~points}{max~points} \times$) \ifShortScoresheet{(see sec.~\ref{rule:datarecording})}{}}%
}{}%

% outstanding performance bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{%
\value{currOutstandingBonus}>0 \AND %
\equal{\scorelistOutstanding}{true}%
}{%
\bonusitem{\thecurrOutstandingBonus}{Outstanding performance~\ifShortScoresheet{(see sec.~\ref{rule:outstanding_performance})}{}}%
}{}%
%
% not showing up penalty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\penaltyitem{\notattendingpenalty}{Not attending \ifShortScoresheet{(see sec.~\ref{rule:not_attending})}{}}

% require signal for door opening %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{ \equal{\scorelistStartButton}{true} }{
\penaltyitem{\scorelistStartButtonPenalty}{Using alternative start signal %\ifShortScoresheet{(see sec.~\ref{rule:start_signal})}
{}}
}{}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Other Items %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifShortScoresheet{}{%
\scoreheading{Recordings}
\scoreitem{0}{Duration (limit: \textbf{\scorelistTimelimit{}:00} minutes)}
}%

% data recording bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{%
\thecurrDataRecordingBonus>0 \AND %
\equal{\scorelistDataRecording}{true}%
}{%
\bonusitem{\thecurrDataRecordingBonus}{Contributing with recorded data ($\frac{\sum gathered~points}{max~points} \times$) \ifShortScoresheet{(see sec.~\ref{rule:datarecording})}{}}%
}{}%

% outstanding performance bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifthenelse{%
Expand All @@ -578,9 +585,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifShortScoresheet{}{%
\scoreheading{Recordings}
\scoreitem{0}{Duration (limit: \textbf{\scorelistTimelimit{}:00} minutes)}
\scoreitem{0}{Restart after (sec)}
}%

% Total score %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\\[-1em]\hline
\scorePerTry
Expand Down

0 comments on commit 4a9d048

Please sign in to comment.