X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAntiking.js;h=25a9dfcd0fc3da080512f3859f1086cf1136f53b;hb=388e4c401f05b1f6a4c54e33c9da9114969a53c0;hp=014a9c8972e5d65861f88ddb0124fdda1569c761;hpb=9234226104764b91df9d677fb360ad538b98510c;p=vchess.git

diff --git a/public/javascripts/variants/Antiking.js b/public/javascripts/variants/Antiking.js
index 014a9c89..25a9dfcd 100644
--- a/public/javascripts/variants/Antiking.js
+++ b/public/javascripts/variants/Antiking.js
@@ -6,18 +6,23 @@ class AntikingRules extends ChessRules
 	}
 
 	static get ANTIKING() { return 'a'; }
-	
-	initVariables(fen)
+
+	static get PIECES()
 	{
-		super.initVariables(fen);
+		return ChessRules.PIECES.concat([V.ANTIKING]);
+	}
+
+	setOtherVariables(fen)
+	{
+		super.setOtherVariables(fen);
 		this.antikingPos = {'w':[-1,-1], 'b':[-1,-1]};
-		const position = fen.split(" ")[0].split("/");
-		for (let i=0; i<position.length; i++)
+		const rows = V.ParseFen(fen).position.split("/");
+		for (let i=0; i<rows.length; i++)
 		{
 			let k = 0;
-			for (let j=0; j<position[i].length; j++)
+			for (let j=0; j<rows[i].length; j++)
 			{
-				switch (position[i].charAt(j))
+				switch (rows[i].charAt(j))
 				{
 					case 'a':
 						this.antikingPos['b'] = [i,k];
@@ -26,7 +31,7 @@ class AntikingRules extends ChessRules
 						this.antikingPos['w'] = [i,k];
 						break;
 					default:
-						let num = parseInt(position[i].charAt(j));
+						const num = parseInt(rows[i].charAt(j));
 						if (!isNaN(num))
 							k += (num-1);
 				}
@@ -49,7 +54,7 @@ class AntikingRules extends ChessRules
 	{
 		switch (this.getPiece(x,y))
 		{
-			case VariantRules.ANTIKING:
+			case V.ANTIKING:
 				return this.getPotentialAntikingMoves([x,y]);
 			default:
 				return super.getPotentialMovesFrom([x,y]);
@@ -58,7 +63,6 @@ class AntikingRules extends ChessRules
 
 	getPotentialAntikingMoves(sq)
 	{
-		const V = VariantRules;
 		return this.getSlideNJumpMoves(sq,
 			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
@@ -70,7 +74,6 @@ class AntikingRules extends ChessRules
 
 	isAttackedByKing([x,y], colors)
 	{
-		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,
@@ -79,7 +82,6 @@ class AntikingRules extends ChessRules
 
 	isAttackedByAntiking([x,y], colors)
 	{
-		const V = VariantRules;
 		if ([V.KING,V.ANTIKING].includes(this.getPiece(x,y)))
 			return false; //(anti)king is not attacked by antiking
 		return this.isAttackedBySlideNJump([x,y], colors, V.ANTIKING,
@@ -111,10 +113,10 @@ class AntikingRules extends ChessRules
 	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);
+		const piece = move.vanish[0].p;
+		const c = move.vanish[0].c;
 		// Update antiking position
-		if (piece == VariantRules.ANTIKING)
+		if (piece == V.ANTIKING)
 		{
 			this.antikingPos[c][0] = move.appear[0].x;
 			this.antikingPos[c][1] = move.appear[0].y;
@@ -124,8 +126,8 @@ class AntikingRules extends ChessRules
 	unupdateVariables(move)
 	{
 		super.unupdateVariables(move);
-		const c = this.getColor(move.start.x,move.start.y);
-		if (this.getPiece(move.start.x,move.start.y) == VariantRules.ANTIKING)
+		const c = move.vanish[0].c;
+		if (move.vanish[0].p == V.ANTIKING)
 			this.antikingPos[c] = [move.start.x, move.start.y];
 	}
 
@@ -196,10 +198,11 @@ class AntikingRules extends ChessRules
 			+ "A" + (antikingPos["w"]<7?7-antikingPos["w"]:"");
 		const ranks23_white = (antikingPos["b"]>0?antikingPos["b"]:"") + "a"
 			+ (antikingPos["b"]<7?7-antikingPos["b"]:"") + "/PPPPPPPP";
-		let fen = pieces["b"].join("") + "/" + ranks23_black +
+		return pieces["b"].join("") + "/" + ranks23_black +
 			"/8/8/" +
 			ranks23_white + "/" + pieces["w"].join("").toUpperCase() +
-			" 1111";
-		return fen;
+			" w 1111 -";
 	}
 }
+
+const VariantRules = AntikingRules;