reverted to master

RoboCupAtHome · Dec 9, 2024 · 769f415 · 769f415
1 parent 2570dd5
commit 769f415
Showing 1 changed file with 52 additions and 28 deletions.
diff --git a/setup/macros_scoresheets.tex b/setup/macros_scoresheets.tex
@@ -25,6 +25,12 @@
 % 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}
 
@@ -104,7 +110,9 @@
 %                        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
@@ -145,7 +153,6 @@
 %                   description
 %   #3 description  A description for the score mark
 %
-%
 % %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                  %
 % FROM HERE ON, THERE IS NOTHING TO CHANGE                         %
@@ -227,6 +234,8 @@
 		\vspace{0pt}%
 		\includegraphics[width=\textwidth]{images/logo_RoboCupAtHome.jpg}%
 	\end{minipage}\\%
+
+
 }{
 % \end{scoresheet}
 	\vspace{0.5 em}%
@@ -274,7 +283,9 @@
 	/scorelist/.is family, /scorelist,
 	default/.style={
 		attempts = \attempts,
+		timelimit = \timelimit,
 		continue = true,
+		specialpenbonus = \specialPenBonus,
 		datarecording = \dataRecordingBonus,
 		datarecordingpc = \dataRecordingBonusPercentage,
 		datarecordingbonus = 0,
@@ -290,7 +301,9 @@
 		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,
@@ -314,6 +327,12 @@
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\pgfkeys{/scorelist, default, #1}%
 
+	\ifShortScoresheet{
+		The maximum time for this test is \textbf{\scorelistTimelimit{}:00} minutes.
+	}{%
+
+	}
+
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% init variables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -410,7 +429,7 @@
 	\newcommand{\scorePerTry}{%
 		\\%
 		\ifShortScoresheet{}{%
-			\ifthenelse{ \attempts > 1 }{%
+			\ifthenelse{ \scorelistAttempts > 1 }{%
 				\textbi{Score per try} &%
 				\textit{\thecurrTestScoreTotalWithoutBonus} &%
 				\attemptScoreLines{\scorelistAttempts}%
@@ -493,8 +512,6 @@
 			\thecurrTestScoreTotal + \thecurrOutstandingBonus}%
 	}{}%
 	% data recording bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
 	\ifthenelse{\equal{\scorelistDataRecording}{true}}{%
 		\ifthenelse{ \equal{\thecurrDataRecordingBonus}{0} }{%
 			\setcounter{currDataRecordingBonus}{ \thecurrTestScore*\scorelistDataRecordingPercentage/100 }%
@@ -507,40 +524,47 @@
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% Special penalties & bonuses %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	\scoreheading{Special Penalties \& Bonuses}
+	\ifthenelse{ \equal{\scorelistSpecialPenBonus}{true} }{
 
-	% not showing up penalty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	\penaltyitem{\notattendingpenalty}{Not attending \ifShortScoresheet{(see sec.~\ref{rule:not_attending})}{}}
+
+		\scoreheading{Special Penalties \& Bonuses}
 
-	% require signal for door opening %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	\ifthenelse{ \equal{\scorelistStartButton}{true} }{
-	  \penaltyitem{\scorelistStartButtonPenalty}{Using alternative start signal %\ifShortScoresheet{(see sec.~\ref{rule:start_signal})}
-	  {}}
-	}{}
+		% not showing up penalty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+		\penaltyitem{\notattendingpenalty}{Not attending \ifShortScoresheet{(see sec.~\ref{rule:not_attending})}{}}
 
-	% 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})}{}}%
-	}{}%
+		% 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})}{}}%
+		}{}%
+		%
+
+	}{}
 
-	% outstanding performance bonus %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	\ifthenelse{%
-		\value{currOutstandingBonus}>0 \AND %
-		\equal{\scorelistOutstanding}{true}%
-	}{%
-		\bonusitem{\thecurrOutstandingBonus}{Outstanding performance~\ifShortScoresheet{(see sec.~\ref{rule:outstanding_performance})}{}}%
-	}{}%
-	%
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% Other Items %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\ifShortScoresheet{}{%
 		\scoreheading{Recordings}
-		\scoreitem{0}{Restart after (sec)}
+		\scoreitem{0}{Duration (limit: \textbf{\scorelistTimelimit{}:00} minutes)}
 	}%
+
+
 	% Total score %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\\[-1em]\hline
 	\scorePerTry