Amends produceSquares() to also function for Knight moves.

aryann · Nov 25, 2024 · edba247 · edba247
1 parent 5779d28
commit edba247
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/engine/src/moves.ts b/engine/src/moves.ts
@@ -240,21 +240,15 @@ export class MoveGenerator {
   }
 
   private generateKnightMoves(from: TSquare, piece: "N" | "n"): TMove[] {
-    const fromIndex = SQUARES.indexOf(from);
-    const rank = Math.floor(fromIndex / NUM_FILES);
-    const file = fromIndex % NUM_FILES;
-
     const moves: TMove[] = [];
 
     for (const offset of KNIGHT_OFFSETS) {
-      const newRank = rank + offset.rank;
-      const newFile = file + offset.file;
-
-      if (!isInRange(newFile, newRank)) {
+      const squares = produceSquares(from, offset);
+      if (squares.length !== 1) {
         continue;
       }
+      const to = squares[0];
 
-      const to = SQUARES[newRank * NUM_FILES + newFile];
       const destinationPiece = this.board.get(to);
       if (destinationPiece && getSide(piece) === getSide(destinationPiece)) {
         // There is a piece in the destination and it's of the same

diff --git a/engine/src/offsets.ts b/engine/src/offsets.ts
@@ -63,6 +63,8 @@ export const produceSquares = (
   let file = fromIndex % NUM_FILES;
   let rank = Math.floor(fromIndex / NUM_FILES);
 
+  const isKnightOffset = Math.abs(offset.file) + Math.abs(offset.rank) === 3;
+
   for (;;) {
     file += offset.file;
     rank += offset.rank;
@@ -76,6 +78,10 @@ export const produceSquares = (
     if (square === last) {
       break;
     }
+
+    if (isKnightOffset) {
+      break;
+    }
   }
 
   return squares;