X-Git-Url: https://git.auder.net/parser.js?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FAtomic.js;h=a6934e739af546744f14d78a4a605ba8d3c14d30;hb=cf1303697774a12ef9bb154014a38797716944cf;hp=f32e21d1ff29717bc608ef825e0808de8bfdd254;hpb=1af36beb39aa5d59735483e915fd1040f93eecca;p=vchess.git

diff --git a/public/javascripts/variants/Atomic.js b/public/javascripts/variants/Atomic.js
index f32e21d1..a6934e73 100644
--- a/public/javascripts/variants/Atomic.js
+++ b/public/javascripts/variants/Atomic.js
@@ -30,10 +30,11 @@ class AtomicRules extends ChessRules
 
 	getPotentialKingMoves([x,y])
 	{
+		const V = VariantRules;
 		// King cannot capture:
 		let moves = [];
-		let [sizeX,sizeY] = VariantRules.size;
-		const steps = VariantRules.steps[VariantRules.QUEEN];
+		let [sizeX,sizeY] = V.size;
+		const steps = V.steps[V.ROOK].concat(V.steps[V.BISHOP]);
 		for (let step of steps)
 		{
 			var i = x + step[0];
@@ -72,7 +73,7 @@ class AtomicRules extends ChessRules
 				&& Math.abs(this.kingPos[c][1]-move.end.y) <= 1)
 			{
 				this.kingPos[c] = [-1,-1];
-				this.flags[c] = [false,false];
+				this.castleFlags[c] = [false,false];
 			}
 
 			// Did we explode opponent king ?
@@ -80,7 +81,7 @@ class AtomicRules extends ChessRules
 				&& Math.abs(this.kingPos[oppCol][1]-move.end.y) <= 1)
 			{
 				this.kingPos[oppCol] = [-1,-1];
-				this.flags[oppCol] = [false,false];
+				this.castleFlags[oppCol] = [false,false];
 			}
 			else
 			{
@@ -88,9 +89,9 @@ class AtomicRules extends ChessRules
 				if (Math.abs(move.end.x-oppFirstRank) <= 1)
 				{
 					if (Math.abs(move.end.y-this.INIT_COL_ROOK[oppCol][0]) <= 1)
-						this.flags[oppCol][0] = false;
+						this.castleFlags[oppCol][0] = false;
 					if (Math.abs(move.end.y-this.INIT_COL_ROOK[oppCol][1]) <= 1)
-						this.flags[oppCol][1] = false;
+						this.castleFlags[oppCol][1] = false;
 				}
 			}
 		}
@@ -126,7 +127,7 @@ class AtomicRules extends ChessRules
 			res = false;
 		// Otherwise, if we remain under check, move is not valid
 		else
-			res = this.isAttacked(this.kingPos[c], oppCol);
+			res = this.isAttacked(this.kingPos[c], [oppCol]);
 		this.undo(move);
 		return res;
 	}
@@ -140,7 +141,7 @@ class AtomicRules extends ChessRules
 		let res = [ ];
 		if (this.kingPos[c][0] < 0)
 			res = [saveKingPos];
-		else if (this.isAttacked(this.kingPos[c], this.getOppCol(c)))
+		else if (this.isAttacked(this.kingPos[c], [this.getOppCol(c)]))
 			res = [ JSON.parse(JSON.stringify(this.kingPos[c])) ]
 		this.undo(move);
 		return res;
@@ -152,7 +153,7 @@ class AtomicRules extends ChessRules
 		const kp = this.kingPos[color];
 		if (kp[0] < 0) //king disappeared
 			return color == "w" ? "0-1" : "1-0";
-		if (!this.isAttacked(kp, this.getOppCol(color)))
+		if (!this.isAttacked(kp, [this.getOppCol(color)]))
 			return "1/2";
 		// Checkmate
 		return color == "w" ? "0-1" : "1-0";