X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FCrazyhouse.js;h=b297f1fb78cbe776d3abb3d65e18ce2ac9d9da37;hb=9234226104764b91df9d677fb360ad538b98510c;hp=9cb076850f4f8d4b12dccd801bda1a1ef661a8fd;hpb=1221ac47836806efb287b0323b92957d9129c653;p=vchess.git

diff --git a/public/javascripts/variants/Crazyhouse.js b/public/javascripts/variants/Crazyhouse.js
index 9cb07685..b297f1fb 100644
--- a/public/javascripts/variants/Crazyhouse.js
+++ b/public/javascripts/variants/Crazyhouse.js
@@ -24,13 +24,25 @@ class CrazyhouseRules extends ChessRules
 				[V.QUEEN]: 0,
 			}
 		};
-		// May be a continuation: adjust numbers of pieces according to captures + rebirths
-		this.moves.forEach(m => {
-			if (m.vanish.length == 2)
-				this.reserve[m.appear[0].c][m.vanish[1].p]++;
-			else if (m.vanish.length == 0)
-				this.reserve[m.appear[0].c][m.appear[0].p]--;
-		});
+		const [sizeX,sizeY] = VariantRules.size;
+		this.promoted = doubleArray(sizeX, sizeY, false);
+		// May be a continuation: adjust numbers of pieces in reserve + promoted pieces
+		this.moves.forEach(m => { this.updateVariables(m); });
+	}
+
+	getColor(i,j)
+	{
+		const sizeX = VariantRules.size[0];
+		if (i >= sizeX)
+			return (i==sizeX ? "w" : "b");
+		return this.board[i][j].charAt(0);
+	}
+	getPiece(i,j)
+	{
+		const sizeX = VariantRules.size[0];
+		if (i >= sizeX)
+			return VariantRules.RESERVE_PIECES[j];
+		return this.board[i][j].charAt(1);
 	}
 
 	// Used by the interface:
@@ -39,7 +51,7 @@ class CrazyhouseRules extends ChessRules
 		return color + VariantRules.RESERVE_PIECES[index];
 	}
 
-	// Put an ordering on reserve pieces
+	// Ordering on reserve pieces
 	static get RESERVE_PIECES() {
 		const V = VariantRules;
 		return [V.PAWN,V.ROOK,V.KNIGHT,V.BISHOP,V.QUEEN];
@@ -52,11 +64,13 @@ class CrazyhouseRules extends ChessRules
 		if (this.reserve[color][p] == 0)
 			return [];
 		let moves = [];
-		for (let i=0; i<sizeX; i++)
+		const [sizeX,sizeY] = VariantRules.size;
+		const pawnShift = (p==VariantRules.PAWN ? 1 : 0);
+		for (let i=pawnShift; i<sizeX-pawnShift; i++)
 		{
 			for (let j=0; j<sizeY; j++)
 			{
-				if (this.board[i][j] != VariantRules.EMPTY)
+				if (this.board[i][j] == VariantRules.EMPTY)
 				{
 					let mv = new Move({
 						appear: [
@@ -66,7 +80,10 @@ class CrazyhouseRules extends ChessRules
 								c: color,
 								p: p
 							})
-						]
+						],
+						vanish: [],
+						start: {x:x, y:y}, //a bit artificial...
+						end: {x:i, y:j}
 					});
 					moves.push(mv);
 				}
@@ -78,10 +95,13 @@ class CrazyhouseRules extends ChessRules
 	getPotentialMovesFrom([x,y])
 	{
 		const sizeX = VariantRules.size[0];
-		if (x < sizeX)
-			return super.getPotentialMovesFrom([x,y]);
-		// Reserves, outside of board: x == sizeX
-		return this.getReserveMoves([x,y]);
+		if (x >= sizeX)
+		{
+			// Reserves, outside of board: x == sizeX(+1)
+			return this.getReserveMoves([x,y]);
+		}
+		// Standard moves
+		return super.getPotentialMovesFrom([x,y]);
 	}
 
 	getAllValidMoves()
