X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fgame.js;h=b308aa89405797a81c3d9315c16f7d7fc975acba;hp=91e13e455f384f773861b31503f4dee50436cfcc;hb=375ecdd1387e729f85ed114e82253469e4849869;hpb=5e27be422b4d93d8db080c74570dddf3548ee93e

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 91e13e45..b308aa89 100644
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -15,7 +15,7 @@ Vue.component('my-game', {
 			myid: "", //our ID, always set
 			oppid: "", //opponent ID in case of HH game
 			gameId: "", //useful if opponent started other human games after we disconnected
-			myname: getCookie("username","anonymous"),
+			myname: localStorage["username"] || "anonymous",
 			oppName: "anonymous", //opponent name, revealed after a game (if provided)
 			chats: [], //chat messages after human game
 			oppConnected: false,
@@ -23,10 +23,10 @@ Vue.component('my-game', {
 			fenStart: "",
 			incheck: [],
 			pgnTxt: "",
-			hints: (getCookie("hints") === "1" ? true : false),
-			color: getCookie("color", "lichess"), //lichess, chesscom or chesstempo
+			hints: (!localStorage["hints"] ? true : localStorage["hints"] === "1"),
+			color: localStorage["color"] || "lichess", //lichess, chesscom or chesstempo
 			// sound level: 0 = no sound, 1 = sound only on newgame, 2 = always
-			sound: parseInt(getCookie("sound", "2")),
+			sound: parseInt(localStorage["sound"] || "2"),
 			// Web worker to play computer moves without freezing interface:
 			compWorker: new Worker('/javascripts/playCompMove.js'),
 			timeStart: undefined, //time when computer starts thinking
@@ -40,7 +40,6 @@ Vue.component('my-game', {
 	},
 	render(h) {
 		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; });
@@ -53,46 +52,46 @@ Vue.component('my-game', {
 			h('button',
 			{
 				on: { click: this.clickGameSeek },
-				attrs: { "aria-label": 'New online game' },
+				attrs: { "aria-label": translations['New live game'] },
 				'class': {
 					"tooltip": true,
-					"bottom": true, //display below
+					"play": true,
 					"seek": this.seek,
 					"playing": this.mode == "human",
-					"small": smallScreen,
+					"spaceright": true,
 				},
 			},
 			[h('i', { 'class': { "material-icons": true } }, "accessibility")])
 		);
-		if (["idle","chat","computer"].includes(this.mode))
+		if (variant!="Dark" && ["idle","chat","computer"].includes(this.mode))
 		{
 			actionArray.push(
 				h('button',
 				{
 					on: { click: this.clickComputerGame },
-					attrs: { "aria-label": 'New game VS computer' },
+					attrs: { "aria-label": translations['New game versus computer'] },
 					'class': {
 						"tooltip":true,
-						"bottom": true,
+						"play": true,
 						"playing": this.mode == "computer",
-						"small": smallScreen,
+						"spaceright": true,
 					},
 				},
 				[h('i', { 'class': { "material-icons": true } }, "computer")])
 			);
 		}
-		if (["idle","chat","friend"].includes(this.mode))
+		if (variant!="Dark" && ["idle","chat","friend"].includes(this.mode))
 		{
 			actionArray.push(
 				h('button',
 				{
 					on: { click: this.clickFriendGame },
-					attrs: { "aria-label": 'New IRL game' },
+					attrs: { "aria-label": translations['Analysis mode'] },
 					'class': {
 						"tooltip":true,
-						"bottom": true,
+						"play": true,
 						"playing": this.mode == "friend",
-						"small": smallScreen,
+						"spaceright": true,
 					},
 				},
 				[h('i', { 'class': { "material-icons": true } }, "people")])
@@ -105,27 +104,33 @@ Vue.component('my-game', {
 				? parseFloat(window.getComputedStyle(square00).width.slice(0,-2))
 				: 0;
 			const settingsBtnElt = document.getElementById("settingsBtn");
-			const indicWidth = !!settingsBtnElt //-2 for border:
-				? parseFloat(window.getComputedStyle(settingsBtnElt).height.slice(0,-2)) - 2
-				: (smallScreen ? 31 : 37);
+			const settingsStyle = !!settingsBtnElt
+				? window.getComputedStyle(settingsBtnElt)
+				: {width:"46px", height:"26px"};
+			const [indicWidth,indicHeight] = //[44,24];
+			[
+				// NOTE: -2 for border
+				parseFloat(settingsStyle.width.slice(0,-2)) - 2,
+				parseFloat(settingsStyle.height.slice(0,-2)) - 2
+			];
+			let aboveBoardElts = [];
 			if (["chat","human"].includes(this.mode))
 			{
 				const connectedIndic = h(
 					'div',
 					{
 						"class": {
-							"topindicator": true,
 							"indic-left": true,
 							"connected": this.oppConnected,
 							"disconnected": !this.oppConnected,
 						},
 						style: {
 							"width": indicWidth + "px",
-							"height": indicWidth + "px",
+							"height": indicHeight + "px",
 						},
 					}
 				);
-				elementArray.push(connectedIndic);
+				aboveBoardElts.push(connectedIndic);
 			}
 			if (this.mode == "chat")
 			{
@@ -134,20 +139,19 @@ Vue.component('my-game', {
 					{
 						on: { click: this.startChat },
 						attrs: {
-							"aria-label": 'Start chat',
+							"aria-label": translations['Start chat'],
 							"id": "chatBtn",
 						},
 						'class': {
 							"tooltip": true,
-							"topindicator": true,
+							"play": true,
+							"above-board": true,
 							"indic-left": true,
-							"settings-btn": !smallScreen,
-							"settings-btn-small": smallScreen,
 						},
 					},
 					[h('i', { 'class': { "material-icons": true } }, "chat")]
 				);
-				elementArray.push(chatButton);
+				aboveBoardElts.push(chatButton);
 			}
 			else if (this.mode == "computer")
 			{
@@ -156,56 +160,59 @@ Vue.component('my-game', {
 					{
 						on: { click: this.clearComputerGame },
 						attrs: {
-							"aria-label": 'Clear computer game',
+							"aria-label": translations['Clear game versus computer'],
 							"id": "clearBtn",
 						},
 						'class': {
 							"tooltip": true,
-							"topindicator": true,
+							"play": true,
+							"above-board": true,
 							"indic-left": true,
-							"settings-btn": !smallScreen,
-							"settings-btn-small": smallScreen,
 						},
 					},
 					[h('i', { 'class': { "material-icons": true } }, "clear")]
 				);
-				elementArray.push(clearButton);
+				aboveBoardElts.push(clearButton);
 			}
 			const turnIndic = h(
 				'div',
 				{
 					"class": {
-						"topindicator": true,
 						"indic-right": true,
 						"white-turn": this.vr.turn=="w",
 						"black-turn": this.vr.turn=="b",
 					},
 					style: {
 						"width": indicWidth + "px",
-						"height": indicWidth + "px",
+						"height": indicHeight + "px",
 					},
 				}
 			);
-			elementArray.push(turnIndic);
+			aboveBoardElts.push(turnIndic);
 			const settingsBtn = h(
 				'button',
 				{
 					on: { click: this.showSettings },
 					attrs: {
-						"aria-label": 'Settings',
+						"aria-label": translations['Settings'],
 						"id": "settingsBtn",
 					},
 					'class': {
 						"tooltip": true,
-						"topindicator": true,
+						"play": true,
+						"above-board": true,
 						"indic-right": true,
-						"settings-btn": !smallScreen,
-						"settings-btn-small": smallScreen,
 					},
 				},
 				[h('i', { 'class': { "material-icons": true } }, "settings")]
 			);
-			elementArray.push(settingsBtn);
+			aboveBoardElts.push(settingsBtn);
+			elementArray.push(
+				h('div',
+					{ "class": { "aboveboard-wrapper": true } },
+					aboveBoardElts
+				)
+			);
 			if (this.mode == "problem")
 			{
 				// Show problem instructions
@@ -257,7 +264,11 @@ Vue.component('my-game', {
 								attrs: { "src": '/images/pieces/' +
 									VariantRules.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
 								'class': { 'choice-piece': true },
-								on: { "click": e => { this.play(m); this.choices=[]; } },
+								on: {
+									"click": e => { this.play(m); this.choices=[]; },
+									// NOTE: add 'touchstart' event to fix a problem on smartphones
+									"touchstart": e => { this.play(m); this.choices=[]; },
+								},
 							})
 						]
 					);
@@ -269,7 +280,10 @@ Vue.component('my-game', {
 				(!["idle","chat"].includes(this.mode) || this.cursor==this.vr.moves.length);
 			const gameDiv = h('div',
 				{
-					'class': { 'game': true },
+					'class': {
+						'game': true,
+						'clearer': true,
+					},
 				},
 				[_.range(sizeX).map(i => {
 					let ci = (this.mycolor=='w' ? i : sizeX-i-1);
@@ -284,7 +298,8 @@ Vue.component('my-game', {
 						_.range(sizeY).map(j => {
 							let cj = (this.mycolor=='w' ? j : sizeY-j-1);
 							let elems = [];
-							if (this.vr.board[ci][cj] != VariantRules.EMPTY)
+							if (this.vr.board[ci][cj] != VariantRules.EMPTY && (variant!="Dark"
+								|| this.score!="*" || this.vr.isEnlightened(ci,cj,this.mycolor)))
 							{
 								elems.push(
 									h(
@@ -328,6 +343,8 @@ Vue.component('my-game', {
 										'light-square': (i+j)%2==0,
 										'dark-square': (i+j)%2==1,
 										[this.color]: true,
+										'in-shadow': variant=="Dark" && this.score=="*"
+											&& !this.vr.isEnlightened(ci,cj,this.mycolor),
 										'highlight': showLight && !!lm && _.isMatch(lm.end, {x:ci,y:cj}),
 										'incheck': showLight && incheckSq[ci][cj],
 									},
@@ -347,11 +364,10 @@ Vue.component('my-game', {
 					h('button',
 						{
 							on: { click: this.resign },
-							attrs: { "aria-label": 'Resign' },
+							attrs: { "aria-label": translations['Resign'] },
 							'class': {
 								"tooltip":true,
-								"bottom": true,
-								"small": smallScreen,
+								"play": true,
 							},
 						},
 						[h('i', { 'class': { "material-icons": true } }, "flag")])
@@ -364,18 +380,21 @@ Vue.component('my-game', {
 					h('button',
 						{
 							on: { click: e => this.undo() },
-							attrs: { "aria-label": 'Undo' },
+							attrs: { "aria-label": translations['Undo'] },
 							"class": {
-								"small": smallScreen,
-								"marginleft": true,
+								"play": true,
+								"spaceleft": true,
 							},
 						},
 						[h('i', { 'class': { "material-icons": true } }, "fast_rewind")]),
 					h('button',
 						{
 							on: { click: e => this.play() },
-							attrs: { "aria-label": 'Play' },
-							"class": { "small": smallScreen },
+							attrs: { "aria-label": translations['Play'] },
+							"class": {
+								"play": true,
+								"spaceleft": true,
+							},
 						},
 						[h('i', { 'class': { "material-icons": true } }, "fast_forward")]),
 					]
@@ -388,10 +407,10 @@ Vue.component('my-game', {
 					h('button',
 						{
 							on: { click: this.undoInGame },
-							attrs: { "aria-label": 'Undo' },
+							attrs: { "aria-label": translations['Undo'] },
 							"class": {
-								"small": smallScreen,
-								"marginleft": true,
+								"play": true,
+								"spaceleft": true,
 							},
 						},
 						[h('i', { 'class': { "material-icons": true } }, "undo")]
@@ -399,8 +418,11 @@ Vue.component('my-game', {
 					h('button',
 						{
 							on: { click: () => { this.mycolor = this.vr.getOppCol(this.mycolor) } },
-							attrs: { "aria-label": 'Flip' },
-							"class": { "small": smallScreen },
+							attrs: { "aria-label": translations['Flip board'] },
+							"class": {
+								"play": true,
+								"spaceleft": true,
+							},
 						},
 						[h('i', { 'class': { "material-icons": true } }, "cached")]
 					),
@@ -415,13 +437,13 @@ Vue.component('my-game', {
 				{
 					myReservePiecesArray.push(h('div',
 					{
-						'class': {'board':true, ['board'+sizeY]:true},
+						'class': {'board':true, ['board'+sizeY+'-reserve']:true},
 						attrs: { id: this.getSquareId({x:sizeX+shiftIdx,y:i}) }
 					},
 					[
 						h('img',
 						{
-							'class': {"piece":true},
+							'class': {"piece":true, "reserve":true},
 							attrs: {
 								"src": "/images/pieces/" +
 									this.vr.getReservePpath(this.mycolor,i) + ".svg",
@@ -439,13 +461,13 @@ Vue.component('my-game', {
 				{
 					oppReservePiecesArray.push(h('div',
 					{
-						'class': {'board':true, ['board'+sizeY]:true},
+						'class': {'board':true, ['board'+sizeY+'-reserve']:true},
 						attrs: { id: this.getSquareId({x:sizeX+(1-shiftIdx),y:i}) }
 					},
 					[
 						h('img',
 						{
-							'class': {"piece":true},
+							'class': {"piece":true, "reserve":true},
 							attrs: {
 								"src": "/images/pieces/" +
 									this.vr.getReservePpath(oppCol,i) + ".svg",
@@ -495,7 +517,12 @@ Vue.component('my-game', {
 					[
 						h('div',
 							{
-								"class": { "card": true, "smallpad": true },
+								"class": {
+									"card": true,
+									"smallpad": true,
+									"small-modal": true,
+									"text-center": true,
+								},
 							},
 							[
 								h('label',
@@ -518,48 +545,6 @@ 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',
-				{
-					attrs: { "id": "modal-newgame", type: "checkbox" },
-					"class": { "modal": true },
-				}),
-			h('div',
-				{
-					attrs: { "role": "dialog", "aria-labelledby": "newGameTxt" },
-				},
-				[
-					h('div',
-						{
-							"class": { "card": true, "smallpad": true },
-						},
-						[
-							h('label',
-								{
-									attrs: { "id": "close-newgame", "for": "modal-newgame" },
-									"class": { "modal-close": true },
-								}
-							),
-							h('h3',
-								{
-									attrs: { "id": "newGameTxt" },
-									"class": { "section": true },
-									domProps: { innerHTML: "New game" },
-								}
-							),
-							h('p',
-								{
-									"class": { "section": true },
-									domProps: { innerHTML: "Waiting for opponent..." },
-								}
-							)
-						]
-					)
-				]
-			)
-		];
-		elementArray = elementArray.concat(modalNewgame);
 		const modalFenEdit = [
 			h('input',
 				{
@@ -586,7 +571,7 @@ Vue.component('my-game', {
 								{
 									attrs: { "id": "titleFenedit" },
 									"class": { "section": true },
-									domProps: { innerHTML: "Position + flags (FEN):" },
+									domProps: { innerHTML: translations["Game state (FEN):"] },
 								}
 							),
 							h('input',
@@ -607,7 +592,7 @@ Vue.component('my-game', {
 											this.newGame("friend", fen);
 										}
 									},
-									domProps: { innerHTML: "Ok" },
+									domProps: { innerHTML: translations["Ok"] },
 								}
 							),
 							h('button',
@@ -618,7 +603,7 @@ Vue.component('my-game', {
 												VariantRules.GenRandInitFen();
 										}
 									},
-									domProps: { innerHTML: "Random" },
+									domProps: { innerHTML: translations["Random"] },
 								}
 							),
 						]
@@ -653,7 +638,7 @@ Vue.component('my-game', {
 								{
 									attrs: { "id": "settingsTitle" },
 									"class": { "section": true },
-									domProps: { innerHTML: "Preferences" },
+									domProps: { innerHTML: translations["Preferences"] },
 								}
 							),
 							h('fieldset',
@@ -662,7 +647,7 @@ Vue.component('my-game', {
 									h('label',
 										{
 											attrs: { for: "nameSetter" },
-											domProps: { innerHTML: "My name is..." },
+											domProps: { innerHTML: translations["My name is..."] },
 										},
 									),
 									h('input',
@@ -683,7 +668,7 @@ Vue.component('my-game', {
 									h('label',
 										{
 											attrs: { for: "setHints" },
-											domProps: { innerHTML: "Show hints?" },
+											domProps: { innerHTML: translations["Show hints?"] },
 										},
 									),
 									h('input',
@@ -704,7 +689,7 @@ Vue.component('my-game', {
 									h('label',
 										{
 											attrs: { for: "selectColor" },
-											domProps: { innerHTML: "Board colors" },
+											domProps: { innerHTML: translations["Board colors"] },
 										},
 									),
 									h("select",
@@ -717,7 +702,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "lichess",
-														innerHTML: "brown"
+														innerHTML: translations["brown"]
 													},
 													attrs: { "selected": this.color=="lichess" },
 												}
@@ -726,7 +711,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "chesscom",
-														innerHTML: "green"
+														innerHTML: translations["green"]
 													},
 													attrs: { "selected": this.color=="chesscom" },
 												}
@@ -735,7 +720,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "chesstempo",
-														innerHTML: "blue"
+														innerHTML: translations["blue"]
 													},
 													attrs: { "selected": this.color=="chesstempo" },
 												}
@@ -750,7 +735,7 @@ Vue.component('my-game', {
 									h('label',
 										{
 											attrs: { for: "selectSound" },
-											domProps: { innerHTML: "Play sounds?" },
+											domProps: { innerHTML: translations["Play sounds?"] },
 										},
 									),
 									h("select",
@@ -763,7 +748,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "0",
-														innerHTML: "None"
+														innerHTML: translations["None"]
 													},
 													attrs: { "selected": this.sound==0 },
 												}
@@ -772,7 +757,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "1",
-														innerHTML: "Newgame"
+														innerHTML: translations["New game"]
 													},
 													attrs: { "selected": this.sound==1 },
 												}
@@ -781,7 +766,7 @@ Vue.component('my-game', {
 												{
 													domProps: {
 														"value": "2",
-														innerHTML: "All"
+														innerHTML: translations["All"]
 													},
 													attrs: { "selected": this.sound==2 },
 												}
@@ -808,7 +793,7 @@ Vue.component('my-game', {
 				{
 					attrs: { "id": "titleChat" },
 					"class": { "section": true },
-					domProps: { innerHTML: "Chat with " + this.oppName },
+					domProps: { innerHTML: translations["Chat with "] + this.oppName },
 				}
 			)
 		];
@@ -832,15 +817,16 @@ Vue.component('my-game', {
 					attrs: {
 						"id": "input-chat",
 						type: "text",
-						placeholder: "Type here",
+						placeholder: translations["Type here"],
 					},
 					on: { keyup: this.trySendChat }, //if key is 'enter'
 				}
 			),
 			h('button',
 				{
+					attrs: { id: "sendChatBtn"},
 					on: { click: this.sendChat },
-					domProps: { innerHTML: "Send" },
+					domProps: { innerHTML: translations["Send"] },
 				}
 			)
 		]);
@@ -900,7 +886,7 @@ Vue.component('my-game', {
 							{
 								attrs: { "id": "downloadBtn" },
 								on: { click: this.download },
-								domProps: { innerHTML: "Download game" },
+								domProps: { innerHTML: translations["Download game"] },
 							}
 						),
 					]
@@ -921,7 +907,8 @@ Vue.component('my-game', {
 						[
 							h('h3',
 								{
-									domProps: { innerHTML: "Show solution" },
+									"class": { clickable: true },
+									domProps: { innerHTML: translations["Show solution"] },
 									on: { click: this.toggleShowSolution },
 								}
 							),
@@ -935,33 +922,37 @@ Vue.component('my-game', {
 					)
 				);
 			}
-			// Show current FEN
-			elementArray.push(
-				h('div',
-					{
-						attrs: { id: "fen-div" },
-						"class": { "section-content": true },
-					},
-					[
-						h('p',
-							{
-								attrs: { id: "fen-string" },
-								domProps: { innerHTML: this.vr.getBaseFen() }
-							}
-						)
-					]
-				)
-			);
+			if (variant != "Dark" || this.score!="*")
+			{
+				// Show current FEN
+				elementArray.push(
+					h('div',
+						{
+							attrs: { id: "fen-div" },
+							"class": { "section-content": true },
+						},
+						[
+							h('p',
+								{
+									attrs: { id: "fen-string" },
+									domProps: { innerHTML: this.vr.getBaseFen() },
+									"class": { "text-center": true },
+								}
+							)
+						]
+					)
+				);
+			}
 		}
 		return h(
 			'div',
 			{
 				'class': {
 					"col-sm-12":true,
-					"col-md-8":true,
-					"col-md-offset-2":true,
-					"col-lg-6":true,
-					"col-lg-offset-3":true,
+					"col-md-10":true,
+					"col-md-offset-1":true,
+					"col-lg-8":true,
+					"col-lg-offset-2":true,
 				},
 				// NOTE: click = mousedown + mouseup
 				on: {
@@ -982,13 +973,13 @@ Vue.component('my-game', {
 			switch (this.score)
 			{
 				case "1-0":
-					eogMessage = "White win";
+					eogMessage = translations["White win"];
 					break;
 				case "0-1":
-					eogMessage = "Black win";
+					eogMessage = translations["Black win"];
 					break;
 				case "1/2":
-					eogMessage = "Draw";
+					eogMessage = translations["Draw"];
 					break;
 			}
 			return eogMessage;
@@ -1023,7 +1014,8 @@ Vue.component('my-game', {
 					// 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!");
+					alert(translations[
+						"Already playing a game in this variant on another tab!"]);
 					break;
 				case "newgame": //opponent found
 					// oppid: opponent socket ID
@@ -1130,7 +1122,7 @@ Vue.component('my-game', {
 	methods: {
 		setMyname: function(e) {
 			this.myname = e.target.value;
-			setCookie("username",this.myname);
+			localStorage["username"] = this.myname;
 		},
 		trySendChat: function(e) {
 			if (e.keyCode == 13) //'enter' key
@@ -1167,7 +1159,6 @@ Vue.component('my-game', {
 			setTimeout(() => { modalBox.checked = false; }, 2000);
 		},
 		endGame: function(score) {
-			console.log("call " + score + " " + this.mode);
 			this.score = score;
 			if (["human","computer"].includes(this.mode))
 			{
@@ -1226,6 +1217,7 @@ Vue.component('my-game', {
 			delete localStorage[prefix+"score"];
 		},
 		// HACK because mini-css tooltips are persistent after click...
+		// NOTE: seems to work only in chrome/chromium. TODO...
 		getRidOfTooltip: function(elt) {
 			elt.style.visibility = "hidden";
 			setTimeout(() => { elt.style.visibility="visible"; }, 100);
@@ -1245,15 +1237,15 @@ Vue.component('my-game', {
 		},
 		toggleHints: function() {
 			this.hints = !this.hints;
-			setCookie("hints", this.hints ? "1" : "0");
+			localStorage["hints"] = (this.hints ? "1" : "0");
 		},
 		setColor: function(e) {
 			this.color = e.target.options[e.target.selectedIndex].value;
-			setCookie("color", this.color);
+			localStorage["color"] = this.color;
 		},
 		setSound: function(e) {
 			this.sound = parseInt(e.target.options[e.target.selectedIndex].value);
-			setCookie("sound", this.sound);
+			localStorage["sound"] = this.sound;
 		},
 		clickGameSeek: function(e) {
 			this.getRidOfTooltip(e.currentTarget);
@@ -1294,7 +1286,10 @@ Vue.component('my-game', {
 			{
 				const storageVariant = localStorage.getItem("variant");
 				if (!!storageVariant && storageVariant !== variant)
-					return alert("Finish your " + storageVariant + " game first!");
+				{
+					return alert(translations["Finish your "] +
+							storageVariant + translations[" game first!"]);
+				}
 				// Send game request and wait..
 				try {
 					this.conn.send(JSON.stringify({code:"newgame", fen:fen}));
@@ -1317,20 +1312,17 @@ Vue.component('my-game', {
 				const storageVariant = localStorage.getItem("comp-variant");
 				if (!!storageVariant)
 				{
-					if (storageVariant !== variant)
+					const score = localStorage.getItem("comp-score");
+					if (storageVariant !== variant && score == "*")
 					{
-						if (!confirm("Unfinished " + storageVariant +
-							" computer game will be erased"))
+						if (!confirm(storageVariant +
+							translations[": unfinished computer game will be erased"]))
 						{
 							return;
 						}
 					}
-					else
-					{
-						const score = localStorage.getItem("comp-score");
-						if (score == "*")
-							return this.continueGame("computer");
-					}
+					else if (score == "*")
+						return this.continueGame("computer");
 				}
 			}
 			this.vr = new VariantRules(fen, []);
@@ -1371,6 +1363,7 @@ Vue.component('my-game', {
 			const fen = localStorage.getItem(prefix+"fen");
 			const score = localStorage.getItem(prefix+"score"); //set in "endGame()"
 			this.fenStart = localStorage.getItem(prefix+"fenStart");
+			this.vr = new VariantRules(fen, moves);
 			if (mode == "human")
 			{
 				this.gameId = localStorage.getItem("gameId");
@@ -1379,8 +1372,11 @@ Vue.component('my-game', {
 					code:"ping",oppid:this.oppid,gameId:this.gameId}));
 			}
 			else
+			{
 				this.compWorker.postMessage(["init",fen]);
-			this.vr = new VariantRules(fen, moves);
+				if (this.mycolor != this.vr.turn)
+					this.playComputerMove();
+			}
 			if (moves.length > 0)
 			{
 				const lastMove = moves[moves.length-1];
@@ -1552,8 +1548,6 @@ 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}));
-			if (this.sound == 2)
-				new Audio("/sounds/chessmove1.mp3").play().catch(err => {});
 			if (!["idle","chat"].includes(this.mode))
 			{
 				// Emergency check, if human game started "at the same time"
@@ -1562,6 +1556,8 @@ Vue.component('my-game', {
 					return;
 				this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
 				this.vr.play(move, "ingame");
+				if (this.sound == 2)
+					new Audio("/sounds/move.mp3").play().catch(err => {});
 				if (this.mode == "computer")
 				{
 					// Send the move to web worker (TODO: including his own moves?!)
@@ -1608,6 +1604,8 @@ Vue.component('my-game', {
 			if (!!lm)
 			{
 				this.vr.undo(lm);
+				if (this.sound == 2)
+					new Audio("/sounds/undo.mp3").play().catch(err => {});
 				const lmBefore = this.vr.lastMove;
 				if (!!lmBefore)
 				{