X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FGrand.js;h=7248f578cc771952e030db9436675719dae1bd56;hb=375ecdd1387e729f85ed114e82253469e4849869;hp=b598f2d29e2666a67645c09d1d2595186f3a95c5;hpb=2d7194bd9c976f444e43e5dc0a725823b6472eb9;p=vchess.git

diff --git a/public/javascripts/variants/Grand.js b/public/javascripts/variants/Grand.js
index b598f2d2..7248f578 100644
--- a/public/javascripts/variants/Grand.js
+++ b/public/javascripts/variants/Grand.js
@@ -18,10 +18,13 @@ class GrandRules extends ChessRules
 		return true;
 	}
 
-	static GenRandInitFen()
+	static ParseFen(fen)
 	{
-		const fen = ChessRules.GenRandInitFen();
-		return fen.replace(" w 1111", " w 1111 0000000000");
+		const fenParts = fen.split(" ");
+		return Object.assign(
+			ChessRules.ParseFen(fen),
+			{ captured: fenParts[4] }
+		);
 	}
 
 	getFen()
@@ -32,7 +35,7 @@ class GrandRules extends ChessRules
 	getCapturedFen()
 	{
 		let counts = _.map(_.range(10), 0);
-		for (let i=0; i<V.PIECES.length; i++)
+		for (let i=0; i<V.PIECES.length-1; i++) //-1: no king captured
 		{
 			counts[i] = this.captured["w"][V.PIECES[i]];
 			counts[5+i] = this.captured["b"][V.PIECES[i]];
@@ -215,13 +218,12 @@ class GrandRules extends ChessRules
 				// TODO: some redundant checks
 				if (epsq.x == x+shift && Math.abs(epsq.y - y) == 1)
 				{
-					let epStep = epsq.y - y;
-					var enpassantMove = this.getBasicMove([x,y], [x+shift,y+epStep]);
+					var enpassantMove = this.getBasicMove([x,y], [x+shift,epsq.y]);
 					enpassantMove.vanish.push({
 						x: x,
-						y: y+epStep,
+						y: epsq.y,
 						p: 'p',
-						c: this.getColor(x,y+epStep)
+						c: this.getColor(x,epsq.y)
 					});
 					moves.push(enpassantMove);
 				}
@@ -355,6 +357,8 @@ class GrandRules extends ChessRules
 		return pieces["b"].join("") +
 			"/pppppppppp/10/10/10/10/10/10/PPPPPPPPPP/" +
 			pieces["w"].join("").toUpperCase() +
-			" w 1111 -";
+			" w 1111 - 0000000000";
 	}
 }
+
+const VariantRules = GrandRules;