X-Git-Url: https://git.auder.net/parser.js?a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=16e1fdbb739ad139fcbf3f97e1852e06b84ba4e3;hb=45109880413a50dec3a07298b987fb07d60630b2;hp=9d9ea378c7652fe126ff263d8dcce37a98274d1c;hpb=1dcf83e8cbf9dcaf25e47d269ba5e22c074d8efc;p=vchess.git
diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 9d9ea378..16e1fdbb 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -1,13 +1,15 @@
+// Game logic on a variant page
Vue.component('my-game', {
+ props: ["problem"],
data: function() {
return {
vr: null, //object to check moves, store them, FEN..
mycolor: "w",
possibleMoves: [], //filled after each valid click/dragstart
- choices: [], //promotion pieces, or checkered captures... (contain possible pieces)
+ choices: [], //promotion pieces, or checkered captures... (as moves)
start: {}, //pixels coordinates + id of starting square (click or drag)
selectedPiece: null, //moving piece (or clicked piece)
- conn: null, //socket messages
+ conn: null, //socket connection
score: "*", //'*' means 'unfinished'
mode: "idle", //human, friend, computer or idle (when not playing)
oppid: "", //opponent ID in case of HH game
@@ -16,12 +18,21 @@ Vue.component('my-game', {
fenStart: "",
incheck: [],
pgnTxt: "",
- expert: getCookie("expert") === "1" ? true : false,
- gameId: "", //used to limit computer moves' time
+ hints: (getCookie("hints") === "1" ? true : false),
+ color: getCookie("color", "lichess"), //lichess, chesscom or chesstempo
+ // sound level: 0 = no sound, 1 = sound only on newgame, 2 = always
+ sound: parseInt(getCookie("sound", "2")),
};
},
+ watch: {
+ problem: function(p, pp) {
+ // 'problem' prop changed: update board state
+ this.newGame("problem", p.fen, V.ParseFen(p.fen).turn);
+ },
+ },
render(h) {
- const [sizeX,sizeY] = VariantRules.size;
+ const [sizeX,sizeY] = [V.size.x,V.size.y];
+ const smallScreen = (window.innerWidth <= 420);
// Precompute hints squares to facilitate rendering
let hintSquares = doubleArray(sizeX, sizeY, false);
this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
@@ -40,6 +51,7 @@ Vue.component('my-game', {
"bottom": true, //display below
"seek": this.seek,
"playing": this.mode == "human",
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "accessibility")])
@@ -55,6 +67,7 @@ Vue.component('my-game', {
"tooltip":true,
"bottom": true,
"playing": this.mode == "computer",
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "computer")])
@@ -71,6 +84,7 @@ Vue.component('my-game', {
"tooltip":true,
"bottom": true,
"playing": this.mode == "friend",
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "people")])
@@ -82,10 +96,13 @@ Vue.component('my-game', {
const squareWidth = !!square00
? parseFloat(window.getComputedStyle(square00).width.slice(0,-2))
: 0;
- const indicWidth = (squareWidth>0 ? squareWidth/2 : 20);
+ const settingsBtnElt = document.getElementById("settingsBtn");
+ const indicWidth = !!settingsBtnElt //-2 for border:
+ ? parseFloat(window.getComputedStyle(settingsBtnElt).height.slice(0,-2)) - 2
+ : (smallScreen ? 31 : 37);
if (this.mode == "human")
{
- let connectedIndic = h(
+ const connectedIndic = h(
'div',
{
"class": {
@@ -102,7 +119,7 @@ Vue.component('my-game', {
);
elementArray.push(connectedIndic);
}
- let turnIndic = h(
+ const turnIndic = h(
'div',
{
"class": {
@@ -118,23 +135,46 @@ Vue.component('my-game', {
}
);
elementArray.push(turnIndic);
- let expertSwitch = h(
+ const settingsBtn = h(
'button',
{
- on: { click: this.toggleExpertMode },
- attrs: { "aria-label": 'Toggle expert mode' },
+ on: { click: this.showSettings },
+ attrs: {
+ "aria-label": 'Settings',
+ "id": "settingsBtn",
+ },
'class': {
- "tooltip":true,
+ "tooltip": true,
"topindicator": true,
"indic-right": true,
- "expert-switch": true,
- "expert-mode": this.expert,
+ "settings-btn": !smallScreen,
+ "settings-btn-small": smallScreen,
},
},
- [h('i', { 'class': { "material-icons": true } }, "visibility_off")]
+ [h('i', { 'class': { "material-icons": true } }, "settings")]
);
- elementArray.push(expertSwitch);
- let choices = h('div',
+ elementArray.push(settingsBtn);
+ if (this.mode == "problem")
+ {
+ // Show problem instructions
+ elementArray.push(
+ h('div',
+ {
+ attrs: { id: "instructions-div" },
+ "class": { "section-content": true },
+ },
+ [
+ h('p',
+ {
+ attrs: { id: "problem-instructions" },
+ domProps: { innerHTML: this.problem.instructions }
+ }
+ )
+ ]
+ )
+ );
+ }
+ const choices = h('div',
{
attrs: { "id": "choices" },
'class': { 'row': true },
@@ -169,7 +209,10 @@ Vue.component('my-game', {
})
);
// Create board element (+ reserves if needed by variant or mode)
- let gameDiv = h('div',
+ const lm = this.vr.lastMove;
+ const showLight = this.hints &&
+ (this.mode!="idle" || this.cursor==this.vr.moves.length);
+ const gameDiv = h('div',
{
'class': { 'game': true },
},
@@ -205,7 +248,7 @@ Vue.component('my-game', {
)
);
}
- if (!this.expert && hintSquares[ci][cj])
+ if (this.hints && hintSquares[ci][cj])
{
elems.push(
h(
@@ -221,9 +264,6 @@ Vue.component('my-game', {
)
);
}
- const lm = this.vr.lastMove;
- const showLight = !this.expert &&
- (this.mode!="idle" || this.cursor==this.vr.moves.length);
return h(
'div',
{
@@ -232,6 +272,7 @@ Vue.component('my-game', {
['board'+sizeY]: true,
'light-square': (i+j)%2==0,
'dark-square': (i+j)%2==1,
+ [this.color]: true,
'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}),
'incheck': showLight && incheckSq[ci][cj],
},
@@ -255,6 +296,7 @@ Vue.component('my-game', {
'class': {
"tooltip":true,
"bottom": true,
+ "small": smallScreen,
},
},
[h('i', { 'class': { "material-icons": true } }, "flag")])
@@ -266,15 +308,19 @@ Vue.component('my-game', {
actionArray = actionArray.concat([
h('button',
{
- style: { "margin-left": "30px" },
on: { click: e => this.undo() },
attrs: { "aria-label": 'Undo' },
+ "class": {
+ "small": smallScreen,
+ "marginleft": true,
+ },
},
[h('i', { 'class': { "material-icons": true } }, "fast_rewind")]),
h('button',
{
on: { click: e => this.play() },
attrs: { "aria-label": 'Play' },
+ "class": { "small": smallScreen },
},
[h('i', { 'class': { "material-icons": true } }, "fast_forward")]),
]
@@ -286,9 +332,12 @@ Vue.component('my-game', {
[
h('button',
{
- style: { "margin-left": "30px" },
on: { click: this.undoInGame },
attrs: { "aria-label": 'Undo' },
+ "class": {
+ "small": smallScreen,
+ "marginleft": true,
+ },
},
[h('i', { 'class': { "material-icons": true } }, "undo")]
),
@@ -296,6 +345,7 @@ Vue.component('my-game', {
{
on: { click: () => { this.mycolor = this.vr.getOppCol(this.mycolor) } },
attrs: { "aria-label": 'Flip' },
+ "class": { "small": smallScreen },
},
[h('i', { 'class': { "material-icons": true } }, "cached")]
),
@@ -323,7 +373,7 @@ Vue.component('my-game', {
}
}),
h('sup',
- {style: { "padding-left":"40%"} },
+ {"class": { "reserve-count": true } },
[ this.vr.reserve[this.mycolor][VariantRules.RESERVE_PIECES[i]] ]
)
]));
@@ -347,21 +397,25 @@ Vue.component('my-game', {
}
}),
h('sup',
- {style: { "padding-left":"40%"} },
+ {"class": { "reserve-count": true } },
[ this.vr.reserve[oppCol][VariantRules.RESERVE_PIECES[i]] ]
)
]));
}
let reserves = h('div',
{
- 'class':{'game':true},
- style: {"margin-bottom": "20px"},
+ 'class':{
+ 'game': true,
+ "reserve-div": true,
+ },
},
[
h('div',
{
- 'class': { 'row': true },
- style: {"margin-bottom": "15px"},
+ 'class': {
+ 'row': true,
+ "reserve-row-1": true,
+ },
},
myReservePiecesArray
),
@@ -373,7 +427,6 @@ Vue.component('my-game', {
);
elementArray.push(reserves);
}
- const eogMessage = this.getEndgameMessage(this.score);
const modalEog = [
h('input',
{
@@ -382,7 +435,7 @@ Vue.component('my-game', {
}),
h('div',
{
- attrs: { "role": "dialog", "aria-labelledby": "modal-eog" },
+ attrs: { "role": "dialog", "aria-labelledby": "eogMessage" },
},
[
h('div',
@@ -398,8 +451,9 @@ Vue.component('my-game', {
),
h('h3',
{
+ attrs: { "id": "eogMessage" },
"class": { "section": true },
- domProps: { innerHTML: eogMessage },
+ domProps: { innerHTML: this.endgameMessage },
}
)
]
@@ -409,6 +463,7 @@ Vue.component('my-game', {
];
elementArray = elementArray.concat(modalEog);
}
+ // NOTE: this modal could be in Pug view (no usage of Vue functions or variables)
const modalNewgame = [
h('input',
{
@@ -417,7 +472,7 @@ Vue.component('my-game', {
}),
h('div',
{
- attrs: { "role": "dialog", "aria-labelledby": "modal-newgame" },
+ attrs: { "role": "dialog", "aria-labelledby": "newGameTxt" },
},
[
h('div',
@@ -433,6 +488,7 @@ Vue.component('my-game', {
),
h('h3',
{
+ attrs: { "id": "newGameTxt" },
"class": { "section": true },
domProps: { innerHTML: "New game" },
}
@@ -457,7 +513,7 @@ Vue.component('my-game', {
}),
h('div',
{
- attrs: { "role": "dialog", "aria-labelledby": "modal-fenedit" },
+ attrs: { "role": "dialog", "aria-labelledby": "titleFenedit" },
},
[
h('div',
@@ -473,6 +529,7 @@ Vue.component('my-game', {
),
h('h3',
{
+ attrs: { "id": "titleFenedit" },
"class": { "section": true },
domProps: { innerHTML: "Position + flags (FEN):" },
}
@@ -515,6 +572,155 @@ Vue.component('my-game', {
)
];
elementArray = elementArray.concat(modalFenEdit);
+ const modalSettings = [
+ h('input',
+ {
+ attrs: { "id": "modal-settings", type: "checkbox" },
+ "class": { "modal": true },
+ }),
+ h('div',
+ {
+ attrs: { "role": "dialog", "aria-labelledby": "settingsTitle" },
+ },
+ [
+ h('div',
+ {
+ "class": { "card": true, "smallpad": true },
+ },
+ [
+ h('label',
+ {
+ attrs: { "id": "close-settings", "for": "modal-settings" },
+ "class": { "modal-close": true },
+ }
+ ),
+ h('h3',
+ {
+ attrs: { "id": "settingsTitle" },
+ "class": { "section": true },
+ domProps: { innerHTML: "Preferences" },
+ }
+ ),
+ h('fieldset',
+ { },
+ [
+ //h('legend', { domProps: { innerHTML: "Legend title" } }),
+ h('label',
+ {
+ attrs: { for: "setHints" },
+ domProps: { innerHTML: "Show hints?" },
+ },
+ ),
+ h('input',
+ {
+ attrs: {
+ "id": "setHints",
+ type: "checkbox",
+ checked: this.hints,
+ },
+ on: { "change": this.toggleHints },
+ }
+ ),
+ ]
+ ),
+ h('fieldset',
+ { },
+ [
+ h('label',
+ {
+ attrs: { for: "selectColor" },
+ domProps: { innerHTML: "Board colors" },
+ },
+ ),
+ h("select",
+ {
+ attrs: { "id": "selectColor" },
+ on: { "change": this.setColor },
+ },
+ [
+ h("option",
+ {
+ domProps: {
+ "value": "lichess",
+ innerHTML: "brown"
+ },
+ attrs: { "selected": this.color=="lichess" },
+ }
+ ),
+ h("option",
+ {
+ domProps: {
+ "value": "chesscom",
+ innerHTML: "green"
+ },
+ attrs: { "selected": this.color=="chesscom" },
+ }
+ ),
+ h("option",
+ {
+ domProps: {
+ "value": "chesstempo",
+ innerHTML: "blue"
+ },
+ attrs: { "selected": this.color=="chesstempo" },
+ }
+ ),
+ ],
+ ),
+ ]
+ ),
+ h('fieldset',
+ { },
+ [
+ h('label',
+ {
+ attrs: { for: "selectSound" },
+ domProps: { innerHTML: "Play sounds?" },
+ },
+ ),
+ h("select",
+ {
+ attrs: { "id": "selectSound" },
+ on: { "change": this.setSound },
+ },
+ [
+ h("option",
+ {
+ domProps: {
+ "value": "0",
+ innerHTML: "None"
+ },
+ attrs: { "selected": this.sound==0 },
+ }
+ ),
+ h("option",
+ {
+ domProps: {
+ "value": "1",
+ innerHTML: "Newgame"
+ },
+ attrs: { "selected": this.sound==1 },
+ }
+ ),
+ h("option",
+ {
+ domProps: {
+ "value": "2",
+ innerHTML: "All"
+ },
+ attrs: { "selected": this.sound==2 },
+ }
+ ),
+ ],
+ ),
+ ]
+ ),
+ ]
+ )
+ ]
+ )
+ ];
+ elementArray = elementArray.concat(modalSettings);
const actions = h('div',
{
attrs: { "id": "actions" },
@@ -523,11 +729,14 @@ Vue.component('my-game', {
actionArray
);
elementArray.push(actions);
- if (this.score != "*")
+ if (this.score != "*" && this.pgnTxt.length > 0)
{
elementArray.push(
h('div',
- { attrs: { id: "pgn-div" } },
+ {
+ attrs: { id: "pgn-div" },
+ "class": { "section-content": true },
+ },
[
h('a',
{
@@ -540,25 +749,60 @@ Vue.component('my-game', {
h('p',
{
attrs: { id: "pgn-game" },
- on: { click: this.download },
domProps: { innerHTML: this.pgnTxt }
}
- )
+ ),
+ h('button',
+ {
+ attrs: { "id": "downloadBtn" },
+ on: { click: this.download },
+ domProps: { innerHTML: "Download game" },
+ }
+ ),
]
)
);
}
else if (this.mode != "idle")
{
+ if (this.mode == "problem")
+ {
+ // Show problem solution (on click)
+ elementArray.push(
+ h('div',
+ {
+ attrs: { id: "solution-div" },
+ "class": { "section-content": true },
+ },
+ [
+ h('h3',
+ {
+ domProps: { innerHTML: "Show solution" },
+ on: { click: "toggleShowSolution" }
+ }
+ ),
+ h('p',
+ {
+ attrs: { id: "problem-solution" },
+ domProps: { innerHTML: this.problem.solution }
+ }
+ )
+ ]
+ )
+ );
+ }
// Show current FEN
elementArray.push(
h('div',
- { attrs: { id: "fen-div" } },
+ {
+ attrs: { id: "fen-div" },
+ "class": { "section-content": true },
+ },
[
h('p',
{
attrs: { id: "fen-string" },
- domProps: { innerHTML: this.vr.getFen() }
+ domProps: { innerHTML: this.vr.getBaseFen() }
}
)
]
@@ -588,18 +832,32 @@ Vue.component('my-game', {
elementArray
);
},
+ computed: {
+ endgameMessage: function() {
+ let eogMessage = "Unfinished";
+ switch (this.score)
+ {
+ case "1-0":
+ eogMessage = "White win";
+ break;
+ case "0-1":
+ eogMessage = "Black win";
+ break;
+ case "1/2":
+ eogMessage = "Draw";
+ break;
+ }
+ return eogMessage;
+ },
+ },
created: function() {
const url = socketUrl;
- const continuation = (localStorage.getItem("variant") === variant);
- this.myid = continuation ? localStorage.getItem("myid") : getRandString();
- if (!continuation)
- {
- // HACK: play a small silent sound to allow "new game" sound later if tab not focused
- new Audio("/sounds/silent.mp3").play().then(() => {}).catch(err => {});
- }
+ const humanContinuation = (localStorage.getItem("variant") === variant);
+ const computerContinuation = (localStorage.getItem("comp-variant") === variant);
+ this.myid = (humanContinuation ? localStorage.getItem("myid") : getRandString());
this.conn = new WebSocket(url + "/?sid=" + this.myid + "&page=" + variant);
const socketOpenListener = () => {
- if (continuation)
+ if (humanContinuation) //game VS human has priority
{
const fen = localStorage.getItem("fen");
const mycolor = localStorage.getItem("mycolor");
@@ -609,18 +867,27 @@ Vue.component('my-game', {
// Send ping to server (answer pong if opponent is connected)
this.conn.send(JSON.stringify({code:"ping",oppid:this.oppid}));
}
- else if (localStorage.getItem("newgame") === variant)
+ else if (computerContinuation)
{
- // New game request has been cancelled on disconnect
- this.newGame("human", undefined, undefined, undefined, undefined, "reconnect");
+ const fen = localStorage.getItem("comp-fen");
+ const mycolor = localStorage.getItem("comp-mycolor");
+ const moves = JSON.parse(localStorage.getItem("comp-moves"));
+ this.newGame("computer", fen, mycolor, undefined, moves, true);
}
};
const socketMessageListener = msg => {
const data = JSON.parse(msg.data);
switch (data.code)
{
+ case "duplicate":
+ // We opened another tab on the same game
+ this.mode = "idle";
+ this.vr = null;
+ alert("Already playing a game in this variant on another tab!");
+ break;
case "newgame": //opponent found
- this.newGame("human", data.fen, data.color, data.oppid); //oppid: opponent socket ID
+ // oppid: opponent socket ID
+ this.newGame("human", data.fen, data.color, data.oppid);
break;
case "newmove": //..he played!
this.play(data.move, "animate");
@@ -700,71 +967,91 @@ Vue.component('my-game', {
};
},
methods: {
+ toggleShowSolution: function() {
+ let problemSolution = document.getElementById("problem-solution");
+ problemSolution.style.display = problemSolution.style.display == "none"
+ ? "block"
+ : "none";
+ },
download: function() {
let content = document.getElementById("pgn-game").innerHTML;
content = content.replace(/
/g, "\n");
// Prepare and trigger download link
let downloadAnchor = document.getElementById("download");
downloadAnchor.setAttribute("download", "game.pgn");
- downloadAnchor.href = "data:text/plain;charset=utf-8," + encodeURIComponent(content);
+ downloadAnchor.href = "data:text/plain;charset=utf-8," +
+ encodeURIComponent(content);
downloadAnchor.click();
},
- endGame: function(score) {
- this.score = score;
+ showScoreMsg: function() {
let modalBox = document.getElementById("modal-eog");
modalBox.checked = true;
+ setTimeout(() => { modalBox.checked = false; }, 2000);
+ },
+ endGame: function(score) {
+ this.score = score;
+ this.showScoreMsg();
// Variants may have special PGN structure (so next function isn't defined here)
this.pgnTxt = this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode);
- setTimeout(() => { modalBox.checked = false; }, 2000);
- if (this.mode == "human")
+ if (["human","computer"].includes(this.mode))
this.clearStorage();
this.mode = "idle";
this.cursor = this.vr.moves.length; //to navigate in finished game
this.oppid = "";
},
- getEndgameMessage: function(score) {
- let eogMessage = "Unfinished";
- switch (this.score)
+ setStorage: function() {
+ if (this.mode=="human")
{
- case "1-0":
- eogMessage = "White win";
- break;
- case "0-1":
- eogMessage = "Black win";
- break;
- case "1/2":
- eogMessage = "Draw";
- break;
+ localStorage.setItem("myid", this.myid);
+ localStorage.setItem("oppid", this.oppid);
}
- return eogMessage;
- },
- setStorage: function() {
- localStorage.setItem("myid", this.myid);
- localStorage.setItem("variant", variant);
- localStorage.setItem("mycolor", this.mycolor);
- localStorage.setItem("oppid", this.oppid);
- localStorage.setItem("fenStart", this.fenStart);
- localStorage.setItem("moves", JSON.stringify(this.vr.moves));
- localStorage.setItem("fen", this.vr.getFen());
+ // 'prefix' = "comp-" to resume games vs. computer
+ const prefix = (this.mode=="computer" ? "comp-" : "");
+ localStorage.setItem(prefix+"variant", variant);
+ localStorage.setItem(prefix+"mycolor", this.mycolor);
+ localStorage.setItem(prefix+"fenStart", this.fenStart);
+ localStorage.setItem(prefix+"moves", JSON.stringify(this.vr.moves));
+ localStorage.setItem(prefix+"fen", this.vr.getFen());
},
updateStorage: function() {
- localStorage.setItem("moves", JSON.stringify(this.vr.moves));
- localStorage.setItem("fen", this.vr.getFen());
+ const prefix = (this.mode=="computer" ? "comp-" : "");
+ localStorage.setItem(prefix+"moves", JSON.stringify(this.vr.moves));
+ localStorage.setItem(prefix+"fen", this.vr.getFen());
},
clearStorage: function() {
- delete localStorage["variant"];
- delete localStorage["myid"];
- delete localStorage["mycolor"];
- delete localStorage["oppid"];
- delete localStorage["fenStart"];
- delete localStorage["fen"];
- delete localStorage["moves"];
+ if (this.mode=="human")
+ {
+ delete localStorage["myid"];
+ delete localStorage["oppid"];
+ }
+ const prefix = (this.mode=="computer" ? "comp-" : "");
+ delete localStorage[prefix+"variant"];
+ delete localStorage[prefix+"mycolor"];
+ delete localStorage[prefix+"fenStart"];
+ delete localStorage[prefix+"fen"];
+ delete localStorage[prefix+"moves"];
},
// HACK because mini-css tooltips are persistent after click...
getRidOfTooltip: function(elt) {
elt.style.visibility = "hidden";
setTimeout(() => { elt.style.visibility="visible"; }, 100);
},
+ showSettings: function(e) {
+ this.getRidOfTooltip(e.currentTarget);
+ document.getElementById("modal-settings").checked = true;
+ },
+ toggleHints: function() {
+ this.hints = !this.hints;
+ setCookie("hints", this.hints ? "1" : "0");
+ },
+ setColor: function(e) {
+ this.color = e.target.options[e.target.selectedIndex].value;
+ setCookie("color", this.color);
+ },
+ setSound: function(e) {
+ this.sound = parseInt(e.target.options[e.target.selectedIndex].value);
+ setCookie("sound", this.sound);
+ },
clickGameSeek: function(e) {
this.getRidOfTooltip(e.currentTarget);
if (this.mode == "human")
@@ -772,7 +1059,6 @@ Vue.component('my-game', {
if (this.seek)
{
this.conn.send(JSON.stringify({code:"cancelnewgame"}));
- delete localStorage["newgame"]; //cancel game seek
this.seek = false;
}
else
@@ -788,11 +1074,6 @@ Vue.component('my-game', {
this.getRidOfTooltip(e.currentTarget);
document.getElementById("modal-fenedit").checked = true;
},
- toggleExpertMode: function(e) {
- this.getRidOfTooltip(e.currentTarget);
- this.expert = !this.expert;
- setCookie("expert", this.expert ? "1" : "0");
- },
resign: function(e) {
this.getRidOfTooltip(e.currentTarget);
if (this.mode == "human" && this.oppConnected)
@@ -812,81 +1093,88 @@ Vue.component('my-game', {
{
const storageVariant = localStorage.getItem("variant");
if (!!storageVariant && storageVariant !== variant)
- {
- alert("Finish your " + storageVariant + " game first!");
- return;
- }
+ return alert("Finish your " + storageVariant + " game first!");
// Send game request and wait..
- localStorage["newgame"] = variant;
- this.seek = true;
- this.clearStorage(); //in case of
try {
this.conn.send(JSON.stringify({code:"newgame", fen:fen}));
} catch (INVALID_STATE_ERR) {
return; //nothing achieved
}
- if (continuation !== "reconnect") //TODO: bad HACK...
+ this.seek = true;
+ let modalBox = document.getElementById("modal-newgame");
+ modalBox.checked = true;
+ setTimeout(() => { modalBox.checked = false; }, 2000);
+ return;
+ }
+ if (mode == "computer" && !continuation)
+ {
+ const storageVariant = localStorage.getItem("comp-variant");
+ if (!!storageVariant && storageVariant !== variant)
{
- let modalBox = document.getElementById("modal-newgame");
- modalBox.checked = true;
- setTimeout(() => { modalBox.checked = false; }, 2000);
+ if (!confirm("Unfinished " + storageVariant +
+ " computer game will be erased"))
+ {
+ return;
+ }
}
- return;
}
- this.gameId = getRandString();
+ if (this.mode == "computer" && mode == "human")
+ {
+ // Save current computer game to resume it later
+ this.setStorage();
+ }
this.vr = new VariantRules(fen, moves || []);
this.score = "*";
this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
this.mode = mode;
- this.incheck = []; //in case of
- this.fenStart = (continuation ? localStorage.getItem("fenStart") : fen);
+ if (continuation && moves.length > 0) //NOTE: "continuation": redundant test
+ {
+ const lastMove = moves[moves.length-1];
+ this.vr.undo(lastMove);
+ this.incheck = this.vr.getCheckSquares(lastMove);
+ this.vr.play(lastMove, "ingame");
+ }
+ else
+ this.incheck = [];
+ if (continuation)
+ {
+ const prefix = (mode=="computer" ? "comp-" : "");
+ this.fenStart = localStorage.getItem(prefix+"fenStart");
+ }
+ else
+ this.fenStart = fen;
if (mode=="human")
{
// Opponent found!
- if (!continuation)
+ if (!continuation) //not playing sound on game continuation
{
- // Not playing sound on game continuation:
- new Audio("/sounds/newgame.mp3").play().then(() => {}).catch(err => {});
+ if (this.sound >= 1)
+ new Audio("/sounds/newgame.mp3").play().catch(err => {});
document.getElementById("modal-newgame").checked = false;
}
this.oppid = oppId;
- this.oppConnected = true;
+ this.oppConnected = !continuation;
this.mycolor = color;
this.seek = false;
- if (!!moves && moves.length > 0) //imply continuation
- {
- const lastMove = moves[moves.length-1];
- this.vr.undo(lastMove);
- this.incheck = this.vr.getCheckSquares(lastMove);
- this.vr.play(lastMove, "ingame");
- }
- delete localStorage["newgame"];
this.setStorage(); //in case of interruptions
}
else if (mode == "computer")
{
this.mycolor = Math.random() < 0.5 ? 'w' : 'b';
if (this.mycolor == 'b')
- setTimeout(this.playComputerMove, 500);
+ setTimeout(this.playComputerMove, 100); //small delay for drawing board
}
- //else: against a (IRL) friend: nothing more to do
+ //else: against a (IRL) friend or problem solving: nothing more to do
},
playComputerMove: function() {
const timeStart = Date.now();
- const nbMoves = this.vr.moves.length; //using played moves to know if search finished
- const gameId = this.gameId; //to know if game was reset before timer end
- setTimeout(
- () => {
- if (gameId != this.gameId)
- return; //game stopped
- const L = this.vr.moves.length;
- if (nbMoves == L || !this.vr.moves[L-1].notation) //move search didn't finish
- this.vr.shouldReturn = true;
- }, 5000);
const compMove = this.vr.getComputerMove();
// (first move) HACK: avoid selecting elements before they appear on page:
- const delay = Math.max(500-(Date.now()-timeStart), 0);
- setTimeout(() => this.play(compMove, "animate"), delay);
+ const delay = Math.max(250-(Date.now()-timeStart), 0);
+ setTimeout(() => {
+ if (this.mode == "computer") //Warning: mode could have changed!
+ this.play(compMove, "animate")
+ }, delay);
},
// Get the identifier of a HTML table cell from its numeric coordinates o.x,o.y.
getSquareId: function(o) {
@@ -928,11 +1216,18 @@ Vue.component('my-game', {
this.selectedPiece.style.top = 0;
this.selectedPiece.style.display = "inline-block";
this.selectedPiece.style.zIndex = 3000;
- let startSquare = this.getSquareFromId(e.target.parentNode.id);
- const iCanPlay = this.mode!="idle"
- && (this.mode=="friend" || this.vr.canIplay(this.mycolor,startSquare));
- this.possibleMoves = iCanPlay ? this.vr.getPossibleMovesFrom(startSquare) : [];
- // Next line add moving piece just after current image (required for Crazyhouse reserve)
+ const startSquare = this.getSquareFromId(e.target.parentNode.id);
+ this.possibleMoves = [];
+ if (this.mode != "idle")
+ {
+ const color = ["friend","problem"].includes(this.mode)
+ ? this.vr.turn
+ : this.mycolor;
+ if (this.vr.canIplay(color,startSquare))
+ this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare);
+ }
+ // Next line add moving piece just after current image
+ // (required for Crazyhouse reserve)
e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
}
},
@@ -955,16 +1250,20 @@ Vue.component('my-game', {
return;
e = e || window.event;
// Read drop target (or parentElement, parentNode... if type == "img")
- this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coordinates
+ this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
const [offsetX,offsetY] = !!e.clientX
? [e.clientX,e.clientY]
: [e.changedTouches[0].pageX, e.changedTouches[0].pageY];
let landing = document.elementFromPoint(offsetX, offsetY);
this.selectedPiece.style.zIndex = 3000;
- while (landing.tagName == "IMG") //classList.contains(piece) fails because of mark/highlight
+ // Next condition: classList.contains(piece) fails because of marks
+ while (landing.tagName == "IMG")
landing = landing.parentNode;
- if (this.start.id == landing.id) //a click: selectedPiece and possibleMoves already filled
+ if (this.start.id == landing.id)
+ {
+ // A click: selectedPiece and possibleMoves are already filled
return;
+ }
// OK: process move attempt
let endSquare = this.getSquareFromId(landing.id);
let moves = this.findMatchingMoves(endSquare);
@@ -995,7 +1294,7 @@ Vue.component('my-game', {
let translation = {x:rectEnd.x-rectStart.x, y:rectEnd.y-rectStart.y};
let movingPiece =
document.querySelector("#" + this.getSquareId(move.start) + " > img.piece");
- // HACK for animation (with positive translate, image slides "under background"...)
+ // HACK for animation (with positive translate, image slides "under background")
// Possible improvement: just alter squares on the piece's way...
squares = document.getElementsByClassName("board");
for (let i=0; i {
@@ -1012,7 +1312,7 @@ Vue.component('my-game', {
squares.item(i).style.zIndex = "auto";
movingPiece.style = {}; //required e.g. for 0-0 with KR swap
this.play(move);
- }, 200);
+ }, 250);
},
play: function(move, programmatic) {
if (!move)
@@ -1030,7 +1330,8 @@ Vue.component('my-game', {
// Not programmatic, or animation is over
if (this.mode == "human" && this.vr.turn == this.mycolor)
this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid}));
- new Audio("/sounds/chessmove1.mp3").play().then(() => {}).catch(err => {});
+ if (this.sound == 2)
+ new Audio("/sounds/chessmove1.mp3").play().catch(err => {});
if (this.mode != "idle")
{
this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
@@ -1041,16 +1342,25 @@ Vue.component('my-game', {
VariantRules.PlayOnBoard(this.vr.board, move);
this.$forceUpdate(); //TODO: ?!
}
- if (this.mode == "human")
+ if (["human","computer"].includes(this.mode))
this.updateStorage(); //after our moves and opponent moves
if (this.mode != "idle")
{
const eog = this.vr.checkGameOver();
if (eog != "*")
- this.endGame(eog);
+ {
+ if (["human","computer"].includes(this.mode))
+ this.endGame(eog);
+ else
+ {
+ // Just show score on screen (allow undo)
+ this.score = eog;
+ this.showScoreMsg();
+ }
+ }
}
if (this.mode == "computer" && this.vr.turn != this.mycolor)
- setTimeout(this.playComputerMove, 500);
+ setTimeout(this.playComputerMove, 250); //small delay for animation
},
undo: function() {
// Navigate after game is over