diff --git a/MORE WORDS.md b/MORE WORDS.md new file mode 100644 index 0000000..affe4eb --- /dev/null +++ b/MORE WORDS.md @@ -0,0 +1,41 @@ +THE CORE WHY: WHY TEACH THIS? +To create a trustful world +therefore, understand the conditions of trust, its mechanisms + +--- + +And your total score is... +BIG NUMBER which is, wow, actually _impressively_ bad. // 8 + which, uh, could be worse! // 9 to 21 + which ain't bad! // 22 to 34 + which is pretty good! // 34 to 48 + which is actually _perfect_ // 49 + which i have no idea how you accomplished + (the lowest & highest possible scores + are 8 and 49, respectively.) + +So who were these strange characters you just played against? + +COPYCAT: + +Hello! I start with Cooperate, and afterwards, I just copy whatever you did in the last round. Meow + +ALWAYS CHEAT: + +_the strong shall eat the weak_ + +ALWAYS COOPERATE: + +Let's be best friends! <3 + +GRUDGER: + +Listen, stranger. I'll start cooperatin', and keep cooperation', but if y'all ever cheat me, I'LL CHEAT YOU BACK TIL THE END OF DAYS. + +DETECTIVE: + +First: I analyze you. I start: Cooperate, Cheat, Cooperate, Cooperate. If you cheat back, I'll act like Copycat. If you never cheat back, I'll act like Always Cheat, to exploit you. Elementary. + +Now what if these characters were to play... + +...against each other? diff --git a/assets/tournament/peep_characters.png b/assets/tournament/peep_characters.png new file mode 100644 index 0000000..6fe48f8 Binary files /dev/null and b/assets/tournament/peep_characters.png differ diff --git a/css/slides.css b/css/slides.css index 819495c..906f0da 100644 --- a/css/slides.css +++ b/css/slides.css @@ -63,11 +63,8 @@ body{ position: absolute; transition: left 0.5s ease-in-out, top 0.5s ease-in-out; } - -/********* Fader *********/ - .fader{ - transition: opacity 0.5s ease-in-out; + transition: opacity 0.5s ease-in-out !important; } /******** Text Box ********/ @@ -280,7 +277,7 @@ body{ /******* SCRATCHER *******/ /*************************/ -#scratcher{ +.scratcher{ position: absolute; top:0; left:0; width: 100%; height: 100%; @@ -317,6 +314,47 @@ body{ top: 21px; } +/*************************/ +/******* CHARACTERS *******/ +/*************************/ + +.character{ + position: absolute; + height: 114px; +} +.character #peep{ + background: url(../assets/tournament/peep_characters.png); + background-size: auto 100%; + width: 105px; + height: 114px; + top: -5px; + left: -10px; +} +.character #desc{ + width: calc(100% - 100px); + font-size: 18px; + height: 114px; + right: 0; + line-height: 1.2em; +} +.character #peep[char=tft]{ background-position: 0 0; } +.character #peep[char=all_d]{ background-position: -105px 0; } +.character #peep[char=all_c]{ background-position: -210px 0; } +.character #peep[char=grudge]{ background-position: -315px 0; } +.character #peep[char=prober]{ background-position: -420px 0; } +.character #peep[char=tf2t]{ background-position: -525px 0; } +.character #peep[char=pavlov]{ background-position: -630px 0; } +.character #peep[char=random]{ background-position: -735px 0; } + +.tft{ color:#4089DD; } +.all_d{ color:#52537F; } +.all_c{ color:#FF75FF; } +.grudge{ color:#C4A401; } +.prober{ color:#CC984C; } +.tf2t{ color:#88A8CE; } +.pavlov{ color:#86C448; } +.random{ color:#FF5E5E; } + /*************************/ /***** SLIDE SELECT ******/ /*************************/ diff --git a/index.html b/index.html index 2450d99..79ba0fb 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@
-
+