X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FGrand.js;h=4271a6936d5415d386e6ecf105c776275a085f1c;hb=dc0d28e509798eede4f2ca969358400542cdfc7f;hp=ec2afd81fc98d5afd0fabe6dfcc21e07a3f3023d;hpb=643479f8d7c3622b57fc49c4f10d9950793ebf4f;p=vchess.git

diff --git a/public/javascripts/variants/Grand.js b/public/javascripts/variants/Grand.js
index ec2afd81..4271a693 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]];
@@ -355,7 +358,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";
 	}
 }