projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Konane and Yote computer play + a few bugs
[vchess.git]
/
client
/
src
/
components
/
ComputerGame.vue
diff --git
a/client/src/components/ComputerGame.vue
b/client/src/components/ComputerGame.vue
index
f611167
..
fbf2d8e
100644
(file)
--- a/
client/src/components/ComputerGame.vue
+++ b/
client/src/components/ComputerGame.vue
@@
-48,11
+48,13
@@
export default {
// 250 = length of animation, 500 = delay between sub-moves
// TODO: a callback would be cleaner.
250 + (Array.isArray(compMove) ? (compMove.length - 1) * 750 : 0);
// 250 = length of animation, 500 = delay between sub-moves
// TODO: a callback would be cleaner.
250 + (Array.isArray(compMove) ? (compMove.length - 1) * 750 : 0);
- setTimeout(() => self.processMove(compMove), animationLength);
- self.compThink = false;
- if (self.game.score != "*")
- // User action
- self.$emit("game-stopped");
+ setTimeout(
+ () => {
+ self.compThink = false;
+ self.processMove(compMove);
+ },
+ animationLength
+ );
}, delay);
};
},
}, delay);
};
},
@@
-66,14
+68,14
@@
export default {
moves: []
};
game.fen = game.fenStart;
moves: []
};
game.fen = game.fenStart;
- if (this.gameInfo.mode == "versus")
- CompgameStorage.add(game);
+ if (this.gameInfo.mode == "versus") CompgameStorage.add(game);
}
if (!game.mycolor) game.mycolor = (Math.random() < 0.5 ? "w" : "b");
this.compWorker.postMessage(["init", game.fen]);
this.vr = new V(game.fen);
}
if (!game.mycolor) game.mycolor = (Math.random() < 0.5 ? "w" : "b");
this.compWorker.postMessage(["init", game.fen]);
this.vr = new V(game.fen);
- game.players = [{ name: "Myself" }, { name: "Computer" }];
- if (game.mycolor == "b") game.players = game.players.reverse();
+ game.players = [{ name: "Computer" }, { name: "Computer" }];
+ if (this.gameInfo.mode == "versus")
+ game.players[game.mycolor == 'w' ? 0 : 1] = { name: "Myself" };
game.score = "*"; //finished games are removed
game.mode = this.gameInfo.mode;
this.currentUrl = document.location.href; //to avoid playing outside page
game.score = "*"; //finished games are removed
game.mode = this.gameInfo.mode;
this.currentUrl = document.location.href; //to avoid playing outside page
@@
-92,15
+94,17
@@
export default {
},
processMove: function(move, scoreObj) {
playMove(move, this.vr);
},
processMove: function(move, scoreObj) {
playMove(move, this.vr);
- // This move could have ended the game:
+ // Maybe the user stopped the game:
+ if (this.game.score != "*") {
+ this.$emit("game-stopped");
+ return;
+ }
+ // This move could have ended the game
if (!scoreObj) scoreObj = { score: this.vr.getCurrentScore() };
if (scoreObj.score != "*") {
this.gameOver(scoreObj.score);
return;
}
if (!scoreObj) scoreObj = { score: this.vr.getCurrentScore() };
if (scoreObj.score != "*") {
this.gameOver(scoreObj.score);
return;
}
- if (this.game.score != "*")
- // The game already ended, probably because of a user action
- return;
// Send the move to web worker (including his own moves)
this.compWorker.postMessage(["newmove", move]);
if (this.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor)
// Send the move to web worker (including his own moves)
this.compWorker.postMessage(["newmove", move]);
if (this.gameInfo.mode == "auto" || this.vr.turn != this.game.mycolor)
@@
-115,7
+119,7
@@
export default {
},
gameOver: function(score) {
this.game.score = score;
},
gameOver: function(score) {
this.game.score = score;
- this.game.scoreMsg = getScoreMessage(score);
+ this.game.scoreMsg = getScoreMessage(score
, V.ReverseColors
);
// If comp is thinking, let him finish:
if (!this.compThink) this.$emit("game-stopped");
}
// If comp is thinking, let him finish:
if (!this.compThink) this.$emit("game-stopped");
}