mirrors/not-gwent-online
1
0
Fork 0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-20 11:26:54 +00:00
Code Releases Activity

fix

Browse Source
This commit is contained in:
exane 2015-07-04 20:52:20 +02:00
parent f7590e4688
commit 44ba5363a2
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/scss/main.scss
View File

@ -126,7 +126,7 @@ $game-height: 800px;
height: 100px; height: 100px;
//width: 64px; //width: 64px;
background-position: 7px 20px; background-position: 7px 20px;
opacity: 0.8; opacity: 0.5;
} }

20
server/Battle.js
View File

@ -141,12 +141,17 @@ var Battle = (function(){
//console.log("current Turn: ", side.getName()); //console.log("current Turn: ", side.getName());
} }
r.getWinner = function() {
return this.p1.getRubies() ? this.p1 : this.p2;
}
r.startNextRound = function(){ r.startNextRound = function(){
var lastRound = this.checkRubies(); var lastRound = this.checkRubies();
var loser = lastRound.loser; var loser = lastRound.loser;
var winner = loser.foe; var winner = loser.foe;
if(this.checkIfIsOver()){ if(this.checkIfIsOver()){
//console.log("its over!"); //console.log("its over!");
var winner = this.getWinner();
this.gameOver(winner); this.gameOver(winner);
this.update(); this.update();
return; return;
@ -356,6 +361,21 @@ var Battle = (function(){
this.p1.removeRuby(); this.p1.removeRuby();
this.p2.removeRuby(); this.p2.removeRuby();
/*if(!this.p1.getRubies() && !this.p2.getRubies()) {
return {
loser: Math.random() > 0.5 ? this.p1 : this.p2,
isTie: false
}
}
if(!this.p1.getRubies()) {
return {
loser: this.p2,
isTie: false
}
}
*/
return { return {
loser: Math.random() > 0.5 ? this.p1 : this.p2, loser: Math.random() > 0.5 ? this.p1 : this.p2,
isTie: true isTie: true