A few fixes (Checkered, Loser)

[vchess.git] / public / javascripts / variants / Checkered.js

diff --git a/public/javascripts/variants/Checkered.js b/public/javascripts/variants/Checkered.js
index f1cf771..b702018 100644 (file)
--- a/public/javascripts/variants/Checkered.js
+++ b/public/javascripts/variants/Checkered.js
@@ -88,7 +88,7 @@ class CheckeredRules extends ChessRules
                                // A capture occured (m.vanish.length == 2)
                                m.appear[0].c = "c";
                                moves.push(m);
-                               if (m.appear[0].p != m.vanish[1].p //avoid promotions:
+                               if (m.appear[0].p != m.vanish[1].p //avoid promotions (already treated):
                                        && (m.vanish[0].p != VariantRules.PAWN || m.end.x != lastRank))
                                {
                                        // Add transformation into captured piece
@@ -190,13 +190,12 @@ class CheckeredRules extends ChessRules
        checkGameEnd()
        {
                const color = this.turn;
-               if (!this.isAttacked(this.kingPos[color], this.getOppCol(color))
-                       && !this.isAttacked(this.kingPos[color], 'c'))
-               {
-                       return "1/2";
-               }
-               // OK, checkmate
-               return color == "w" ? "0-1" : "1-0";
+               this.moves.length++; //artifically change turn, for checkered pawns (TODO)
+               const res = this.isAttacked(this.kingPos[color], [this.getOppCol(color),'c'])
+                       ? (color == "w" ? "0-1" : "1-0")
+                       : "1/2";
+               this.moves.length--;
+               return res;
        }
 
        evalPosition()