schachnovelle 1.0.0-beta-6 → 1.1.0

package/ui/Board.js

@@ -11,7 +11,6 @@ class Board {
     this.white = white
     this.black = black
     this.options = options
-    this.updatePieces()
 
     if (this.options.orientation === 'white') {
       this.files = files
@@ -25,19 +24,24 @@ class Board {
     this.utils = new Utils()
   }
 
+  clear () {
+    this.printer.clearView()
+  }
+
   render () {
-    this.updatePieces()
+    // this.topCheck()
     this.topRank()
     this.board()
     this.bottomRank()
+    // this.bottomCheck()
   }
 
   getPiece (file, rank) {
     const activeWhitePiece = this.white.pieces.find((piece) => {
-      return piece.pos[0] === file && piece.pos[1] === rank
+      return piece.pos[0] === file && piece.pos[1] === rank && !piece.captured
     })
     const activeBlackPiece = this.black.pieces.find((piece) => {
-      return piece.pos[0] === file && piece.pos[1] === rank
+      return piece.pos[0] === file && piece.pos[1] === rank && !piece.captured
     })
     if (this.options.mode === 'color') {
       if (activeWhitePiece) {
@@ -47,11 +51,25 @@ class Board {
       }
       return `   `
     } else if (this.options.mode === 'bare') {
+      /**
+       * Pieces
+       */
       if (activeWhitePiece) {
-        return chalk`{whiteBright ${activeWhitePiece.piece}}  `
+        if (activeWhitePiece.type === 'King' && this.white.inCheck) {
+          return chalk`{red ${activeWhitePiece.piece}}  `
+        } else {
+          return chalk`{black ${activeWhitePiece.piece}}  `
+        }
       } else if (activeBlackPiece) {
-        return chalk`{black ${activeBlackPiece.piece}}  `
+        if (activeBlackPiece.type === 'King' && this.black.inCheck) {
+          return chalk`{red ${activeBlackPiece.piece}}  `
+        } else {
+          return chalk`{black ${activeBlackPiece.piece}}  `
+        }
       }
+      /**
+       * Empty squares
+       */
       // If it's an odd rank it will start with black, so if you have an odd index in that rank, it will be black
       const rankParity = this.ranks.indexOf(rank) % 2 === 0 // the rank is odd
       const fileParity = this.files.indexOf(file) % 2 === 0 // the file is odd
@@ -63,12 +81,9 @@ class Board {
     }
   }
 
-  updatePieces () {
-    this.pieces = this.white.pieces.concat(this.black.pieces).filter((piece) => {
-      return !piece.captured
-    })
-  }
-
+  /**
+   * Returns all captured pieces from a color
+   */
   capturedPieces (color) {
     return this[color].pieces.filter((piece) => { return piece.captured })
   }
@@ -79,7 +94,7 @@ class Board {
   scoreBoard (side) {
     let scoreBoard = ''
     let score = 0
-    const opponent = this.utils.opponentColor(side)
+    const opponent = this.utils.opposingColor(side)
     const pieces = this.capturedPieces(opponent)
     
     if (pieces.length > 0) {
@@ -90,16 +105,37 @@ class Board {
           scoreBoard += this.printer.addSpace('x', `(${score})`)
         }
       })
+
       this.printer.print(scoreBoard)
-      this.printer.addSpace('y')
     }
+
+    this.printer.addSpace('y')
+  }
+
+  /**
+   * For development only. Display if the king is in check
+   */
+  topCheck () {
+    const side = this.utils.opposingColor(this.options.orientation)
+    this.printer.print(side + ' king in check: ' + this[side].inCheck)
+    this.printer.addSpace('y')
+  }
+
+  /**
+   * For development only. Display if the king is in check
+   */
+  bottomCheck () {
+    const side = this.options.orientation
+    this.printer.print(side + ' king in check: ' + this[side].inCheck)
+    this.printer.addSpace('y')
   }
 
   /**
    * Top signage
    */
   topRank () {
-    this.scoreBoard(this.utils.opponentColor(this.options.orientation))
+    const side = this.utils.opposingColor(this.options.orientation)
+    this.scoreBoard(side)
     let renderTopRank = this.printer.tab
     renderTopRank = this.printer.addSpace('x', renderTopRank)
     for (let file in this.files) {
@@ -165,7 +201,7 @@ class Board {
           renderRank = this.printer.addSpace('x', renderRank)
         }
         renderRank += ` ${this.ranks[rank]}`
-        this.printer.print(renderRank)
+        this.printer.printLine(renderRank)
         this.printer.addSpace('y')
       }
     }

package/ui/Fen.js

@@ -0,0 +1,5 @@
+export default {
+  currentPosition: null,
+  startPos: 'rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1',
+  moves: []
+}