diff --git a/2011-28c3/pix/a_handygate.jpg b/2011-28c3/pix/a_handygate.jpg new file mode 100644 index 0000000..648723e Binary files /dev/null and b/2011-28c3/pix/a_handygate.jpg differ diff --git a/2011-28c3/pix/q_handygate.jpg b/2011-28c3/pix/q_handygate.jpg new file mode 100644 index 0000000..872e191 Binary files /dev/null and b/2011-28c3/pix/q_handygate.jpg differ diff --git a/2011-28c3/questions.yaml b/2011-28c3/questions.yaml index 6946812..bf9e135 100644 --- a/2011-28c3/questions.yaml +++ b/2011-28c3/questions.yaml @@ -345,9 +345,9 @@ tier: 3 game_round: 2 media: question: - - pix/question1.png + - pix/q_handygate.jpg explanation: - - videos/question1.webm + - pix/a_handygate.jpg --- !Question question: What did Google do after it received a secret court order to hand over Jacob Applebaums e-mails? diff --git a/2011-28c3/round_1.json b/2011-28c3/round_1.json index 5b30682..07cccf0 100644 --- a/2011-28c3/round_1.json +++ b/2011-28c3/round_1.json @@ -44,7 +44,7 @@ } ], "source": false, - "tier": 10, + "tier": 8, "image": "data/pix/q_bundestrojaner.jpg" }, { @@ -68,7 +68,7 @@ } ], "source": false, - "tier": 3, + "tier": 1, "image": "data/pix/q_paypal4.jpg" }, { @@ -92,7 +92,7 @@ } ], "source": false, - "tier": 9, + "tier": 10, "image": "data/pix/q_russian.jpg" }, { @@ -117,7 +117,7 @@ } ], "source": false, - "tier": 6, + "tier": 2, "image": "data/pix/q_cluster.jpg" }, { @@ -141,7 +141,7 @@ } ], "source": false, - "tier": 1, + "tier": 2, "image": "data/pix/q_uhl.jpg" }, { @@ -165,7 +165,7 @@ } ], "source": false, - "tier": 6, + "tier": 5, "image": "data/pix/q_cybercrime.png" }, { @@ -189,7 +189,7 @@ } ], "source": false, - "tier": 8, + "tier": 5, "image": "data/pix/q_belgium.gif" }, { @@ -213,7 +213,7 @@ } ], "source": false, - "tier": 1, + "tier": 3, "image": "data/pix/q_hadopi.png" }, { @@ -237,7 +237,7 @@ } ], "source": false, - "tier": 8, + "tier": 3, "image": "data/pix/q_brain.png" }, { @@ -261,7 +261,7 @@ } ], "source": false, - "tier": 5, + "tier": 4, "image": "data/pix/q_kernel.gif" }, { @@ -285,7 +285,7 @@ } ], "source": false, - "tier": 2, + "tier": 3, "image": "data/pix/q_drone.jpg" }, { @@ -309,7 +309,7 @@ } ], "source": false, - "tier": 10, + "tier": 4, "image": "data/pix/q_drone2.jpg" }, { @@ -333,7 +333,7 @@ } ], "source": false, - "tier": 6, + "tier": 3, "image": "data/pix/q_autocomplete.jpg" }, { @@ -357,7 +357,7 @@ } ], "source": false, - "tier": 6, + "tier": 10, "image": "data/pix/q_ca4.jpg" }, { @@ -381,7 +381,7 @@ } ], "source": false, - "tier": 7, + "tier": 3, "image": "data/pix/q_sudan.png" }, { @@ -405,7 +405,7 @@ } ], "source": false, - "tier": 5, + "tier": 10, "image": "data/pix/q_london.jpg" }, { @@ -429,7 +429,7 @@ } ], "source": false, - "tier": 6, + "tier": 4, "image": "data/pix/q_hackspace.jpg" } ] \ No newline at end of file diff --git a/2011-28c3/round_2.json b/2011-28c3/round_2.json index 6d09a44..949326e 100644 --- a/2011-28c3/round_2.json +++ b/2011-28c3/round_2.json @@ -20,13 +20,13 @@ } ], "source": false, - "tier": 1652, + "tier": 1865, "image": "data/pix/q_wp_pornstars.png" }, { "text": "How many user-related data records (name, address, birth date) did the Saxon State retriev after it cought about > 1 mio cell phone connection records?", "explanation": [ - "data/videos/question1.webm" + "data/pix/a_handygate.jpg" ], "answers": [ { @@ -44,8 +44,8 @@ } ], "source": false, - "tier": 135, - "image": "data/pix/question1.png" + "tier": 1646, + "image": "data/pix/q_handygate.jpg" }, { "text": "What did Google do after it received a secret court order to hand over Jacob Applebaums e-mails?", @@ -68,7 +68,7 @@ } ], "source": false, - "tier": 1342, + "tier": 1859, "image": "data/pix/question1.png" }, { @@ -92,7 +92,7 @@ } ], "source": false, - "tier": 954, + "tier": 1681, "image": "data/pix/question1.png" }, { @@ -116,7 +116,7 @@ } ], "source": false, - "tier": 1514, + "tier": 291, "image": "data/pix/question1.png" }, { @@ -140,7 +140,7 @@ } ], "source": false, - "tier": 1074, + "tier": 149, "image": "data/pix/question1.png" }, { @@ -164,7 +164,7 @@ } ], "source": false, - "tier": 918, + "tier": 1885, "image": "data/pix/question1.png" }, { @@ -188,7 +188,7 @@ } ], "source": false, - "tier": 1549, + "tier": 337, "image": "data/pix/question1.png" }, { @@ -212,7 +212,7 @@ } ], "source": false, - "tier": 921, + "tier": 1646, "image": "data/pix/question1.png" } ] \ No newline at end of file diff --git a/2011-28c3/round_3.json b/2011-28c3/round_3.json index 0e4bcfb..91d5ac8 100644 --- a/2011-28c3/round_3.json +++ b/2011-28c3/round_3.json @@ -20,7 +20,7 @@ } ], "source": false, - "tier": 2278, + "tier": 916, "image": "data/pix/question1.png" }, { @@ -44,7 +44,7 @@ } ], "source": false, - "tier": 2599, + "tier": 2977, "image": "data/pix/question1.png" }, { @@ -68,7 +68,7 @@ } ], "source": false, - "tier": 2033, + "tier": 2581, "image": "data/pix/question1.png" }, { @@ -92,7 +92,7 @@ } ], "source": false, - "tier": 1178, + "tier": 788, "image": "data/pix/van_gogh_ipad.jpg" }, { @@ -116,7 +116,7 @@ } ], "source": false, - "tier": 2616, + "tier": 480, "image": "data/pix/question1.png" }, { @@ -140,7 +140,7 @@ } ], "source": false, - "tier": 2286, + "tier": 1507, "image": "data/pix/question1.png" }, { @@ -164,7 +164,7 @@ } ], "source": false, - "tier": 2478, + "tier": 2211, "image": "data/pix/question1.png" }, { @@ -188,7 +188,7 @@ } ], "source": false, - "tier": 3577, + "tier": 874, "image": "data/pix/question1.png" } ] \ No newline at end of file diff --git a/2011-28c3/round_4.json b/2011-28c3/round_4.json index c6d149b..e69de29 100644 --- a/2011-28c3/round_4.json +++ b/2011-28c3/round_4.json @@ -1,269 +0,0 @@ -[ - { - "text": "What company does this org chart show?", - "explanation": [ - "data/pix/organigram.png" - ], - "answers": [ - { - "text": "Google" - }, - { - "text": "Microsoft", - "right": true - }, - { - "text": "Apple" - }, - { - "text": "Oracle" - } - ], - "source": false, - "tier": 25, - "image": "data/pix/orgchart-ms.png" - }, - { - "text": "What programming language Fefe isn't able to read?", - "explanation": [ - "data/videos/question1.webm" - ], - "answers": [ - { - "text": "C" - }, - { - "text": "Assembler" - }, - { - "text": "Machine Code" - }, - { - "text": "Erlang", - "right": true - } - ], - "source": false, - "tier": 26, - "image": "data/pix/question1.png" - }, - { - "text": "Who did not die this year?", - "explanation": [ - "data/pix/anonymous-sun.jpg" - ], - "answers": [ - { - "text": "Steve Jobs" - }, - { - "text": "Rupert Murdoch", - "right": true - }, - { - "text": "John McCarthy" - }, - { - "text": "Dennis Ritchie" - } - ], - "source": false, - "tier": 10, - "image": "data/pix/question1.png" - }, - { - "text": "Which programming language can calculate?", - "explanation": [ - "data/pix/shanghai.jpg" - ], - "answers": [ - { - "text": "PHP" - }, - { - "text": null, - "right": true - }, - { - "text": "Java" - }, - { - "text": "Dennis Ritchie" - } - ], - "source": false, - "tier": 55, - "image": "data/pix/question1.png" - }, - { - "text": "How many babies were given away in Spain between TODO and the 90-es?", - "explanation": [ - "data/pix/shanghai.jpg" - ], - "answers": [ - { - "text": "PHP" - }, - { - "text": "300,000", - "right": true - }, - { - "text": "Java" - }, - { - "text": "Dennis Ritchie" - } - ], - "source": false, - "tier": 62, - "image": "data/pix/question1.png" - }, - { - "text": "How many Mrs USA finalists think evolution should be taught in school (out of 51)?", - "explanation": [ - "data/pix/shanghai.jpg" - ], - "answers": [ - { - "text": 1, - "right": true - }, - { - "text": 2 - }, - { - "text": 4 - }, - { - "text": 8 - } - ], - "source": "http://themoderatevoice.com/114102/americas-rejection-of-evolution-reflected-in-miss-usa-pageant/", - "tier": 18, - "image": "data/pix/question1.png" - }, - { - "text": "What could not be used to exploit Win systems in 2011?", - "explanation": [ - "data/videos/question1.webm" - ], - "answers": [ - { - "text": "TXT file" - }, - { - "text": "Ping" - }, - { - "text": "Flash and other Adobe stuff" - }, - { - "text": "Power Button", - "right": true - } - ], - "source": false, - "tier": 43, - "image": "data/pix/question1.png" - }, - { - "text": "What animal did the US army use in Western Berlin for intruder alarm?", - "explanation": [ - "data/videos/question1.webm" - ], - "answers": [ - { - "text": "goose", - "right": true - }, - { - "text": "sheep" - }, - { - "text": "chicken" - }, - { - "text": "dog" - } - ], - "source": false, - "tier": 10, - "image": "data/pix/question1.png" - }, - { - "text": "What was the most common password?", - "explanation": [ - "data/videos/question1.webm" - ], - "answers": [ - { - "text": "goose", - "right": true - }, - { - "text": "sheep" - }, - { - "text": "chicken" - }, - { - "text": "dog" - } - ], - "source": false, - "tier": 53, - "image": "data/pix/question1.png" - }, - { - "text": "What answers Siri when you ask it \"Can you call me an ambulance?\"", - "explanation": [ - "data/videos/question1.webm" - ], - "answers": [ - { - "text": "goose", - "right": true - }, - { - "text": "sheep" - }, - { - "text": "chicken" - }, - { - "text": "dog" - } - ], - "source": false, - "tier": 57, - "image": "data/pix/question1.png" - }, - { - "text": "Who was awarded the Pwnie award this year?", - "explanation": [ - "data/pix/a_target.jpg" - ], - "answers": [ - { - "text": "Sony", - "right": true - }, - { - "text": "Sony", - "right": true - }, - { - "text": "Sony", - "right": true - }, - { - "text": "Sony", - "right": true - } - ], - "source": false, - "tier": 23, - "image": "data/pix/q_target.png" - } -] \ No newline at end of file