X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fvariants%2FUltima.js;h=6883c6f0cd5e474711468109726b1d6566de9a9c;hb=523da5d5adeb4abd8b165158485314d0e7de9cf4;hp=229910c2ec13fb9545413a7143c576944f93b14d;hpb=c364df7516985616b09ee9ec3c4671ed6fd3ef8b;p=vchess.git

diff --git a/public/javascripts/variants/Ultima.js b/public/javascripts/variants/Ultima.js
index 229910c2..6883c6f0 100644
--- a/public/javascripts/variants/Ultima.js
+++ b/public/javascripts/variants/Ultima.js
@@ -189,8 +189,8 @@ class UltimaRules extends ChessRules
 			// Check piece-king rectangle (if any) corners for enemy pieces
 			if (m.end.x == kp[0] || m.end.y == kp[1])
 				return; //"flat rectangle"
-			const corner1 = [Math.max(m.end.x,kp[0]), Math.min(m.end.y,kp[1])];
-			const corner2 = [Math.min(m.end.x,kp[0]), Math.max(m.end.y,kp[1])];
+			const corner1 = [m.end.x, kp[1]];
+			const corner2 = [kp[0], m.end.y];
 			for (let [i,j] of [corner1,corner2])
 			{
 				if (this.board[i][j] != VariantRules.EMPTY && this.getColor(i,j) == oppCol)
@@ -480,16 +480,25 @@ class UltimaRules extends ChessRules
 			{
 				// Try in opposite direction:
 				let [i,j] = [x-step[0],y-step[1]];
-				while (i>=0 && i<sizeX && j>=0 && j<sizeY && this.board[i][j] == V.EMPTY)
+				while (i>=0 && i<sizeX && j>=0 && j<sizeY)
 				{
-					i -= step[0];
-					j -= step[1];
-				}
-				if (i>=0 && i<sizeX && j>=0 && j<sizeY && colors.includes(this.getColor(i,j))
-					&& this.getPiece(i,j) == V.KNIGHT)
-				{
-					if (!this.isImmobilized([i,j]))
-						return true;
+					while (i>=0 && i<sizeX && j>=0 && j<sizeY && this.board[i][j] == V.EMPTY)
+					{
+						i -= step[0];
+						j -= step[1];
+					}
+					if (i>=0 && i<sizeX && j>=0 && j<sizeY)
+					{
+						if (colors.includes(this.getColor(i,j)))
+						{
+							if (this.getPiece(i,j) == V.KNIGHT && !this.isImmobilized([i,j]))
+								return true;
+							continue outerLoop;
+						}
+						// [else] Our color, could be captured
+						i -= step[0];
+						j -= step[1];
+					}
 				}
 			}
 		}