From 459c3f178344356dc695fdd17c96b9956887de21 Mon Sep 17 00:00:00 2001 From: Nicky Case Date: Mon, 26 Jun 2017 15:52:49 -0400 Subject: [PATCH] refactor words and language --- TODO.md | 15 +++++----- assets/pavlov.png | Bin 0 -> 5752 bytes assets/random.png | Bin 0 -> 5761 bytes assets/tf2t.png | Bin 0 -> 5340 bytes css/slides.css | 13 ++++++++- index.html | 38 ++++++++++++++---------- js/core/Button.js | 2 +- js/core/SlideSelect.js | 2 +- js/core/Slideshow.js | 2 ++ js/core/TextBox.js | 42 +++++++++++++++++++++++++++ js/core/WordBox.js | 30 ------------------- js/core/Words.js | 56 ++++++++++++++++++++++++++++++++++++ js/lib/pegasus.min.js | 2 ++ js/main.js | 4 +-- js/sims/PD.js | 4 +-- js/sims/Tournament.js | 14 +++++++-- js/slides/Slides_Ecology.js | 39 +++++++++++++++++++++++++ lang/en.html | 32 +++++++++++++++++++++ 18 files changed, 234 insertions(+), 61 deletions(-) create mode 100644 assets/pavlov.png create mode 100644 assets/random.png create mode 100644 assets/tf2t.png create mode 100644 js/core/TextBox.js delete mode 100644 js/core/WordBox.js create mode 100644 js/core/Words.js create mode 100644 js/lib/pegasus.min.js create mode 100644 js/slides/Slides_Ecology.js create mode 100644 lang/en.html diff --git a/TODO.md b/TODO.md index aab6f16..ffa1855 100644 --- a/TODO.md +++ b/TODO.md @@ -1,14 +1,15 @@ MAJOR SHTUFF -1. Sandbox with all parameters exposed // exposed... but time to make the UI! -2. Repeated game with all parameters exposed -3. Splash, with params for cool outro -4. Integrate *everything*. // slides, outro -5. Credits and rewards +1. Create Sandbox +2. Re-create Repeated Game w/ params exposed +3. Re-create Splash, with cool outro +4. Integrate & Write EVERYTHING +5. Final round of playtesting +6. Credits, Footnotes, Rewards +7. Polish the whole dang thing MINOR SHTUFF - Word box class less annoying - Refactoring, ugh -- Logic: Prober, Pavlov, TF2T, Random? // done -- Slides in different files \ No newline at end of file +- Draw: Pavlov, TF2T, Random \ No newline at end of file diff --git a/assets/pavlov.png b/assets/pavlov.png new file mode 100644 index 0000000000000000000000000000000000000000..0a00e6e0de80b8a564394b6055a9f827fed419dd GIT binary patch literal 5752 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 literal 0 HcmV?d00001 diff --git a/assets/random.png b/assets/random.png new file mode 100644 index 0000000000000000000000000000000000000000..40911c66c2de7f3e108134423f14f7f5233c9140 GIT binary patch literal 5761 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 ve4bab4HoSnb-PB|hrXl|VwE*Yu literal 0 HcmV?d00001 diff --git a/assets/tf2t.png b/assets/tf2t.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0ccf51d5bbc15f30482d7c58355c9420068f0f GIT binary patch literal 5340 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 literal 0 HcmV?d00001 diff --git a/css/slides.css b/css/slides.css index 9246727..3c80b0a 100644 --- a/css/slides.css +++ b/css/slides.css @@ -44,17 +44,28 @@ body{ position: absolute; } +/********* Fader *********/ + .fader{ -webkit-transition: opacity 0.3s ease-in-out; -mos-transition: opacity 0.3s ease-in-out; -ms-transition: opacity 0.3s ease-in-out; transition: opacity 0.3s ease-in-out; } -.wordbox{ + +/******** Text Box ********/ + +.textbox{ font-family: 'FuturaHandwritten'; color: #333; font-size: 20px; } +.textbox > div{ + position: absolute; +} + +/********* Button ********/ + .button{ z-index: 0; } diff --git a/index.html b/index.html index 7b78f8a..476ed6e 100644 --- a/index.html +++ b/index.html @@ -16,6 +16,7 @@ + @@ -27,34 +28,41 @@ - + + + + + - \ No newline at end of file diff --git a/js/core/Button.js b/js/core/Button.js index 84a8831..2078343 100644 --- a/js/core/Button.js +++ b/js/core/Button.js @@ -24,7 +24,7 @@ function Button(config){ // Customize DOM button.style.left = config.x+"px"; button.style.top = config.y+"px"; - text.innerHTML = config.text; + text.innerHTML = Words.get(config.text_id); // On hover... hitbox.onmouseover = function(){ diff --git a/js/core/SlideSelect.js b/js/core/SlideSelect.js index b2abb15..18b7fe0 100644 --- a/js/core/SlideSelect.js +++ b/js/core/SlideSelect.js @@ -16,7 +16,7 @@ function SlideSelect(config){ }; // Populate dots - for(var i=0; i0){ // Testing phase - var move = moves.pop(); + var move = moves.shift(); return move; }else{ if(everCheatedMe){ diff --git a/js/sims/Tournament.js b/js/sims/Tournament.js index 39b23c1..fec21b5 100644 --- a/js/sims/Tournament.js +++ b/js/sims/Tournament.js @@ -1,12 +1,22 @@ Tournament.SELECTION = 5; -Tournament.NUM_TURNS = 5; +Tournament.NUM_TURNS = 20; // CREATE A RING OF AGENTS -Tournament.AGENTS = [ +/*Tournament.AGENTS = [ {strategy:"all_c", count:15}, {strategy:"all_d", count:5}, {strategy:"grim", count:0}, {strategy:"tft", count:5}, +];*/ +Tournament.AGENTS = [ + {strategy:"all_c", count:15}, + {strategy:"all_d", count:5}, + {strategy:"tft", count:5}, + //{strategy:"grim", count:3}, + //{strategy:"prober", count:3}, + //{strategy:"tf2t", count:13}, + //{strategy:"pavlov", count:13}, + //{strategy:"random", count:13} ]; function Tournament(config){ diff --git a/js/slides/Slides_Ecology.js b/js/slides/Slides_Ecology.js new file mode 100644 index 0000000..88f4451 --- /dev/null +++ b/js/slides/Slides_Ecology.js @@ -0,0 +1,39 @@ +SLIDES.push({ + + id: "sim", + add:[ + + // The tournament simulation + {id:"tournament", type:"Tournament", x:0, y:20}, + + // All the words! + { + id:"textbox", type:"TextBox", + boxes:[ + { x:500, y:0, width:460, height:50, text_id:"sandbox_1" }, + { x:500, y:370, width:460, height:200, text_id:"sandbox_2" } + ] + }, + + // Buttons + { + id:"_b1", type:"Button", x:500, y:150, width:140, + text_id: "label_play_tournament", + message: "tournament/play" + }, + { + id:"_b2", type:"Button", x:500, y:220, width:140, + text_id: "label_eliminate_bottom_5", + message: "tournament/eliminate", + active:false + }, + { + id:"_b3", type:"Button", x:500, y:290, width:140, + text_id: "label_reproduce_top_5", + message: "tournament/reproduce", + active:false + } + + ] + +}); \ No newline at end of file diff --git a/lang/en.html b/lang/en.html new file mode 100644 index 0000000..a269ae3 --- /dev/null +++ b/lang/en.html @@ -0,0 +1,32 @@ + + + +

+1) play tournament +

+ +

+2) eliminate bottom 5 +

+ +

+3) reproduce top 5 +

+ +

+Let's say there are three kinds of players: +
+Always Cooperate, +Always Cheat & +Tit For Tat +

+"What happens when you let a mixed population play against each other, and evolve over time? +

+ +

+Always Cheat dominates at first, but when it runs out of suckers to exploit, +its empire collapses – and the fairer Tit For Tat takes over. +

+We are not punished for our sins, but by them.
+- Elbert Hubbard +

\ No newline at end of file