NotDotTeam/trust
NotDotTeam
/
trust
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

🔀 Merge remote-tracking branch 'origin/gh-pages' into gh-pages

This commit is contained in:
Maxim Lebedev 2017-08-07 19:07:44 +05:00
parent 471dd7cec7 1a7dcc177a
commit 1de9c5405e
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F
5 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -29,9 +29,21 @@
* [MinPubSub](https://github.com/daniellmb/MinPubSub) for publish/subscribe
* [Pegasus](https://github.com/typicode/pegasus) for me being too lazy to write my own XHR
**Font:** [Futura Handwritten](http://www.dafont.com/futurahandwritten.font) by Bill Snyder
# How-To: Translate this thang!
Translations done so far: [Chinese](http://sekai.co/trust/), [Brazilian Portuguese](https://brunolemos.github.io/trust/)
**[NOTE: Before you decide to make a translation, check the "Issues" tab to see if someone else is already working on it! Maybe you can collaborate. And if no one else is, please create a new Issue in this repo so that others know you're working on it!]**
Translations done so far:
[Chinese](http://sekai.co/trust/),
[Chinese (Taiwan)](https://audreyt.github.io/trust-zh-TW/),
[Brazilian Portuguese](https://brunolemos.github.io/trust/),
[French](https://ayowel.github.io/trust/),
[Spain Spanish](https://ccamara.github.io/trust/),
[Russian](https://likzet.github.io/trust/),
[German](https://jkoelling.github.io/trust/),
[Italian](https://lvdt.github.io/trust/)
**Step 1)** Fork or download this repo
(if you're forking it, be sure to make sure *your* repo is on a branch called `gh-pages`, so that GitHub can automatically generate a webpage for it!)

1
css/slides.css
View File

@ -56,6 +56,7 @@ s{
line-height: 21px;
color: #fff;
text-align: center;
width: 600px;
}
#translations a{
color:#dd4040;

87
index.html
View File

@ -55,8 +55,8 @@ Many thanks again!
<meta property="og:description" content="интерактивное руководство теории игр о том, зачем и как мы доверяем друг другу">
<!-- Styles -->
<link rel="stylesheet" href="css/slides.css?v6">
<link rel="stylesheet" href="css/balloon.css?v6">
<link rel="stylesheet" href="css/slides.css?v7">
<link rel="stylesheet" href="css/balloon.css?v7">
</head>
<body>
@ -84,10 +84,15 @@ Many thanks again!
<!-- List of translations thus far! -->
<div id="translations">
fan-translations so far:
<a href="https://github.com/ncase/trust#how-to-translate-this-thang" target="_blank">(add your own!)</a>
<br>
<a href="https://github.com/ncase/trust#how-to-translate-this-thang" target="_blank">(add your own!)</a> |
<a href="https://ccamara.github.io/trust/">Español de España</a> |
<a href="https://ayowel.github.io/trust/">Français</a> |
<a href="https://jkoelling.github.io/trust/">Deutsch</a> |
<a href="https://lvdt.github.io/trust/">Italiano</a> |
<a href="https://notdotteam.github.io/trust/">Русский</a> |
<a href="https://brunolemos.github.io/trust/">Português do Brasil</a> |
<a href="http://sekai.co/trust/">中文</a> |
<a href="https://brunolemos.github.io/trust/">Português do Brasil</a>
<a href="https://audreyt.github.io/trust-zh-TW/">中文（臺灣)</a>
</div>
</div>
@ -95,50 +100,50 @@ Many thanks again!
</html>
<!-- Libraries -->
<script src="js/lib/helpers.js?v6"></script>
<script src="js/lib/pegasus.js?v6"></script>
<script src="js/lib/helpers.js?v7"></script>
<script src="js/lib/pegasus.js?v7"></script>
<script>var c_ = {};</script>
<script src="js/lib/minpubsub.src.js?v6"></script>
<script src="js/lib/q.js?v6"></script>
<script src="js/lib/pixi.min.js?v6"></script>
<script src="js/lib/howler.js?v6"></script>
<script src="js/lib/minpubsub.src.js?v7"></script>
<script src="js/lib/q.js?v7"></script>
<script src="js/lib/pixi.min.js?v7"></script>
<script src="js/lib/howler.js?v7"></script>
<script>var createjs = window;</script>
<script src="js/lib/tweenjs-0.6.2.min.js?v6"></script>
<script src="js/lib/tweenjs-0.6.2.min.js?v7"></script>
<script>Ticker.framerate=60; Ticker.paused=true;</script>
<script src="js/lib/sharing.js?v6"></script>
<script src="js/lib/sharing.js?v7"></script>
<!-- Core Engine -->
<script src="js/core/Loader.js?v6"></script>
<script src="js/core/Slideshow.js?v6"></script>
<script src="js/core/SlideSelect.js?v6"></script>
<script src="js/core/Button.js?v6"></script>
<script src="js/core/TextBox.js?v6"></script>
<script src="js/core/Words.js?v6"></script>
<script src="js/core/IncDecNumber.js?v6"></script>
<script src="js/core/Slider.js?v6"></script>
<script src="js/core/Scratcher.js?v6"></script>
<script src="js/core/Background.js?v6"></script>
<script src="js/core/ImageBox.js?v6"></script>
<script src="js/core/PayoffsUI.js?v6"></script>
<script src="js/core/Loader.js?v7"></script>
<script src="js/core/Slideshow.js?v7"></script>
<script src="js/core/SlideSelect.js?v7"></script>
<script src="js/core/Button.js?v7"></script>
<script src="js/core/TextBox.js?v7"></script>
<script src="js/core/Words.js?v7"></script>
<script src="js/core/IncDecNumber.js?v7"></script>
<script src="js/core/Slider.js?v7"></script>
<script src="js/core/Scratcher.js?v7"></script>
<script src="js/core/Background.js?v7"></script>
<script src="js/core/ImageBox.js?v7"></script>
<script src="js/core/PayoffsUI.js?v7"></script>
<!-- Simulations -->
<script src="js/sims/Splash.js?v6"></script>
<script src="js/sims/PD.js?v6"></script>
<script src="js/sims/Iterated.js?v6"></script>
<script src="js/sims/Tournament.js?v6"></script>
<script src="js/sims/SandboxUI.js?v6"></script>
<script src="js/sims/Splash.js?v7"></script>
<script src="js/sims/PD.js?v7"></script>
<script src="js/sims/Iterated.js?v7"></script>
<script src="js/sims/Tournament.js?v7"></script>
<script src="js/sims/SandboxUI.js?v7"></script>
<!-- Slides -->
<script src="js/slides/0_Slides_Intro.js?v6"></script>
<script src="js/slides/1_Slides_OneOff.js?v6"></script>
<script src="js/slides/2_Slides_Iterated.js?v6"></script>
<script src="js/slides/3_Slides_Tournament.js?v6"></script>
<script src="js/slides/4_Slides_Evolution.js?v6"></script>
<script src="js/slides/5_Slides_Distrust.js?v6"></script>
<script src="js/slides/6_Slides_Noise.js?v6"></script>
<script src="js/slides/7_Slides_Sandbox.js?v6"></script>
<script src="js/slides/8_Slides_Conclusion.js?v6"></script>
<script src="js/slides/9_Slides_Credits.js?v6"></script>
<script src="js/slides/0_Slides_Intro.js?v7"></script>
<script src="js/slides/1_Slides_OneOff.js?v7"></script>
<script src="js/slides/2_Slides_Iterated.js?v7"></script>
<script src="js/slides/3_Slides_Tournament.js?v7"></script>
<script src="js/slides/4_Slides_Evolution.js?v7"></script>
<script src="js/slides/5_Slides_Distrust.js?v7"></script>
<script src="js/slides/6_Slides_Noise.js?v7"></script>
<script src="js/slides/7_Slides_Sandbox.js?v7"></script>
<script src="js/slides/8_Slides_Conclusion.js?v7"></script>
<script src="js/slides/9_Slides_Credits.js?v7"></script>
<!-- Main Code -->
<script src="js/main.js?v6"></script>
<script src="js/main.js?v7"></script>

13
js/lib/helpers.js
View File

@ -173,4 +173,15 @@ function _makeMovieClip(resourceName, options){
// Gimme
return mc;
}
}
function _shuffleArray(array) {
var tmp, current, top = array.length;
if(top) while(--top) {
current = Math.floor(Math.random() * (top + 1));
tmp = array[current];
array[current] = array[top];
array[top] = tmp;
}
return array;
}

7
js/sims/Tournament.js
View File

@ -229,11 +229,8 @@ function Tournament(config){
self.agentsSorted = null;
self.playOneTournament = function(){
PD.playOneTournament(self.agents, Tournament.NUM_TURNS);
self.agentsSorted = self.agents.slice();
self.agentsSorted.sort(function(a,b){
if(a.coins==b.coins) return (Math.random()<0.5); // if equal, random
return a.coins-b.coins; // otherwise, sort as per usual
});
self.agentsSorted = _shuffleArray(self.agents.slice());
self.agentsSorted.sort(function(a,b){ return a.coins-b.coins; });
};
// Get rid of X worst