diff --git a/2011-28c3/pix/anonymous-sun.jpg b/2011-28c3/pix/anonymous-sun.jpg index b6fc29b..7601def 100644 Binary files a/2011-28c3/pix/anonymous-sun.jpg and b/2011-28c3/pix/anonymous-sun.jpg differ diff --git a/2011-28c3/questions.yaml b/2011-28c3/questions.yaml index f09b63b..f4a1ecc 100644 --- a/2011-28c3/questions.yaml +++ b/2011-28c3/questions.yaml @@ -362,7 +362,7 @@ media: question: Who did not die this year? answers: - false: Steve Jobs - - true: + - true: Rupert Murdoch - false: John McCarthy - false: Dennis Ritchie tier: 4 @@ -371,7 +371,7 @@ media: question: - pix/question1.png explanation: - - pix/shanghai.jpg + - pix/anonymous-sun.jpg --- !Question question: Which programming language can calculate? @@ -448,6 +448,21 @@ media: explanation: - videos/question1.webm +--- !Question +question: What was the most common password? +answers: + - true: goose + - false: sheep + - false: chicken + - false: dog +tier: 10 +game_round: 4 +media: + question: + - pix/question1.png + explanation: + - videos/question1.webm + #8;What detail the Homeland Security software FAST doesn't take into account to compute potential criminals?;ethnische Zugehörigkeit;Körpermaße;Abstammung;Haarfarbe;4 #1;Welches Land hat ACTA noch nicht unterzeichnet?;Australien;Japan;Kanada;Deutschland;4; diff --git a/2011-28c3/round_4.json b/2011-28c3/round_4.json index c525fe7..b8a5260 100644 --- a/2011-28c3/round_4.json +++ b/2011-28c3/round_4.json @@ -72,7 +72,7 @@ "tier": 337, "text": "Who did not die this year?", "explanation": [ - "pix/shanghai.jpg" + "pix/anonymous-sun.jpg" ], "image": "pix/question1.png", "answers": [ @@ -80,7 +80,7 @@ "text": "Steve Jobs" }, { - "text": null, + "text": "Rupert Murdoch", "right": true }, { @@ -205,5 +205,28 @@ "text": "dog" } ] + }, + { + "tier": 3844, + "text": "What was the most common password?", + "explanation": [ + "videos/question1.webm" + ], + "image": "pix/question1.png", + "answers": [ + { + "text": "goose", + "right": true + }, + { + "text": "sheep" + }, + { + "text": "chicken" + }, + { + "text": "dog" + } + ] } ] \ No newline at end of file