Skip to content

Commit

Permalink
reworking of game mechanics together with tasks and figures
Browse files Browse the repository at this point in the history
  • Loading branch information
kaat0 committed Sep 16, 2019
1 parent d9da5ff commit a4b5c5d
Show file tree
Hide file tree
Showing 43 changed files with 1,022 additions and 289 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
edugame-rail-traffic-flow
======

Version 0.7
------
reworking of game mechanics together with tasks and figures


Version 0.6.1
------
extended tasks for routes
Expand Down
4 changes: 4 additions & 0 deletions backmatter/versionhistory.tex
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,8 @@
\IfLanguage{ngerman}{Aufgaben für Fahrstraßen erweitert}
\IfLanguage{english}{Extended tasks for routes}
}
\vhEntry{0.7}{2019-09-09}{MS|LP}{
\IfLanguage{ngerman}{Spielmechanik mit Aufgaben und Abbildungen überarbeitet}
\IfLanguage{english}{reworking of game mechanics together with tasks and figures}
}
\end{versionhistory}
Binary file added figures/challenge1_setup.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions figures/challenge1_setup.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%!TEX TS-program = pdflatexmk

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\documentclass[tikz,border=2,preview=true]{standalone}

\usepackage[prefix=]{xcolor-solarized}
\usepackage[main=english,ngerman]{babel}
\usepackage{iflang} % needs babel
\newcommand{\IfLanguage}[2]{\IfLanguageName{#1}{#2}{}}
\usepackage{lmodern,microtype,mathptmx,courier}

\begin{document}
\begin{tikzpicture}[font=\sffamily]
\input{challenge1_setup.tikz}
\end{tikzpicture}
\end{document}
54 changes: 54 additions & 0 deletions figures/challenge1_setup.tikz
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
%!TEX TS-program = pdflatexmk
%!TEX root = challenge1_setup.tex

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\begin{scope}
\coordinate (base) at (0,0);
\draw[dotted] ([shift={(base)}] 0,0) rectangle ++(1,0.5);
\foreach \x in {1,...,4}
\draw ([shift={(base)}] \x,0) rectangle ++(1,0.5);
\node at ([shift={(base)}] 1.5,0.25) {-2};
\node at ([shift={(base)}] 2.5,0.25) {-1};
\node at ([shift={(base)}] 3.5,0.25) {0};
\node at ([shift={(base)}] 4.5,0.25) {1};
\draw ([shift={(base)}] 1,1.1) -- ++(0,-0.4) -- ++ (3,0) -- ++(0,0.4);
\draw ([shift={(base)}] 1,0.8) -- ++ (3,0) node [above,midway] {
\IfLanguage{english}{platform A}
\IfLanguage{ngerman}{Bahnsteig A}
};
\draw[dotted] ([shift={(base)}] 5,0) rectangle ++(1,0.5);

\draw[|<->|,>=latex,shorten >=2,shorten <=2] ([shift={(base)}] 4,0.85) -- ++(3,0) node[midway,fill=white] {12};

\foreach \x in {6,...,10}
\draw ([shift={(base)}] \x,0) rectangle ++(1,0.5);
\node at ([shift={(base)}] 6.5,0.25) {12};
\node at ([shift={(base)}] 7.5,0.25) {13};
\node at ([shift={(base)}] 8.5,0.25) {14};
\node at ([shift={(base)}] 9.5,0.25) {15};
\node at ([shift={(base)}] 10.5,0.25) {16};
\draw ([shift={(base)}] 7,1.1) -- ++(0,-0.4) -- ++ (3,0) -- ++(0,0.4);
\draw ([shift={(base)}] 7,0.8) -- ++ (3,0) node [above,midway] {
\IfLanguage{english}{platform B}
\IfLanguage{ngerman}{Bahnsteig B}
};
\draw[dotted] ([shift={(base)}] 11,0) rectangle ++(1,0.5);

\draw[|<->|,>=latex,shorten >=2,shorten <=2] ([shift={(base)}] 10,0.85) -- ++(3,0) node[midway,fill=white] {21};

\foreach \x in {12,...,15}
\draw ([shift={(base)}] \x,0) rectangle ++(1,0.5);
\node at ([shift={(base)}] 12.5,0.25) {36};
\node at ([shift={(base)}] 13.5,0.25) {37};
\node at ([shift={(base)}] 14.5,0.25) {38};
\node at ([shift={(base)}] 15.5,0.25) {39};
\draw ([shift={(base)}] 13,1.1) -- ++(0,-0.4) -- ++ (3,0) -- ++(0,0.4);
\draw ([shift={(base)}] 13,0.8) -- ++ (3,0) node [above,midway] {
\IfLanguage{english}{platform C}
\IfLanguage{ngerman}{Bahnsteig C}
};
\draw[dotted] ([shift={(base)}] 16,0) rectangle ++(1,0.5);
% \draw[line width=1pt, fill=white] ([shift={(base)}] 3.9,0.25) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train
\end{scope}
47 changes: 47 additions & 0 deletions figures/challenge3_layout2.tikz
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%!TEX TS-program = pdflatexmk
%!TEX root = ../material/route_locking_matrix.tex

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\begin{scope}
\path[draw, line width=2pt] ( 0,0) -- ++(17,0);
\path[draw, line width=2pt] ( 4,0) -- ++(1,1) -- ++(7,0) -- ++(1,-1);
\path[draw, line width=2pt] (11,1) -- ++(1,1) -- ++(1,0);
\path[draw, line width=1pt, fill] (4,0) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker
\node[below] at (4,0) {\footnotesize W1};
\path[draw, line width=1pt, fill] (11,1) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker
\node[above] at (10.8,1) {\footnotesize W2};
\path[draw, line width=1pt, fill] (13,0) -- ++(-0.4,0.4) -- ++(0,-0.4); % turnout marker
\node[above] at (13.2,0) {\footnotesize W3};

\draw[line width=1pt] (2,0) -- ++(0,-0.3) -- ++(0.5,0);
\draw[line width=1pt] (2.65,-0.3) circle (0.15cm);
\node[left] at (2,-0.3) {\footnotesize A};

\draw[line width=1pt] (7,0) -- ++(0,0.3) -- ++(-0.5,0);
\draw[line width=1pt] (6.35,0.3) circle (0.15cm);
\node[right] at (7,0.3) {\footnotesize P1};

\draw[line width=1pt] (7,1) -- ++(0,0.3) -- ++(-0.5,0);
\draw[line width=1pt] (6.35,1.3) circle (0.15cm);
\node[right] at (7,1.3) {\footnotesize P2};

\draw[line width=1pt] (10.5,1) -- ++(0,-0.3) -- ++(0.5,0);
\draw[line width=1pt] (11.15,0.7) circle (0.15cm);
\node[left] at (10.5,0.7) {\footnotesize N2};

\draw[line width=1pt] (12,0) -- ++(0,-0.3) -- ++(0.5,0);
\draw[line width=1pt] (12.65,-0.3) circle (0.15cm);
\node[left] at (12,-0.3) {\footnotesize N1};

\draw[line width=1pt] (15,0) -- ++(0,0.3) -- ++(-0.5,0);
\draw[line width=1pt] (14.35,0.3) circle (0.15cm);
\node[right] at (15,0.3) {\footnotesize F};

\node[fill=white] at (9,0) {1};
\node[fill=white] at (9,1) {2};

\node at (-1,0) {links};
\node at (18,0) {rechts};
\end{scope}
Binary file added figures/challenge3_setup1.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions figures/challenge3_setup1.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%!TEX TS-program = pdflatexmk

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\documentclass[tikz,border=2,preview=true]{standalone}

\usepackage[prefix=]{xcolor-solarized}
\usepackage[main=english,ngerman]{babel}
\usepackage{iflang} % needs babel
\newcommand{\IfLanguage}[2]{\IfLanguageName{#1}{#2}{}}
\usepackage{lmodern,microtype,mathptmx,courier}

\begin{document}
\begin{tikzpicture}[font=\sffamily]
\input{challenge3_setup1.tikz}
\end{tikzpicture}
\end{document}
43 changes: 35 additions & 8 deletions figures/challenge3_setup1.tikz
Original file line number Diff line number Diff line change
@@ -1,17 +1,44 @@
%!TEX TS-program = pdflatexmk
%!TEX root = challenge3_setup1.tex

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\begin{scope}
\coordinate (base) at (0,0);
\path[draw, line width=2pt] ( 0,0) -- ++(19,0);
\path[draw, line width=2pt] ( 0,1) -- ++(1,0) -- ++(1,-1);
\path[draw, line width=1pt,fill] (2,0) -- ++(-0.4,0.4) -- ++(0,-0.4); % turnout marker
\path[draw, line width=2pt] (17,0) -- ++(1,1) -- ++(1,0);
\path[draw, line width=1pt,fill] (17,0) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker
\draw[line width=1pt, fill=white] ([shift={(base)}] 0.9,0.25) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train
\draw[line width=1pt, fill=white] ([shift={(base)}] 0.9,1.25) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train

\draw ([shift={(base)}] 1,0) rectangle ++(1,0.5);
\draw[line width=1pt] ([shift={(base)}] 1,0) -- ++(0,-0.2) -- ++(0.5,0);
\draw[line width=1pt] ([shift={(base)}] 1.65,-0.2) circle (0.15cm);

\draw ([shift={(base)}] 1,1) rectangle ++(1,0.5);
\draw[line width=1pt] ([shift={(base)}] 1,1) -- ++(0,-0.2) -- ++(0.5,0);
\draw[line width=1pt] ([shift={(base)}] 1.65,0.8) circle (0.15cm);

\draw ([shift={(base)}] 2,0) -- ++(2,0) -- ++(0,0.5) -- ++(-1.5,1) -- ++(-0.5,0) -- cycle;
\node at ([shift={(base)}] 3,0.5) {
\IfLanguage{english}{turnout}
\IfLanguage{ngerman}{Weiche}
};

\draw ([shift={(base)}] 4,0) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 5,0) rectangle ++(1,0.5);
\draw[|<->|,>=latex] ([shift={(base)}] 4,0.85) -- ++(3,0) node[midway,fill=white] {25};
\draw ([shift={(base)}] 6,0) rectangle ++(1,0.5);

\draw ([shift={(base)}] 9,0) -- ++(-2,0) -- ++(0,0.5) -- ++(1.5,1) -- ++(0.5,0) -- cycle;
\node at ([shift={(base)}] 8,0.5) {
\IfLanguage{english}{turnout}
\IfLanguage{ngerman}{Weiche}
};

\draw ([shift={(base)}] 9,0) rectangle ++(1,0.5);
\draw ([shift={(base)}] 9,1) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 10,0) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 10,1) rectangle ++(1,0.5);

\node at ( 0,2) {\Large A};
\node at (19,2) {\Large B};
\path[draw, line width=1pt, fill=white] (0,0) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train
\path[draw, line width=1pt, fill=white] (0,1) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train
\node at (10,2) {\Large B};
\end{scope}
Binary file added figures/challenge3_setup2.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions figures/challenge3_setup2.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%!TEX TS-program = pdflatexmk

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\documentclass[tikz,border=2,preview=true]{standalone}

\usepackage[prefix=]{xcolor-solarized}
\usepackage[main=english,ngerman]{babel}
\usepackage{iflang} % needs babel
\newcommand{\IfLanguage}[2]{\IfLanguageName{#1}{#2}{}}
\usepackage{lmodern,microtype,mathptmx,courier}

\begin{document}
\begin{tikzpicture}[font=\sffamily]
\input{challenge3_setup2.tikz}
\end{tikzpicture}
\end{document}
80 changes: 70 additions & 10 deletions figures/challenge3_setup2.tikz
Original file line number Diff line number Diff line change
@@ -1,18 +1,78 @@
%!TEX TS-program = pdflatexmk
%!TEX root = challenge3_setup2.tex

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\begin{scope}
\coordinate (base) at (0,0);
\path[draw, line width=2pt] ( 0,0) -- ++(15,0);
\path[draw, line width=2pt] ( 4,0) -- ++(1,1) -- ++(8,0);
\path[draw, line width=2pt] (12,1) -- ++(1,-1);
\path[draw, line width=1pt, fill] (4,0) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker
\path[draw, line width=1pt, fill] (12,1) -- ++(0.4,-0.4) -- ++(0,0.4); % turnout marker
\path[draw, line width=1pt, fill] (13,0) -- ++(-0.4,0.4) -- ++(0,-0.4); % turnout marker
\path[draw, line width=1pt, fill=white] ( 0,0) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0, 0.4) -- ++( 2.6,0) -- cycle; % train
\path[draw, line width=1pt, fill=white] (15,0) -- ++( 0.2, 0.2) -- ++( 2.6,0) -- ++(0,-0.4) -- ++(-2.6,0) -- cycle; % train
\node at (-1,0) {1};
\node at (16,0) {2};
\draw[line width=1pt, fill=white] ([shift={(base)}] 0.9,0.25) -- ++(-0.2,-0.2) -- ++(-2.6,0) -- ++(0,0.4) -- ++(2.6,0) -- cycle; % train
\node at (0,0.25) {1};
\draw[line width=1pt, fill=white] ([shift={(base)}] 22.1,0.25) -- ++(0.2,0.2) -- ++(2.6,0) -- ++(0,-0.4) -- ++(-2.6,0) -- cycle; % train
\node at (23,0.25) {2};

\draw ([shift={(base)}] 1,0) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 2,0) rectangle ++(1,0.5);
\draw[|<->|,>=latex] ([shift={(base)}] 1,0.85) -- ++(3,0) node[midway,fill=white] {25};
\draw ([shift={(base)}] 3,0) rectangle ++(1,0.5);

\draw ([shift={(base)}] 4,0) rectangle ++(1,0.5);
\draw[line width=1pt] ([shift={(base)}] 4,0) -- ++(0,-0.2) -- ++(0.5,0);
\draw[line width=1pt] ([shift={(base)}] 4.65,-0.2) circle (0.15cm);
\draw ([shift={(base)}] 5,0) rectangle ++(1,0.5);

\draw ([shift={(base)}] 8,0) -- ++(-2,0) -- ++(0,0.5) -- ++(1.5,1) -- ++(0.5,0) -- cycle;
\node at ([shift={(base)}] 7,0.5) {
\IfLanguage{english}{turnout}
\IfLanguage{ngerman}{Weiche}
};

\draw ([shift={(base)}] 8,0) rectangle ++(1,0.5);
\draw ([shift={(base)}] 8,1) rectangle ++(1,0.5);
\draw ([shift={(base)}] 9,0) rectangle ++(1,0.5);
\draw ([shift={(base)}] 9,1) rectangle ++(1,0.5);
\draw[line width=1pt] ([shift={(base)}] 10,0.5) -- ++(0,0.2) -- ++(-0.5,0);
\draw[line width=1pt] ([shift={(base)}] 9.35,0.7) circle (0.15cm);
\draw[line width=1pt] ([shift={(base)}] 10,1.5) -- ++(0,0.2) -- ++(-0.5,0);
\draw[line width=1pt] ([shift={(base)}] 9.35,1.7) circle (0.15cm);

\draw ([shift={(base)}] 10,0) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 11,0) rectangle ++(3,0.5);
\draw[|<->|,>=latex] ([shift={(base)}] 10,-0.45) -- ++(5,0) node[midway,fill=white] {7};
\draw ([shift={(base)}] 14,0) rectangle ++(1,0.5);