@@ -90,7 +110,7 @@ class CrazyhouseRules extends ChessRules
 		const color = this.turn;
 		const sizeX = VariantRules.size[0];
 		for (let i=0; i<VariantRules.RESERVE_PIECES.length; i++)
-			moves = moves.concat(this.getReserveMoves([sizeX,i]));
+			moves = moves.concat(this.getReserveMoves([sizeX+(color=="w"?0:1),i]));
 		return this.filterValid(moves);
 	}
 
@@ -114,34 +134,80 @@ class CrazyhouseRules extends ChessRules
 	updateVariables(move)
 	{
 		super.updateVariables(move);
+		if (move.vanish.length == 2 && move.appear.length == 2)
+			return; //skip castle
 		const color = this.turn;
-		if (move.vanish.length==2)
-			this.reserve[color][move.appear[0].p]++;
-		if (move.vanish.length==0)
+		const V = VariantRules;
+		if (move.vanish.length == 0)
+		{
 			this.reserve[color][move.appear[0].p]--;
+			return;
+		}
+		move.movePromoted = this.promoted[move.start.x][move.start.y];
+		move.capturePromoted = this.promoted[move.end.x][move.end.y]
+		this.promoted[move.start.x][move.start.y] = false;
+		this.promoted[move.end.x][move.end.y] = move.movePromoted
+			|| (move.vanish[0].p == V.PAWN && move.appear[0].p != V.PAWN);
+		if (move.capturePromoted)
+			this.reserve[color][VariantRules.PAWN]++;
+		else if (move.vanish.length == 2)
+			this.reserve[color][move.vanish[1].p]++;
 	}
 
 	unupdateVariables(move)
 	{
 		super.unupdateVariables(move);
+		if (move.vanish.length == 2 && move.appear.length == 2)
+			return;
 		const color = this.turn;
-		if (move.vanish.length==2)
-			this.reserve[color][move.appear[0].p]--;
-		if (move.vanish.length==0)
+		const V = VariantRules;
+		if (move.vanish.length == 0)
+		{
 			this.reserve[color][move.appear[0].p]++;
+			return;
+		}
+		if (move.movePromoted)
+			this.promoted[move.start.x][move.start.y] = true;
+		this.promoted[move.end.x][move.end.y] = move.capturePromoted;
+		if (move.capturePromoted)
+			this.reserve[color][VariantRules.PAWN]--;
+		else if (move.vanish.length == 2)
+			this.reserve[color][move.vanish[1].p]--;
 	}
 
 	static get SEARCH_DEPTH() { return 2; } //high branching factor
 
+	evalPosition()
+	{
+		let evaluation = super.evalPosition();
+		// Add reserves:
+		for (let i=0; i<VariantRules.RESERVE_PIECES.length; i++)
+		{
+			const p = VariantRules.RESERVE_PIECES[i];
+			evaluation += this.reserve["w"][p] * VariantRules.VALUES[p];
+			evaluation -= this.reserve["b"][p] * VariantRules.VALUES[p];
+		}
+		return evaluation;
+	}
+
 	getNotation(move)
 	{
 		if (move.vanish.length > 0)
 			return super.getNotation(move);
 		// Rebirth:
 		const piece =
-			(move.appear[0].p != VariantRules.PAWN ? move.appear.p.toUpperCase() : "");
+			(move.appear[0].p != VariantRules.PAWN ? move.appear[0].p.toUpperCase() : "");
 		const finalSquare =
 			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
 		return piece + "@" + finalSquare;
 	}
+
+	getLongNotation(move)
+	{
+		if (move.vanish.length > 0)
+			return super.getLongNotation(move);
+		const finalSquare =
+			String.fromCharCode(97 + move.end.y) + (VariantRules.size[0]-move.end.x);
+		return "@" + finalSquare;
+	}
 }