X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAntiking.js;h=f8c7465aeeed1cfc683c00b11b8c4c315efc90fb;hb=a37076f1ac8f4c19d9b34a60cbe89df86b88fa0b;hp=ac25c736c91299aa82a9ea0cf712d0d6f5ae6e3b;hpb=818ede16c09c2f5650d7a6b7b5ea42d6dd1a0c30;p=vchess.git

diff --git a/public/javascripts/variants/Antiking.js b/public/javascripts/variants/Antiking.js
index ac25c736..f8c7465a 100644
--- a/public/javascripts/variants/Antiking.js
+++ b/public/javascripts/variants/Antiking.js
@@ -1,4 +1,4 @@
-class AntikingRules
+class AntikingRules extends ChessRules
 {
 	// Path to pieces
 	static getPpath(b)
@@ -7,106 +7,142 @@ class AntikingRules
 	}
 
 	static get ANTIKING() { return 'a'; }
+	
+	initVariables(fen)
+	{
+		super.initVariables(fen);
+		this.antikingPos = {'w':[-1,-1], 'b':[-1,-1]};
+		const position = fen.split(" ")[0].split("/");
+		for (let i=0; i<position.length; i++)
+		{
+			let k = 0;
+			for (let j=0; j<position[i].length; j++)
+			{
+				switch (position[i].charAt(j))
+				{
+					case 'a':
+						this.antikingPos['b'] = [i,k];
+						break;
+					case 'A':
+						this.antikingPos['w'] = [i,k];
+						break;
+					default:
+						let num = parseInt(position[i].charAt(j));
+						if (!isNaN(num))
+							k += (num-1);
+				}
+				k++;
+			}
+		}
+	}
 
-	canTake(color1, color2, [x,y])
+	canTake([x1,y1], [x2,y2])
 	{
-		const piece = this.getPiece(x,y);
-		return (piece != "a" && color1 != color2) || (piece == "a" && color1 == color2);
+		const piece1 = this.getPiece(x1,y1);
+		const piece2 = this.getPiece(x2,y2);
+		const color1 = this.getColor(x1,y1);
+		const color2 = this.getColor(x2,y2);
+		return !["a","A"].includes(piece2) &&
+			((piece1 != "a" && color1 != color2) || (piece1 == "a" && color1 == color2));
 	}
 
 	getPotentialMovesFrom([x,y])
 	{
-		let c = this.getColor(x,y);
 		switch (this.getPiece(x,y))
 		{
 			case VariantRules.ANTIKING:
-				return this.getPotentialAntikingMoves(x,y,c);
+				return this.getPotentialAntikingMoves([x,y]);
 			default:
-				return super.getPotentielMovesFrom([x,y]);
+				return super.getPotentialMovesFrom([x,y]);
 		}
 	}
 
