josch/ncase.me-trust
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'gh-pages' of github.com:ncase/trust into gh-pages

Browse source
This commit is contained in:
Nicky Case 2017-07-27 12:01:16 -04:00
commit 96b38fdd28
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/slides/2_Slides_Iterated.js
View file

@ -136,12 +136,12 @@ SLIDES.push({
{id:"tft", num:1}, {id:"tft", num:1},
];*/ ];*/
var ROUNDS = [ // and min & max score... var ROUNDS = [ // and min & max score...
{id:"tft", num:5}, // min 3, max 11 {id:"tft", num:5}, // min 2, max 11
{id:"all_d", num:4}, // min -4, max 0 {id:"all_d", num:4}, // min -4, max 0
{id:"all_c", num:4}, // min 8, max 12 {id:"all_c", num:4}, // min 8, max 12
{id:"grudge", num:5}, // min -1, max 11 {id:"grudge", num:5}, // min -1, max 11
{id:"prober", num:7} // min 2, max 15 {id:"prober", num:7} // min 2, max 15
]; // TOTAL... MIN 8, MAX 49 ]; // TOTAL... MIN 7, MAX 49
ROUND_INDEX = 0; ROUND_INDEX = 0;
ROUND_NUM = 0; ROUND_NUM = 0;
@ -216,8 +216,8 @@ SLIDES.push({
if(score==49) scoreTextID="5"; if(score==49) scoreTextID="5";
else if(score>=34) scoreTextID="4"; else if(score>=34) scoreTextID="4";
else if(score>=22) scoreTextID="3"; else if(score>=22) scoreTextID="3";
else if(score>=9) scoreTextID="2"; else if(score>=8) scoreTextID="2";
else if(score==8) scoreTextID="1"; else if(score==7) scoreTextID="1";
else scoreTextID="x"; else scoreTextID="x";
scoreTextID = "iterated_score_"+scoreTextID; scoreTextID = "iterated_score_"+scoreTextID;

2
notes/index.html
View file

@ -85,7 +85,7 @@
<h3>"Simpleton"</h3> <h3>"Simpleton"</h3>
<p>Also known as Pavlov, or Win-Shift-Lose-Stay.</p> <p>Also known as Pavlov, or Win-Stay-Lose-Shift.</p>
<h3>"Our modern media [...] has increased our miscommunication"</h3> <h3>"Our modern media [...] has increased our miscommunication"</h3>

2
words.html
View file

@ -204,7 +204,7 @@ which is <i>perfect!</i> Congrats you have too much time on your hands.
...i have no idea how you did that. ...i have no idea how you did that.
</p> </p>
<p id="iterated_score_end"> <p id="iterated_score_end">
(the lowest &amp; highest possible scores are 8 and 49, respectively) (the lowest &amp; highest possible scores are 7 and 49, respectively)
</p> </p>
<p id="who_were"> <p id="who_were">