X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=base_rules.js;h=8ad54a42315492f312e5605e4edbcc662f7289b6;hb=8cc2f6d0a723c9583a99f9228bb441d8d8c5da5a;hp=e7d58b26ebfa2c5b7470ea13cf4213cf4cf7bbae;hpb=449d72e350051d3ddb86a360c7bb4a4327cbeb75;p=xogo.git

diff --git a/base_rules.js b/base_rules.js
index e7d58b2..8ad54a4 100644
--- a/base_rules.js
+++ b/base_rules.js
@@ -1347,6 +1347,8 @@ export default class ChessRules {
     });
   }
 
+// TODO: pawnfall + Cannibal issues
+
   pawnPostProcess(moves, color, oppCol) {
     let moreMoves = [];
     const lastRank = (color == "w" ? 0 : this.size.x - 1);
@@ -1361,7 +1363,12 @@ export default class ChessRules {
       );
       if (!promotionOk)
         return; //nothing to do
-      if (!this.options["pawnfall"]) {
+      if (this.options["pawnfall"]) {
+        m.appear.shift();
+        m.pawnfall = true; //required in prePlay() /// ????????????
+        return;
+      }
+      //if (!this.options["pawnfall"]) { --> OK
         if (
           this.options["cannibal"] &&
           this.board[x2][y2] != "" &&
@@ -1371,7 +1378,7 @@ export default class ChessRules {
         }
         else
           finalPieces = this.pawnPromotions;
-      }
+      //}
       m.appear[0].p = finalPieces[0];
       if (initPiece == "!") //cannibal king-pawn
         m.appear[0].p = C.CannibalKingCode[finalPieces[0]];
@@ -1386,8 +1393,6 @@ export default class ChessRules {
         }
         let newMove = this.getBasicMove([x1, y1], [x2, y2], tr);
         if (this.options["pawnfall"]) {
-          newMove.appear.shift();
-          newMove.pawnfall = true; //required in prePlay()
         }
         moreMoves.push(newMove);
       }
@@ -1946,6 +1951,11 @@ export default class ChessRules {
     });
   }
 
+
+// TODO: englober + de cas ici...
+    // + generique start/end board or reserve
+    // + bien séparer les options... ?
+
   prePlay(move) {
     if (
       typeof move.start.x == "number" &&
@@ -2154,6 +2164,10 @@ export default class ChessRules {
       return;
     }
     let movingPiece = this.getDomPiece(move.start.x, move.start.y);
+    if (!movingPiece) { //TODO this shouldn't be required
+      callback();
+      return;
+    }
     const initTransform = movingPiece.style.transform;
     let chessboard =
       document.getElementById(this.containerId).querySelector(".chessboard");