Fix multiplayer move making and free play

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = off

scripts/play/game-cycle.js

@@ -2,7 +2,7 @@ function hasClicked(cell) {
 	if (
 		!window.ingame
 		|| gameOptions.spectating
-		|| gameOptions.multiplayer && window.currentTurn !== window.playerTurn
+		|| gameOptions.multiplayer && global.currentTurn !== window.playerTurn[0]
 	) return;
 
 	const $cell = $.id('piece' + cell);
@@ -46,13 +46,18 @@ function hasClicked(cell) {
 
 		// move the piece
 		const moveOutput = validation.makeMove(startCell, endCell);
-		if (!moveOutput) {
-			console.log('I', startCell, '->', endCell);
-			if (getPieceClasses(endCell)[0] === colour) selectPiece(endCell);
-			else selectPiece(startCell);
-			return;
+		if (window.hasRules) {
+			if (!moveOutput) {
+				console.log('I', startCell, '->', endCell);
+				if (getPieceClasses(endCell)[0] === colour) selectPiece(endCell);
+				else selectPiece(startCell);
+				return;
+			}
+			createBoardFromFen(moveOutput);
+		}
+		else {
+			movePiece(startCell, endCell);
 		}
-		createBoardFromFen(moveOutput);
 		$$('td').forEach(elem => elem.classList.remove('last-move'));
 		$startCell.classList.add('last-move');
 		$endCell.classList.add('last-move');
@@ -90,7 +95,7 @@ function hasClicked(cell) {
 		}
 
 		// send to server
-		if (autoPing) sendDB(gameId, createFen());
+		if (window.autoPing) sendDB(window.gameId, createFen());
 
 	}
 
@@ -141,7 +146,7 @@ function undoLastMove() {
 	});
 	$('#log').removeChild($('#log').lastChild);
 	$('#winner').innerText = '';
-	if (window.autoPing) sendDB(gameId, createFen());
+	if (window.autoPing) sendDB(window.gameId, createFen());
 	if (gameOptions.bot && global.currentTurn === gameOptions.botColour[0]) undoLastMove();
 }
 

scripts/play/index.js

@@ -23,7 +23,7 @@ function run() {
 	window.ingame = true;
 	window.sessionLost = false;
 	window.totalMoves = 0;
-	window.lastMove = { start: null, end: null };
+	window.lastMove = { start: '', end: '' };
 	window.selectedCell = null;
 	window.playerTurn = 'white';
 	window.promotionPiece = 'queen';

scripts/play/pagelog.js

@@ -9,15 +9,13 @@ function log({ startCell, endCell, startClasses, endClasses, count, taken, promo
 
 	let code = ' ';
 	if (count % 2 === 1 && hasRules) code += '<br class="desktoponly">' + ((count + 1) / 2) + '. ';
-	if (castled) {
-		code += endCell.charCodeAt(0) < 'D'.charCodeAt(0) ? '0-0-0' : '0-0';
-	}
+	if (castled) code += endCell.charCodeAt(0) < 'D'.charCodeAt(0) ? '0-0-0' : '0-0';
 	else {
 		code += getPieceID(piece);
 		if (taken && piece === 'pawn') code += startCell[0].toLowerCase();
 		if (taken || enpassantTaken) code += 'x';
 		code += endCell.toLowerCase();
-		if (promoted) code += '=' + getPieceID(promotionPiece);
+		if (promoted) code += '=' + getPieceID(window.promotionPiece);
 	}
 	if (check) code += '+';
 	$('#log').innerHTML += `<span class="move">` + code + '</span>';
@@ -31,7 +29,7 @@ function logPoints() {
 
 function logTakenPiece(colour, piece) {
 	const takenPiece = createPiece(piece, colour);
-	takenPiece.setAttribute('data-move', totalMoves);
+	takenPiece.setAttribute('data-move', window.totalMoves);
 	$.id(colour + '-pieces').appendChild(takenPiece);
 	logPoints();
 }

scripts/play/pieces.js

@@ -43,15 +43,13 @@ function swapPiece(startCell, endCell) {
 		addPiece(endClasses[1], endClasses[0], startCell);
 		if (!startClasses.length) resetCell(endCell);
 	}
-	updateKingCells();
 }
 
 function movePiece(startCell, endCell) {
 	if (startCell === endCell) return;
 	const startClasses = getPieceClasses(startCell);
 	addPiece(startClasses[1], startClasses[0], endCell);
 	resetCell(startCell);
-	updateKingCells();
 }
 
 function setPromotion(elem) {
@@ -62,11 +60,6 @@ function setPromotion(elem) {
 	window.promotionPiece = piece;
 }
 
-function updateKingCells() {
-	kingCell.b = $('.black.king')?.parentNode.id;
-	kingCell.w = $('.white.king')?.parentNode.id;
-}
-
 function getPieceID(piece) {
 	switch (piece) {
 		case 'pawn': return '';

styles/play.nvss

@@ -89,10 +89,10 @@ td {
 	}
 }
 
-td.last-move {background-color: rgb(228, 230, 129) !important;}
-td.valid {background-color: rgb(155, 207, 144) !important;}
-td.check {background-color: rgb(231, 70, 70) !important;}
-td.selected {background-color: rgb(124, 192, 214) !important;}
+.last-move {background-color: rgb(228, 230, 129) !important;}
+.valid {background-color: rgb(155, 207, 144) !important;}
+.check {background-color: rgb(231, 70, 70) !important;}
+.selected {background-color: rgb(124, 192, 214) !important;}
 
 :is(tr:nth-child(odd) td:nth-child(even),
 tr:nth-child(even) td:nth-child(odd)) {
@@ -290,6 +290,8 @@ button.disabled {
 #taken-white-pieces {grid-area: white;}
 
 #sidebar {
+	max-height: var(--board-size);
+	overflow-y: scroll;
 	border: 2px solid #111;
 	background-color: #dcdcdc;
 	color: black;
@@ -313,8 +315,6 @@ button.disabled {
 	}
 
 	#log {
-		max-height: 494px;
-		overflow-wrap: break-word;
 		text-align: center;
 
 		.move {