Several small improvements + integrate options + first working draft of Cwda

[vchess.git] / client / src / variants / Titan.js

diff --git a/client/src/variants/Titan.js b/client/src/variants/Titan.js
index 427eecd..425e08d 100644 (file)
--- a/client/src/variants/Titan.js
+++ b/client/src/variants/Titan.js
@@ -154,6 +154,8 @@ export class TitanRules extends ChessRules {
     const [x, y] = [square[0], square[1]];
     if ((color == 'w' && x != 7) || (color == 'b' && x != 0)) return null;
     const selectedPiece = this.board[x][y][1];
+    // Prevent re-augmenting a chosen piece:
+    if (!ChessRules.PIECES.includes(selectedPiece)) return null;
     return new Move({
       appear: [
         new PiPo({
@@ -231,17 +233,16 @@ export class TitanRules extends ChessRules {
     if (this.movesCount > 4) {
       let piece = move.vanish[0].p;
       if (['j', 'l'].includes(piece)) piece = V.KING;
-      if (piece == V.KING && move.appear.length > 0)
-        this.kingPos[c] = [move.appear[0].x, move.appear[0].y];
+      if (piece == V.KING)
+        this.kingPos[move.appear[0].c] = [move.appear[0].x, move.appear[0].y];
       this.updateCastleFlags(move, piece);
     }
   }
 
   postUndo(move) {
     if (this.movesCount >= 4) {
-      const c = this.getColor(move.start.x, move.start.y);
       if (['j', 'k', 'l'].includes(this.getPiece(move.start.x, move.start.y)))
-        this.kingPos[c] = [move.start.x, move.start.y];
+        this.kingPos[move.vanish[0].c] = [move.start.x, move.start.y];
     }
   }