adding additional Knight check support

brozeph · Jan 22, 2014 · c1b40da · c1b40da
1 parent 8250cc0
commit c1b40da
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+0.1.8 / 2014-01-22
+==================
+
+	* additional verification of Knight check related to issue #4
+
 0.1.7 / 2014-01-21
 ==================
 

diff --git a/lib/board.js b/lib/board.js
@@ -20,6 +20,10 @@ var NeighborType = {
 	KnightAboveRight : { offset : 17 },
 	KnightBelowLeft : { offset : -17 },
 	KnightBelowRight : { offset : -15 },
+	KnightLeftAbove : { offset : 6 },
+	KnightLeftBelow : { offset : -10 },
+	KnightRightAbove : { offset : 10 },
+	KnightRightBelow : { offset : -6 },
 	Left : { offset : -1 },
 	Right : { offset : 1 }
 };

diff --git a/lib/boardValidation.js b/lib/boardValidation.js
@@ -234,9 +234,13 @@ BoardValidation.prototype.isSquareAttacked = function (sq) {
 
 		// fix for issue #4
 		isAttackedByKnight(this.board, board.NeighborType.KnightAboveRight) ||
+		isAttackedByKnight(this.board, board.NeighborType.KnightRightAbove) ||
 		isAttackedByKnight(this.board, board.NeighborType.KnightBelowRight) ||
+		isAttackedByKnight(this.board, board.NeighborType.KnightRightBelow) ||
 		isAttackedByKnight(this.board, board.NeighborType.KnightBelowLeft) ||
-		isAttackedByKnight(this.board, board.NeighborType.KnightAboveLeft);
+		isAttackedByKnight(this.board, board.NeighborType.KnightLeftBelow) ||
+		isAttackedByKnight(this.board, board.NeighborType.KnightAboveLeft) ||
+		isAttackedByKnight(this.board, board.NeighborType.KnightLeftAbove);
 };
 
 // begin evaluation of the valid moves for an entire board

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name" : "chess",
 	"description" : "An algebraic notation driven chess engine that can validate board position and produce a list of viable moves (notated).",
-	"version" : "0.1.7",
+	"version" : "0.1.8",
 	"author" : "Joshua Thomas <joshua.thomas@gmail.com>",
 	"engine" : "node >= 0.8.1",
 	"repository" : {

diff --git a/test/lib/gameValidation.js b/test/lib/gameValidation.js
@@ -5,7 +5,6 @@ var
 	gameValidation = requireWithCoverage('gameValidation');
 
 describe('GameValidation', function() {
-/*
 	// validate check
 	it('should properly indicate check', function() {
 		var g = game.create(),
@@ -25,8 +24,22 @@ describe('GameValidation', function() {
 			assert.strictEqual(result.isStalemate, false);
 		});
 	});
-*/
-	it('should properly indicate check due to Knight', function () {
+
+	// validate Knight check (part 1)
+	it('should properly indicate check due to Knight (part 1)', function () {
+		var g = game.create(),
+			b = g.board,
+			v = gameValidation.create(g);
+
+		b.move(b.getSquare('b1'), b.getSquare('c7'));
+
+		v.start(function (err, result) {
+			assert.strictEqual(result.isCheck, true);
+		});
+	});
+
+	// validate Knight check (part 2)
+	it('should properly indicate check due to Knight (part 2)', function () {
 		var g = game.create(),
 			b = g.board,
 			v = gameValidation.create(g);
@@ -41,7 +54,7 @@ describe('GameValidation', function() {
 			assert.strictEqual(result.isCheck, true);
 		});
 	});
-/*
+
 	// validate checkmate
 	it('should properly indicate checkmate', function() {
 		var g = game.create(),
@@ -231,5 +244,4 @@ describe('GameValidation', function() {
 			assert.strictEqual(result.isStalemate, false);
 		});
 	});
-*/
 });