-// TODO: generaliser (à moindre coût) base_rules ? Ou spécialiser variantes ?
-
-	getPotentialAntikingMoves(x, y, c)
+	getPotentialAntikingMoves(sq)
 	{
-		// TODO
+		const V = VariantRules;
+		return this.getSlideNJumpMoves(sq,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
 
-// TODO: need to re-think some logic, since antikings capture same color
+	isAttacked(sq, colors)
+	{
+		return (super.isAttacked(sq, colors) || this.isAttackedByAntiking(sq, colors));
+	}
 
-	isAttacked(sq, color)
+	isAttackedByKing([x,y], colors)
 	{
-		return (this.isAttackedByPawn(sq, color)
-			|| this.isAttackedByRook(sq, color)
-			|| this.isAttackedByKnight(sq, color)
-			|| this.isAttackedByBishop(sq, color)
-			|| this.isAttackedByQueen(sq, color)
-			|| this.isAttackedByKing(sq, color)); //...
+		const V = VariantRules;
+		if (this.getPiece(x,y) == V.ANTIKING)
+			return false; //antiking is not attacked by king
+		return this.isAttackedBySlideNJump([x,y], colors, V.KING,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
 
-	isAttackedByAntiking(sq, color)
+	isAttackedByAntiking([x,y], colors)
 	{
-		// TODO
+		const V = VariantRules;
+		if (this.getPiece(x,y) == V.KING)
+			return false; //king is not attacked by antiking
+		return this.isAttackedBySlideNJump([x,y], colors, V.ANTIKING,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
 
-	underCheck(move, c)
+	underCheck(move)
 	{
-		this.play(move);
-		let res = this.isAttacked(this.kingPos[c], this.getOppCol(c));
-		// TODO: also check that antiking is still in check
+		const c = this.turn;
+		const oppCol = this.getOppCol(c);
+		this.play(move)
+		let res = this.isAttacked(this.kingPos[c], oppCol)
+			|| !this.isAttacked(this.antikingPos[c], oppCol);
 		this.undo(move);
 		return res;
 	}
 
-	getCheckSquares(move, c)
+	getCheckSquares(move)
 	{
+		let res = super.getCheckSquares(move);
 		this.play(move);
-		// TODO
-		let res = this.isAttacked(this.kingPos[c], this.getOppCol(c))
-			? [ JSON.parse(JSON.stringify(this.kingPos[c])) ] //need to duplicate!
-			: [ ];
+		const c = this.turn;
+		if (!this.isAttacked(this.antikingPos[c], this.getOppCol(c)))
+			res.push(JSON.parse(JSON.stringify(this.antikingPos[c])));
 		this.undo(move);
 		return res;
 	}
 
-	// Apply a move on board
-	static PlayOnBoard(board, move)
-	{
-		for (let psq of move.vanish)
-			board[psq.x][psq.y] = VariantRules.EMPTY;
-		for (let psq of move.appear)
-			board[psq.x][psq.y] = psq.c + psq.p;
-	}
-	// Un-apply the played move
-	static UndoOnBoard(board, move)
-	{
-		for (let psq of move.appear)
-			board[psq.x][psq.y] = VariantRules.EMPTY;
-		for (let psq of move.vanish)
-			board[psq.x][psq.y] = psq.c + psq.p;
-	}
-
-	// TODO: need antikingPos as well
 	updateVariables(move)
 	{
-		// ...
+		super.updateVariables(move);
+		const piece = this.getPiece(move.start.x,move.start.y);
+		const c = this.getColor(move.start.x,move.start.y);
+		// Update antiking position
+		if (piece == VariantRules.ANTIKING)
+		{
+			this.antikingPos[c][0] = move.appear[0].x;
+			this.antikingPos[c][1] = move.appear[0].y;
+		}
 	}
 
 	unupdateVariables(move)
 	{
-		// TODO
+		super.unupdateVariables(move);
+		const c = this.getColor(move.start.x,move.start.y);
+		if (this.getPiece(move.start.x,move.start.y) == VariantRules.ANTIKING)
+			this.antikingPos[c] = [move.start.x, move.start.y];
 	}
 
-	checkGameEnd(color)
+	checkGameEnd()
 	{
-		// TODO
-		if (!this.isAttacked(this.kingPos[color], this.getOppCol(color)))
+		const color = this.turn;
+		const oppCol = this.getOppCol(color);
+		if (!this.isAttacked(this.kingPos[color], oppCol)
+			&& this.isAttacked(this.antikingPos[color], oppCol))
+		{
 			return "1/2";
+		}
 		return color == "w" ? "0-1" : "1-0";
 	}
 
-	// Pieces values
+	// Pieces values (TODO: use Object.assign() + ChessRules.VALUES ?)
 	static get VALUES() {
 		return {
 			'p': 1,
@@ -121,55 +157,15 @@ class AntikingRules
 
 	static GenRandInitFen()
 	{
-		// TODO: no need all code, just add an antiking at rondom on 3rd ranks
-		let pieces = [new Array(8), new Array(8)];
-		// Shuffle pieces on first and last rank
-		for (let c = 0; c <= 1; c++)
-		{
-			let positions = _.range(8);
-
-			// Get random squares for bishops
-			let randIndex = 2 * _.random(3);
-			let bishop1Pos = positions[randIndex];
-			// The second bishop must be on a square of different color
-			let randIndex_tmp = 2 * _.random(3) + 1;
-			let bishop2Pos = positions[randIndex_tmp];
-			// Remove chosen squares
-			positions.splice(Math.max(randIndex,randIndex_tmp), 1);
-			positions.splice(Math.min(randIndex,randIndex_tmp), 1);
-
-			// Get random squares for knights
-			randIndex = _.random(5);
-			let knight1Pos = positions[randIndex];
-			positions.splice(randIndex, 1);
-			randIndex = _.random(4);
-			let knight2Pos = positions[randIndex];
-			positions.splice(randIndex, 1);
-
-			// Get random square for queen
-			randIndex = _.random(3);
-			let queenPos = positions[randIndex];
-			positions.splice(randIndex, 1);
-
-			// Rooks and king positions are now fixed, because of the ordering rook-king-rook
-			let rook1Pos = positions[0];
-			let kingPos = positions[1];
-			let rook2Pos = positions[2];
-
-			// Finally put the shuffled pieces in the board array
-			pieces[c][rook1Pos] = 'r';
-			pieces[c][knight1Pos] = 'n';
-			pieces[c][bishop1Pos] = 'b';
-			pieces[c][queenPos] = 'q';
-			pieces[c][kingPos] = 'k';
-			pieces[c][bishop2Pos] = 'b';
-			pieces[c][knight2Pos] = 'n';
-			pieces[c][rook2Pos] = 'r';
-		}
-		let fen = pieces[0].join("") +
-			"/pppppppp/8/8/8/8/PPPPPPPP/" +
-			pieces[1].join("").toUpperCase() +
-			" 1111"; //add flags
-		return fen;
+		let randFen = ChessRules.GenRandInitFen();
+		// Black side
+		let antikingPos = _.random(7);
+		let ranks23 = "pppppppp/" + (antikingPos>0?antikingPos:"") + "A" + (antikingPos<7?7-antikingPos:"");
+		randFen = randFen.replace("pppppppp/8", ranks23);
+		// White side
+		antikingPos = _.random(7);
+		ranks23 = (antikingPos>0?antikingPos:"") + "a" + (antikingPos<7?7-antikingPos:"") + "/PPPPPPPP";
+		randFen = randFen.replace("8/PPPPPPPP", ranks23);
+		return randFen;
 	}
 }