diff --git a/data b/data deleted file mode 120000 index 0f6ea83..0000000 --- a/data +++ /dev/null @@ -1 +0,0 @@ -data.example \ No newline at end of file diff --git a/data.27c3-1/pix b/data.27c3-1/pix index bf50246..b3d2487 120000 --- a/data.27c3-1/pix +++ b/data.27c3-1/pix @@ -1 +1 @@ -../data.27c3/pix \ No newline at end of file +../pix \ No newline at end of file diff --git a/data.27c3-2/pix b/data.27c3-2/pix index bf50246..b3d2487 120000 --- a/data.27c3-2/pix +++ b/data.27c3-2/pix @@ -1 +1 @@ -../data.27c3/pix \ No newline at end of file +../pix \ No newline at end of file diff --git a/data.27c3-3/pix b/data.27c3-3/pix index bf50246..b3d2487 120000 --- a/data.27c3-3/pix +++ b/data.27c3-3/pix @@ -1 +1 @@ -../data.27c3/pix \ No newline at end of file +../pix \ No newline at end of file diff --git a/data.27c3-3/questions.json b/data.27c3-3/questions.json index e65c803..d402cac 120000 --- a/data.27c3-3/questions.json +++ b/data.27c3-3/questions.json @@ -1 +1 @@ -../data.27c3/round_2.json \ No newline at end of file +../data.27c3/round_3.json \ No newline at end of file diff --git a/data.27c3-4/pix b/data.27c3-4/pix index bf50246..b3d2487 120000 --- a/data.27c3-4/pix +++ b/data.27c3-4/pix @@ -1 +1 @@ -../data.27c3/pix \ No newline at end of file +../pix \ No newline at end of file diff --git a/data.27c3/csv2json.py b/data.27c3/csv2json.py index 03f12b8..acda1a6 100755 --- a/data.27c3/csv2json.py +++ b/data.27c3/csv2json.py @@ -70,6 +70,9 @@ class Question(object): if os.path.isfile("pix/{0}_expl.jpg".format(arg[7])): self.data['explanation'] = { 'image': "pix/{0}_expl.jpg".format(arg[7])} + if os.path.isfile("pix/{0}_expl.gif".format(arg[7])): + self.data['explanation'] = { + 'image': "pix/{0}_expl.gif".format(arg[7])} if os.path.isfile("pix/{0}.jpg".format(arg[7])): self.data['image'] = "pix/{0}.jpg".format(arg[7]) if os.path.isfile("video/{0}.webm".format(arg[7])): diff --git a/data.27c3/dump_data_to_csv.py b/data.27c3/dump_data_to_csv.py old mode 100755 new mode 100644 diff --git a/data.27c3/dump_data_to_html.py b/data.27c3/dump_data_to_html.py old mode 100755 new mode 100644 diff --git a/data.27c3/news_entries_27c3.csv b/data.27c3/news_entries_27c3.csv index 15b95d3..ac97aea 100644 --- a/data.27c3/news_entries_27c3.csv +++ b/data.27c3/news_entries_27c3.csv @@ -11,9 +11,9 @@ 2;'Which country does not allow porno scanners?';'Israel';'Kuweit';'France';'Germany';1;293 3;'Which page did Wikipedia not delete?';'Pentaradio';'Alternativlos';'Club Mate';'Wikileaksmirror';1;5001 4;'History: How old is the Web?';'15y';'20y';'25y';'35y';2;637 -5;'For what patent violation 36 companies got sued by the Marshall patent troll?';'Spyware';'Anti-Spam';'O/S shutdown';'VoIP';2;326 +5;'How was the Web forum of the Epilepsy Foundation attacked?';'password guessing';'animated gifs';'phishing to free treatment site';'free screensavers';2;5006 6;'What happened in Turkey after the spell checking changed s/You change the topic every time you run out of arguments/You change the topic every time they are fucking you/ in a SMS?';'The couple broke up';'The couple got married';'Phone manufacturer had to pay 50k EUR';'The couple killed themselfs';4;632 -7;'How was Lonnie Tinsley (86 old woman in a hospital in Oklahoma) made to take her medication?';'Asking her';'by firearm';'by teaser';'Threatened by Internet ban';3;258 +7;'For what patent violation 36 companies got sued by the Marshall patent troll?';'Spyware';'Anti-Spam';'O/S shutdown';'VoIP';2;326 8;'Which organization got nervous when they found out that some employees consume child porn?';'FBI';'FSB';'MI6';'BND';1;327 ;;;;;;; 1;'Which O/S will quote ''Only one FBI sponsored backdoor in 10 years”- once verified?''';'Solaris';'Windows';'OpenBSD';'Linux';3;727 @@ -34,5 +34,5 @@ 7;'According to the RIAA how many times the amount of all existing US Dollars were stolen by the Pirate Bay?';'0.23';'0.5';'12';'46';4;432 8;'How many errors did Office 2007 score at the OOXML test?';'0';'2';'13';'122,000';4;5005 9;'What are the anti-terror laws used for in the UK?';'CCTV';'block Web pages';'catch terrorists';'search trash bins to catch truants';4;309 -10;'What was the US nuke launch code ''til 1977';'7711111599111119';'00000000';'Fj3#$%62h61?-o+23';'\/\/ip3 3m 0FF';2;581 +10;'What was the US nuke launch code ''til 1977';'7711111599111119';'00000000';'04071776';'12345678';2;581 ;;;;;;; diff --git a/data.27c3/pix/108.jpg b/data.27c3/pix/108.jpg new file mode 100644 index 0000000..e2d98b4 Binary files /dev/null and b/data.27c3/pix/108.jpg differ diff --git a/data.27c3/pix/5005.jpg b/data.27c3/pix/5005.jpg new file mode 100644 index 0000000..56275bd Binary files /dev/null and b/data.27c3/pix/5005.jpg differ diff --git a/data.27c3/pix/5006_expl.gif b/data.27c3/pix/5006_expl.gif new file mode 100644 index 0000000..d676307 Binary files /dev/null and b/data.27c3/pix/5006_expl.gif differ diff --git a/data.27c3/pix/Napkins-Courtesy-RG-Blue-640x480.jpg b/data.27c3/pix/Napkins-Courtesy-RG-Blue-640x480.jpg new file mode 100644 index 0000000..56dab30 Binary files /dev/null and b/data.27c3/pix/Napkins-Courtesy-RG-Blue-640x480.jpg differ diff --git a/data.27c3/pix/wikipedia.jpg b/data.27c3/pix/wikipedia.jpg new file mode 100644 index 0000000..c060f2d Binary files /dev/null and b/data.27c3/pix/wikipedia.jpg differ diff --git a/data.27c3/round_0.json b/data.27c3/round_0.json index 1525bdc..5d555f4 100644 --- a/data.27c3/round_0.json +++ b/data.27c3/round_0.json @@ -61,6 +61,7 @@ { "tier": 337, "text": "For what reason pupils of a Pennsylvania school exploited the remote admin software of their school laptops?", + "image": "pix/108.jpg", "answers": [ { "text": "Turn off camera spy ware", diff --git a/data.27c3/round_1.json b/data.27c3/round_1.json index e4fd2eb..da0e218 100644 --- a/data.27c3/round_1.json +++ b/data.27c3/round_1.json @@ -80,20 +80,23 @@ }, { "tier": 506, - "text": "For what patent violation 36 companies got sued by the Marshall patent troll?", + "text": "How was the Web forum of the Epilepsy Foundation attacked?", + "explanation": { + "image": "pix/5006_expl.gif" + }, "answers": [ { - "text": "Spyware" + "text": "password guessing" }, { - "text": "Anti-Spam", + "text": "animated gifs", "right": true }, { - "text": "O/S shutdown" + "text": "phishing to free treatment site" }, { - "text": "VoIP" + "text": "free screensavers" } ] }, @@ -118,20 +121,20 @@ }, { "tier": 1139, - "text": "How was Lonnie Tinsley (86 old woman in a hospital in Oklahoma) made to take her medication?", + "text": "For what patent violation 36 companies got sued by the Marshall patent troll?", "answers": [ { - "text": "Asking her" + "text": "Spyware" }, { - "text": "by firearm" - }, - { - "text": "by teaser", + "text": "Anti-Spam", "right": true }, { - "text": "Threatened by Internet ban" + "text": "O/S shutdown" + }, + { + "text": "VoIP" } ] }, diff --git a/data.27c3/round_3.json b/data.27c3/round_3.json index 1221ed1..887e81c 100644 --- a/data.27c3/round_3.json +++ b/data.27c3/round_3.json @@ -143,6 +143,7 @@ { "tier": 1709, "text": "How many errors did Office 2007 score at the OOXML test?", + "image": "pix/5005.jpg", "answers": [ { "text": "0" @@ -191,10 +192,10 @@ "right": true }, { - "text": "Fj3#$%62h61?-o+23" + "text": "04071776" }, { - "text": "\\/\\/ip3 3m 0FF" + "text": "12345678" } ] } diff --git a/data.27c3/video/36_expl.webm b/data.27c3/video/36_expl.webm index 2dc97d5..f52a017 100644 Binary files a/data.27c3/video/36_expl.webm and b/data.27c3/video/36_expl.webm differ diff --git a/data.27c3/video/664.webm b/data.27c3/video/664.webm deleted file mode 120000 index 0d8b2e5..0000000 --- a/data.27c3/video/664.webm +++ /dev/null @@ -1 +0,0 @@ -Boat.webm \ No newline at end of file diff --git a/data.27c3/video/664.webm b/data.27c3/video/664.webm new file mode 100644 index 0000000..ac84541 Binary files /dev/null and b/data.27c3/video/664.webm differ diff --git a/pentagame.ink.svg b/pentagame.ink.svg new file mode 100644 index 0000000..3dd0f51 --- /dev/null +++ b/pentagame.ink.svg @@ -0,0 +1,891 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pentagame.png b/pentagame.png new file mode 100644 index 0000000..7abc35b Binary files /dev/null and b/pentagame.png differ