\draw ([shift={(base)}] 10,1) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 11,1) rectangle ++(1,0.5);
\draw[|<->|,>=latex] ([shift={(base)}] 10,1.95) -- ++(3,0) node[midway,fill=white] {4};
\draw ([shift={(base)}] 12,1) rectangle ++(1,0.5);

\draw ([shift={(base)}] 15,1) -- ++(-2,0) -- ++(0,0.5) -- ++(1.5,1) -- ++(0.5,0) -- cycle;
\node at ([shift={(base)}] 14,1.5) {
\IfLanguage{english}{turnout}
\IfLanguage{ngerman}{Weiche}
};
\draw[line width=1pt] ([shift={(base)}] 13,1) -- ++(0,-0.2) -- ++(0.5,0);
\draw[line width=1pt] ([shift={(base)}] 13.65,0.8) circle (0.15cm);

\draw ([shift={(base)}] 15,2) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 16,2) rectangle ++(1,0.5);

\draw ([shift={(base)}] 15,0) -- ++(2,0) -- ++(0,0.5) -- ++(-1.5,1) -- ++(-0.5,0) -- cycle;
\node at ([shift={(base)}] 16,0.5) {
\IfLanguage{english}{turnout}
\IfLanguage{ngerman}{Weiche}
};
\draw[line width=1pt] ([shift={(base)}] 15,0) -- ++(0,-0.2) -- ++(0.5,0);
\draw[line width=1pt] ([shift={(base)}] 15.65,-0.2) circle (0.15cm);

