krzysiej/jaipur-score
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Wyświetlanie zdobytych bonusowych monet w podsumowaniu rundy podczas pokazywania wyniku.

Browse Source
This commit is contained in:
kplaczek
2017-09-12 21:11:45 +02:00
parent d23944584d
commit 87b8fe37a3
4 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
js/script.js
View File

@@ -3,6 +3,11 @@ function coin(value, group) {
this.group = group;
}
function Bonus(group, value) {
this.value = value;
this.group = group;
}
function player(name, id) {
this.score = 0;
this.roundsWon = 0;
@@ -20,7 +25,7 @@ function player(name, id) {
score += this.coins[i];
}
for (var i in this.bonus) {
score += this.bonus[i];
score += this.bonus[i].value;
}
if (this.hasCamelCoin) {
@@ -80,7 +85,6 @@ function game(player1, player2, board) {
jaipur.showAcceptButton();
} else if (playerId == 2) {
jaipur.activePlayer = this.player2;
document.querySelector('.player.player1').classList.remove("selected");
document.querySelector('.player.player2').classList.add("selected");
jaipur.showAcceptButton();
@@ -88,7 +92,6 @@ function game(player1, player2, board) {
document.querySelector('.player.player1').classList.remove("selected");
document.querySelector('.player.player2').classList.remove("selected");
jaipur.activePlayer = false;
}
return this.activePlayer;
@@ -115,8 +118,6 @@ function game(player1, player2, board) {
var emptyRows = 0;
for (var i in board.goods) {
emptyRows += !board.goods[i].length ? 1 : 0;
console.info(board.goods[i]);
}
return emptyRows >= 3;
};
@@ -130,10 +131,9 @@ function game(player1, player2, board) {
});
};
//pokazuje ikonkę bonusowej monety przy przycisku przydziel
this.showBonusCoins = function () {
var selectedCoins = document.querySelectorAll('.coin.selected').length;
jaipur.hideBonusCoins();
if (selectedCoins >= 5 && !!jaipur.board.bonus.five.length) {
document.querySelector('.bonus5').style.display = 'block';
@@ -152,7 +152,6 @@ function game(player1, player2, board) {
this.showAcceptButton = function () {
console.info(jaipur.selectedCointType);
if (!!jaipur.activePlayer && !!document.querySelector('.coin.selected') &&
((document.querySelectorAll('.coin.selected').length >= 2 &&
['silver', 'gold', 'diamond'].indexOf(jaipur.selectedCointType) > -1
@@ -203,9 +202,8 @@ function game(player1, player2, board) {
jaipur.showBonus();
};
this.showBonus = function(){
this.showBonus = function () {
document.querySelector('.bonus_section').classList.add('show');
};
@@ -318,16 +316,20 @@ function game(player1, player2, board) {
jaipur.activePlayer.coins.push(parseInt(coins[i].innerText));
coins[i].remove();
}
//przydzielanie bonusu
var bonus = false;
if (coins.length == 3) {
var bonusGroup = 'three';
bonus = jaipur.board.bonus.three.pop()
bonus = new Bonus(3, jaipur.board.bonus.three.pop()); //{3: jaipur.board.bonus.three.pop()};
} else if (coins.length == 4) {
var bonusGroup = 'four';
bonus = jaipur.board.bonus.four.pop()
bonus = new Bonus(4, jaipur.board.bonus.four.pop()); //{3: jaipur.board.bonus.three.pop()};
// bonus = {4: jaipur.board.bonus.four.pop()};
} else if (coins.length >= 5) {
var bonusGroup = 'five';
bonus = jaipur.board.bonus.five.pop()
bonus = new Bonus(5, jaipur.board.bonus.five.pop()); //{3: jaipur.board.bonus.three.pop()};
// bonus = {5: jaipur.board.bonus.five.pop()};
}
if (!!bonus) {
@@ -344,10 +346,26 @@ function game(player1, player2, board) {
jaipur.setActivePlayer(false);
if (jaipur.isRoundOver()) {
jaipur.showScoreBoard();
jaipur.drawBonusCoins();
}
};
this.drawBonusCoins = function(){
for(var i in jaipur.player1.bonus){
var group = document.querySelector('.player1_bonus .bonus'+jaipur.player1.bonus[i].group);
var bonusCoin = document.createElement("span");
group.appendChild(bonusCoin);
}
for(var i in jaipur.player2.bonus){
var group = document.querySelector('.player2_bonus .bonus'+jaipur.player2.bonus[i].group);
var bonusCoin = document.createElement("span");
group.appendChild(bonusCoin);
}
};
this.initializeCamels = function () {