X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=public%2Fjavascripts%2Fbase_rules.js;h=ec5f9372f826e15ea1f0b4848e001f67101c03fb;hb=0f51ef985c094530a63d242dddf514e66d23959b;hp=f07aaff263422efde7c1b243b3872859304183a6;hpb=2526c041baf44968b0aa7b98af56730e88f6a595;p=vchess.git

diff --git a/public/javascripts/base_rules.js b/public/javascripts/base_rules.js
index f07aaff2..ec5f9372 100644
--- a/public/javascripts/base_rules.js
+++ b/public/javascripts/base_rules.js
@@ -503,25 +503,25 @@ class ChessRules
 		// No: if happen on last 1/2 move, could lead to forbidden moves, wrong evals
 		return this.filterValid(potentialMoves);
 	}
-	
+
 	// Stop at the first move found
 	atLeastOneMove()
 	{
 		const color = this.turn;
 		const oppCol = this.getOppCol(color);
 		let [sizeX,sizeY] = VariantRules.size;
-		for (var i=0; i<sizeX; i++)
+		for (let i=0; i<sizeX; i++)
 		{
-			for (var j=0; j<sizeY; j++)
+			for (let j=0; j<sizeY; j++)
 			{
 				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) != oppCol)
 				{
 					const moves = this.getPotentialMovesFrom([i,j]);
 					if (moves.length > 0)
 					{
-						for (let i=0; i<moves.length; i++)
+						for (let k=0; k<moves.length; k++)
 						{
-							if (this.filterValid([moves[i]]).length > 0)
+							if (this.filterValid([moves[k]]).length > 0)
 								return true;
 						}
 					}
@@ -682,7 +682,7 @@ class ChessRules
 			this.castleFlags[c][flagIdx] = false;
 		}
 		else if (move.end.x == oppFirstRank //we took opponent rook?
-			&& this.INIT_COL_ROOK[c].includes(move.end.y))
+			&& this.INIT_COL_ROOK[oppCol].includes(move.end.y))
 		{
 			const flagIdx = (move.end.y == this.INIT_COL_ROOK[oppCol][0] ? 0 : 1);
 			this.castleFlags[oppCol][flagIdx] = false;
@@ -699,7 +699,6 @@ class ChessRules
 
 	play(move, ingame)
 	{
-		console.log("AVANT " + this.getNotation(move) + " "  + this.board[1][5]);
 		if (!!ingame)
 			move.notation = this.getNotation(move);
 
@@ -717,7 +716,6 @@ class ChessRules
 		this.moves.pop();
 		this.unupdateVariables(move);
 		this.parseFlags(JSON.parse(move.flags));
-		console.log("APRES " + this.getNotation(move) + " "  + this.board[1][5]);
 	}
 
 	//////////////
@@ -826,7 +824,7 @@ class ChessRules
 		for (let j=1; j<moves1.length && moves1[j].eval == moves1[0].eval; j++)
 			candidates.push(j);
 
-		//console.log(moves1.map(m => { return [this.getNotation(m), m.eval]; }));
+//		console.log(moves1.map(m => { return [this.getNotation(m), m.eval]; }));
 		return moves1[_.sample(candidates, 1)];
 	}
 
@@ -1003,7 +1001,7 @@ class ChessRules
 	// Context: just before move is played, turn hasn't changed
 	getNotation(move)
 	{
-		if (move.appear.length == 2)
+		if (move.appear.length == 2 && move.appear[0].p == VariantRules.KING)
 		{
 			// Castle
 			if (move.end.y < move.start.y)
@@ -1013,18 +1011,18 @@ class ChessRules
 		}
 
 		// Translate final square
-		let finalSquare =
+		const finalSquare =
 			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
 
-		let piece = this.getPiece(move.start.x, move.start.y);
+		const piece = this.getPiece(move.start.x, move.start.y);
 		if (piece == VariantRules.PAWN)
 		{
 			// Pawn move
 			let notation = "";
-			if (move.vanish.length > 1)
+			if (move.vanish.length > move.appear.length)
 			{
 				// Capture
-				let startColumn = String.fromCharCode(97 + move.start.y);
+				const startColumn = String.fromCharCode(97 + move.start.y);
 				notation = startColumn + "x" + finalSquare;
 			}
 			else //no capture
@@ -1037,7 +1035,8 @@ class ChessRules
 		else
 		{
 			// Piece movement
-			return piece.toUpperCase() + (move.vanish.length > 1 ? "x" : "") + finalSquare;
+			return piece.toUpperCase() +
+				(move.vanish.length > move.appear.length ? "x" : "") + finalSquare;
 		}
 	}
 
@@ -1048,6 +1047,7 @@ class ChessRules
 		pgn += '[Site "vchess.club"]<br>';
 		const d = new Date();
 		const opponent = mode=="human" ? "Anonymous" : "Computer";
+		pgn += '[Variant "' + variant + '"]<br>';
 		pgn += '[Date "' + d.getFullYear() + '-' + (d.getMonth()+1) + '-' + d.getDate() + '"]<br>';
 		pgn += '[White "' + (mycolor=='w'?'Myself':opponent) + '"]<br>';
 		pgn += '[Black "' + (mycolor=='b'?'Myself':opponent) + '"]<br>';