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

diff --git a/public/javascripts/variants/Antiking.js b/public/javascripts/variants/Antiking.js
index 2770261a..f8c7465a 100644
--- a/public/javascripts/variants/Antiking.js
+++ b/public/javascripts/variants/Antiking.js
@@ -15,23 +15,23 @@ class AntikingRules extends ChessRules
 		const position = fen.split(" ")[0].split("/");
 		for (let i=0; i<position.length; i++)
 		{
-			let j = 0;
-			while (j < position[i].length)
+			let k = 0;
+			for (let j=0; j<position[i].length; j++)
 			{
 				switch (position[i].charAt(j))
 				{
 					case 'a':
-						this.antikingPos['b'] = [i,j];
+						this.antikingPos['b'] = [i,k];
 						break;
 					case 'A':
-						this.antikingPos['w'] = [i,j];
+						this.antikingPos['w'] = [i,k];
 						break;
 					default:
 						let num = parseInt(position[i].charAt(j));
 						if (!isNaN(num))
-							j += (num-1);
+							k += (num-1);
 				}
-				j++;
+				k++;
 			}
 		}
 	}
@@ -59,7 +59,9 @@ class AntikingRules extends ChessRules
 
 	getPotentialAntikingMoves(sq)
 	{
-		return this.getSlideNJumpMoves(sq, VariantRules.steps[VariantRules.QUEEN], "oneStep");
+		const V = VariantRules;
+		return this.getSlideNJumpMoves(sq,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
 
 	isAttacked(sq, colors)
@@ -67,13 +69,22 @@ class AntikingRules extends ChessRules
 		return (super.isAttacked(sq, colors) || this.isAttackedByAntiking(sq, colors));
 	}
 
+	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,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
+	}
+
 	isAttackedByAntiking([x,y], colors)
 	{
-		console.log(x + " " + y); //TODO: debug -1, -1 (wrong undo ?!)
-		if (this.getPiece(x,y) == VariantRules.KING)
+		const V = VariantRules;
+		if (this.getPiece(x,y) == V.KING)
 			return false; //king is not attacked by antiking
-		return super.isAttackedBySlideNJump([x,y], colors,
-			VariantRules.ANTIKING, VariantRules.steps[VariantRules.QUEEN], "oneStep");
+		return this.isAttackedBySlideNJump([x,y], colors, V.ANTIKING,
+			V.steps[V.ROOK].concat(V.steps[V.BISHOP]), "oneStep");
 	}
 
 	underCheck(move)