\draw ([shift={(base)}] 17,0) rectangle ++(1,0.5);
\draw ([shift={(base)}] 18,0) rectangle ++(1,0.5);

\draw[line width=1pt] ([shift={(base)}] 19,0.5) -- ++(0,0.2) -- ++(-0.5,0);
\draw[line width=1pt] ([shift={(base)}] 18.35,0.7) circle (0.15cm);

\draw ([shift={(base)}] 19,0) rectangle ++(1,0.5);
\draw[dotted] ([shift={(base)}] 20,0) rectangle ++(1,0.5);
\draw[|<->|,>=latex] ([shift={(base)}] 19,0.95) -- ++(3,0) node[midway,fill=white] {15};
\draw ([shift={(base)}] 21,0) rectangle ++(1,0.5);
\end{scope}
Binary file added figures/challenge3_setup3.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions figures/challenge3_setup3.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%!TEX TS-program = pdflatexmk

% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0)
% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given.

\documentclass[tikz,border=2,preview=true]{standalone}

\usepackage[prefix=]{xcolor-solarized}
\usepackage[main=english,ngerman]{babel}
\usepackage{iflang} % needs babel
\newcommand{\IfLanguage}[2]{\IfLanguageName{#1}{#2}{}}
\usepackage{lmodern,microtype,mathptmx,courier}

\begin{document}
\begin{tikzpicture}[font=\sffamily]
\input{challenge3_setup3.tikz}
\end{tikzpicture}
\end{document}
Loading

0 comments on commit a4b5c5d

Please sign in to comment.