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

diff --git a/public/javascripts/variants/Grand.js b/public/javascripts/variants/Grand.js
index 22b24948..7248f578 100644
--- a/public/javascripts/variants/Grand.js
+++ b/public/javascripts/variants/Grand.js
@@ -27,11 +27,6 @@ class GrandRules extends ChessRules
 		);
 	}
 
-	static GenRandInitFen()
-	{
-		return ChessRules.GenRandInitFen() + " 0000000000";
-	}
-
 	getFen()
 	{
 		return super.getFen() + " " + this.getCapturedFen();
@@ -40,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]];
@@ -223,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);
 				}
@@ -363,7 +357,7 @@ 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";
 	}
 }