loading...
+
+
@@ -75,6 +76,11 @@ window.onload = function(){
Words.convert("lang/en.html")
]).then(function(){
+ // CHANGE DOM
+ document.body.removeChild($("#preloader"));
+ $("#main").style.display = "block";
+ $("#footer").style.display = "block";
+
// Slideshow
slideshow = new Slideshow({
dom: $("#slideshow"),
@@ -88,8 +94,12 @@ window.onload = function(){
});
slideSelect.dom.style.display = "none";
subscribe("start/game", function(){
- publish("slideshow/next");
slideSelect.dom.style.display = "block";
+
+ // [FOR DEBUGGING]
+ //publish("slideshow/next");
+ publish("slideshow/scratch", ["noise"]);
+
});
// LOAD REAL THINGS
@@ -105,7 +115,6 @@ window.onload = function(){
// First slide!
slideshow.nextSlide();
- //slideshow.gotoSlide("noise");
});
diff --git a/js/core/Scratcher.js b/js/core/Scratcher.js
index aabebc3..a160107 100644
--- a/js/core/Scratcher.js
+++ b/js/core/Scratcher.js
@@ -62,7 +62,7 @@ Scratcher.scratchAnim = function(dom, scratchIn){
setTimeout(function(){
var sound = scratchIn ? Loader.sounds.scratch_in : Loader.sounds.scratch_out;
- sound.volume(0.7).play();
+ sound.play();
},100);
return deferred.promise;
diff --git a/js/sims/Iterated.js b/js/sims/Iterated.js
index 4d6642a..98ba9a2 100644
--- a/js/sims/Iterated.js
+++ b/js/sims/Iterated.js
@@ -1,8 +1,14 @@
Loader.addToManifest(Loader.manifest,{
+
iterated_coin: "assets/iterated/iterated_coin.json",
iterated_machine: "assets/iterated/iterated_machine.json",
iterated_payoffs: "assets/iterated/iterated_payoffs.json",
- iterated_peep: "assets/iterated/iterated_peep.json"
+ iterated_peep: "assets/iterated/iterated_peep.json",
+
+ // SFX
+ coin_insert: "assets/sounds/coin_insert.mp3",
+ coin_get: "assets/sounds/coin_get.mp3",
+
});
function Iterated(config){
@@ -129,12 +135,14 @@ function Iterated(config){
// Make your moves!
var A = yourMove;
+ if(yourMove=="TRIP") A=PD.CHEAT;
var B = self.opponentLogic.play();
// Get payoffs
var payoffs = PD.getPayoffs(A,B);
// ANIMATE the moves: betrayal or what?
+ self.playerA.TRIP = (yourMove=="TRIP");
var animPromise1 = self.playerA.playMove(payoffs[0]); // reward, temptation, sucker, punishment, etc...
var animPromise2 = self.playerB.playMove(payoffs[1]);
@@ -169,6 +177,11 @@ function Iterated(config){
self.playOneRound(PD.CHEAT);
});
+ listen(self, "iterated/TRIP", function(){
+ publish("iterated/round/start");
+ self.playOneRound("TRIP");
+ });
+
listen(self, "iterated/newOpponent", function(id){
self.chooseOpponent(id);
self.playerA.resetFace();
@@ -306,8 +319,11 @@ function IteratedPeep(config){
/////// ACTUALLY ANIMATING THE MOVES ////////
/////////////////////////////////////////////
+ var _isTripping = false;
var _isHopping = false;
+ var _faceTripped = false;
var _hopTimer = 0;
+ var _faceTimer = 0;
self.update = function(delta){
// Blinking
@@ -317,13 +333,22 @@ function IteratedPeep(config){
if(self.face.currentFrame==1 && Math.random()<0.01) self.face.gotoAndStop(2);
}
+ // Face Tripped
+ if(_faceTripped){
+ _faceTimer += 0.25;
+ var frame = 18+(Math.floor(_faceTimer)%5);
+ self.face.gotoAndStop(frame);
+ }
+
// Hopping
- if(_isHopping){
- _hopTimer += delta;
- self.animated.y = -Math.abs(Math.sin(_hopTimer*0.4))*6;
- }else{
- self.animated.y = 0;
- _hopTimer = 0;
+ if(!_isTripping){
+ if(_isHopping){
+ _hopTimer += delta;
+ self.animated.y = -Math.abs(Math.sin(_hopTimer*0.4))*6;
+ }else{
+ self.animated.y = 0;
+ _hopTimer = 0;
+ }
}
};
@@ -351,7 +376,13 @@ function IteratedPeep(config){
Tween_get(self.coin)
.to({x:60, y:-75}, _s(0.1), Ease.circOut)
.wait(_s(0.2))
- .call(_animate2);
+ .call(function(){
+ if(self.TRIP){
+ _animate2_alt();
+ }else{
+ _animate2();
+ }
+ });
};
// Walk towards machine
@@ -362,21 +393,57 @@ function IteratedPeep(config){
.call(_animate3);
};
+ // ALT: Walk... and TRIP.
+ var _animate2_alt = function(){
+ _isHopping = true;
+ Tween_get(self.animated)
+ .to({x:70/5}, _s(0.1), Ease.linear)
+ .call(function(){
+ _isHopping = false;
+ _isTripping = true;
+ })
+ .to({rotation:Math.TAU/4.9, y:-11}, _s(0.05), Ease.quadIn)
+ .call(function(){
+ self.eyebrows.visible = false;
+ _faceTripped = true;
+ self.coin.visible = false;
+ g.scale.x = 1.2;
+ g.scale.y = 1/g.scale.x;
+ Tween_get(g.scale)
+ .to({x:1, y:1}, _s(0.5), Ease.elasticOut);
+ })
+ .wait(_s(0.1))
+ .call(_animate3_alt);
+ };
+
// Put coin in OR DON'T -- SHOW PAYOFF ON FACE
var _animate3 = function(){
_isHopping = false;
// Rewarded or Suckered: PUT COIN IN
if(self.payoff==PD.PAYOFFS.R || self.payoff==PD.PAYOFFS.S){
+
Tween_get(self.coin)
.to({x:95, y:-25}, _s(0.3), Ease.circInOut)
.call(function(){
+
self.restingFace = false;
self.eyebrows.visible = false;
if(self.payoff==PD.PAYOFFS.R) self.face.gotoAndStop(8); // Reward Face!
if(self.payoff==PD.PAYOFFS.S) self.face.gotoAndStop(9); // Sucker Face!
self.coin.visible = false;
+
+ // SOUND
+ if(config.opponent){
+ setTimeout(function(){
+ Loader.sounds.coin_insert.stereo(0.9).volume(0.3).play();
+ },50);
+ }else{
+ Loader.sounds.coin_insert.stereo(-0.9).volume(0.3).play();
+ }
+
});
+
}
// Punished or Tempted: DID NOT PUT COIN IN
@@ -405,6 +472,13 @@ function IteratedPeep(config){
};
+ // ALT: Show dizzy face lay down for a while
+ var _animate3_alt = function(){
+ Tween_get(self.animated)
+ .wait(_s(0.9))
+ .call(_animate4_alt);
+ };
+
// Walk back
var _animate4 = function(){
_isHopping = true;
@@ -413,20 +487,34 @@ function IteratedPeep(config){
.call(_animate5);
};
+ // ALT: Get back up
+ var _animate4_alt = function(){
+ Tween_get(self.animated)
+ .to({x:0, y:0, rotation:0}, _s(0.5), Ease.quadInOut)
+ .call(function(){
+ _isTripping = false;
+ _animate5();
+ });
+ };
+
// Face back to "normal", put coin back, get coins (if any) thrown at you
var _animate5 = function(){
_isHopping = false;
// Face back to normal
- self.restingFace = true;
+ if(!self.TRIP){
+ self.restingFace = true;
+ }
// Eyebrows, yo
- self.eyebrows.visible = true;
- if(self.payoff==PD.PAYOFFS.P) self.eyebrows.gotoAndStop(3); // Punishment
- if(self.payoff==PD.PAYOFFS.R) self.eyebrows.gotoAndStop(4); // Reward
- if(self.payoff==PD.PAYOFFS.S) self.eyebrows.gotoAndStop(5); // Sucker
- if(self.payoff==PD.PAYOFFS.T) self.eyebrows.gotoAndStop(6); // Temptation
+ if(!self.TRIP){
+ self.eyebrows.visible = true;
+ if(self.payoff==PD.PAYOFFS.P) self.eyebrows.gotoAndStop(3); // Punishment
+ if(self.payoff==PD.PAYOFFS.R) self.eyebrows.gotoAndStop(4); // Reward
+ if(self.payoff==PD.PAYOFFS.S) self.eyebrows.gotoAndStop(5); // Sucker
+ if(self.payoff==PD.PAYOFFS.T) self.eyebrows.gotoAndStop(6); // Temptation
+ }
// Put coin away if not already
if(self.coin.visible){
@@ -445,11 +533,22 @@ function IteratedPeep(config){
var c = self.payoffCoins[i];
c.x = 155;
c.y = -25;
- (function(c){
+ (function(c,i,payoff){
Tween_get(c)
.wait(_s(i*0.2+0.1))
.call(function(){
c.visible = true;
+
+ // COIN GET SOUND
+ if(self.payoff==PD.PAYOFFS.R && i==2) return; // NOT last coin.
+ if(config.opponent){
+ setTimeout(function(){
+ Loader.sounds.coin_get.stereo(0.9).volume(0.1).play();
+ },50);
+ }else{
+ Loader.sounds.coin_get.stereo(-0.9).volume(0.1).play();
+ }
+
})
.to({x:0}, _s(0.3), Ease.linear)
.call(function(){
@@ -459,7 +558,7 @@ function IteratedPeep(config){
.wait(_s(i*0.2+0.1))
.to({y:-120}, _s(0.15), Ease.circOut) // y
.to({y:-20}, _s(0.15), Ease.circIn); // y
- })(c);
+ })(c,i,self.payoff);
}
Tween_get(self.animated)
@@ -477,6 +576,11 @@ function IteratedPeep(config){
// DONE
var _animateDone = function(){
+ if(self.TRIP){
+ self.restingFace = true;
+ self.face.gotoAndStop(2); // BLINK
+ }
+ _faceTripped = false;
self.animationDeferred.resolve();
};
diff --git a/js/sims/SandboxUI.js b/js/sims/SandboxUI.js
index db282cc..cdd7ffb 100644
--- a/js/sims/SandboxUI.js
+++ b/js/sims/SandboxUI.js
@@ -14,7 +14,7 @@ function SandboxUI(config){
/////////////////////////////////////////
var playButton = new Button({
- x:130, y:135, text_id:"label_start",
+ x:172, y:135, text_id:"label_start", size:"short",
onclick: function(){
if(slideshow.objects.tournament.isAutoPlaying){
publish("tournament/autoplay/stop");
@@ -32,11 +32,11 @@ function SandboxUI(config){
dom.appendChild(playButton.dom);
var stepButton = new Button({
- x:130, y:135+70, text_id:"label_step", message:"tournament/step"
+ x:172, y:135+70, text_id:"label_step", message:"tournament/step", size:"short"
});
dom.appendChild(stepButton.dom);
- var resetButton = new Button({x:130, y:135+70*2, text_id:"label_reset", message:"tournament/reset"});
+ var resetButton = new Button({x:172, y:135+70*2, text_id:"label_reset", message:"tournament/reset", size:"short"});
dom.appendChild(resetButton.dom);
/////////////////////////////////////////
@@ -165,14 +165,14 @@ function SandboxUI(config){
var xDiff = 220;
var yDiff = 80;
var yOff = 40;
- _makePopulationControl( 0, yOff+0, "tft", 5);
- _makePopulationControl(xDiff, yOff+0, "all_d", 5);
- _makePopulationControl( 0, yOff+yDiff, "all_c", 15);
- _makePopulationControl(xDiff, yOff+yDiff, "grudge", 0);
- _makePopulationControl( 0, yOff+yDiff*2, "prober", 0);
- _makePopulationControl(xDiff, yOff+yDiff*2, "tf2t", 0);
- _makePopulationControl( 0, yOff+yDiff*3, "pavlov", 0);
- _makePopulationControl(xDiff, yOff+yDiff*3, "random", 0);
+ _makePopulationControl( 0, yOff+0, "tft", 3);
+ _makePopulationControl(xDiff, yOff+0, "all_d", 3);
+ _makePopulationControl( 0, yOff+yDiff, "all_c", 3);
+ _makePopulationControl(xDiff, yOff+yDiff, "grudge", 3);
+ _makePopulationControl( 0, yOff+yDiff*2, "prober", 3);
+ _makePopulationControl(xDiff, yOff+yDiff*2, "tf2t", 3);
+ _makePopulationControl( 0, yOff+yDiff*3, "pavlov", 3);
+ _makePopulationControl(xDiff, yOff+yDiff*3, "random", 4);
// Adjust the WHOLE population...
/******************************
@@ -267,11 +267,13 @@ function SandboxUI(config){
}
}
// If positive, add one starting from TOP, skipping anchor.
+ // (UNLESS IT'S ZERO)
if(diff>0){
for(var i=0; i0; i++){
// do NOT adjust anchor.
var conf = Tournament.INITIAL_AGENTS[i];
if(conf.strategy==peepID) continue;
+ if(conf.count==0) continue; // DO NOT ADD IF ZERO
conf.count++; // ADD
diff--; // yay
}
diff --git a/js/sims/Tournament.js b/js/sims/Tournament.js
index 46bb35f..1dc7f29 100644
--- a/js/sims/Tournament.js
+++ b/js/sims/Tournament.js
@@ -4,14 +4,14 @@ Tournament.resetGlobalVariables = function(){
Tournament.NUM_TURNS = 10;
Tournament.INITIAL_AGENTS = [
- {strategy:"tft", count:5},
- {strategy:"all_d", count:5},
- {strategy:"all_c", count:0},
- {strategy:"grudge", count:0},
- {strategy:"prober", count:0},
- {strategy:"tf2t", count:5},
- {strategy:"pavlov", count:5},
- {strategy:"random", count:5}
+ {strategy:"tft", count:3},
+ {strategy:"all_d", count:3},
+ {strategy:"all_c", count:3},
+ {strategy:"grudge", count:3},
+ {strategy:"prober", count:3},
+ {strategy:"tf2t", count:3},
+ {strategy:"pavlov", count:3},
+ {strategy:"random", count:4}
];
Tournament.FLOWER_CONNECTIONS = false;
@@ -335,7 +335,7 @@ function Tournament(config){
// ANIMATE
var _playIndex = 0;
var _tweenTimer = 0;
- app.ticker.add(function(delta) {
+ var _tick = function(delta){
// Tick
Tween.tick();
@@ -385,6 +385,7 @@ function Tournament(config){
// Middle...
_tweenTimer += self.isAutoPlaying ? 0.15 : 0.05;
+ if(_tweenTimer>1) _tweenTimer=1;
for(var i=0;iare nice, but not naive.
By simply copying the other player's moves, Copycats can play nice with each other, -while Always Cheats just cheat themselves. +while Always Cheats just cheat themselves! Not only that, but it also means Copycat can give Always Cheat a taste of their own medicine. @@ -497,7 +497,7 @@ However...
-There are jerks. Look around.
+Look around. There are jerks in the world.
If Copycat is the strategy in this repeated game of trust that's so powerful --
that even soldiers in World War I trenches independently "evolved" a similar strategy, called "live and let live" --
@@ -625,7 +625,7 @@ Being "nice" players, both their first moves will be:
And normally, they'd just pay back each others' kindness and sing Kumbaya until the end of time.
-But what if, while trying to reciprocate... +But what if, while trying to reciprocate goodness...
@@ -649,7 +649,7 @@ The other player, being a Copycat, had to retali
Thus, like the Hatfields and McCoys, these two Copycats will spiral into an endless cycle of vengeance... -that started over a single mistake, long, long ago. +that started over a single mistake, long ago.
Tragic. But now, are there other types of players who can... @@ -764,10 +764,10 @@ During each round, there's a [N]% chance a player makes a mistake:
-...once you're done playing around, let's recap +...and once you're done playing around, let's recap:
-what we've learnt → +what we learnt today →