wassname/cardsforscience
1
0
Fork 0
mirror of https://github.com/wassname/cardsforscience.git synced 2026-09-11 12:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing rules

Browse Source
This commit is contained in:
gitea
2016-03-01 11:04:28 +08:00
parent 903824d2e8
commit f91fd433da
3 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/game.js
+7 -7
View File
@@ -90,11 +90,11 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules,
// deal new initial cards that follow the rule
this.lastCards.splice(0,this.lastCards.length);
this.lastCards.push(_.sample(this.cards));
this.lastCards.push(angular.copy(_.sample(this.cards)));
var error,i;
for (i = 0; i < 52; i++) {
if (this.lastCards.length>2) break; // stop here
var card = _.sample(this.cards);
var card = angular.copy(_.sample(this.cards));
var res;
try{
res = this.rule.test(card,this.lastCards,this.cards);
@@ -103,9 +103,9 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules,
// in case of an error just add a random card
// this is probobly because it is looking back 2 or 3 cards
// yet we only have 1
this.lastCards.push(_.sample(this.cards));
this.lastCards.push(card);
}
if (res) this.lastCards.push(_.sample(this.cards));
if (res) this.lastCards.push(angular.copy(_.sample(this.cards)));
}
if (this.lastCards.length<3) {
console.warn(
@@ -119,9 +119,9 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules,
);
// feck, just deal 3 random then
this.lastCards.splice(0,this.lastCards.length);
this.lastCards.push(_.sample(this.cards));
this.lastCards.push(_.sample(this.cards));
this.lastCards.push(_.sample(this.cards));
this.lastCards.push(angular.copy(_.sample(this.cards)));
this.lastCards.push(angular.copy(_.sample(this.cards)));
this.lastCards.push(angular.copy(_.sample(this.cards)));
}
// this.lastCards.push.apply(this.lastCards,_.sampleSize(this.cards,3));