Experimental support for challenges from URL + ask specific color

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

diff --git a/client/src/variants/Koopa.js b/client/src/variants/Koopa.js
index 3f2e855..bc72d6d 100644 (file)
--- a/client/src/variants/Koopa.js
+++ b/client/src/variants/Koopa.js
@@ -184,7 +184,10 @@ export class KoopaRules extends ChessRules {
             m.appear[0].x = i;
             m.appear[0].y = j;
             // Is it a pawn on last rank?
-            if ((color == 'w' && i == 0) || (color == 'b' && i == 7)) {
+            if (
+              m.appear[0].p == V.PAWN &&
+              ((color == 'w' && i == 0) || (color == 'b' && i == 7))
+            ) {
               m.appear[0].p = V.ROOK;
               for (let ppiece of [V.KNIGHT, V.BISHOP, V.QUEEN]) {
                 let mp = JSON.parse(JSON.stringify(m));
@@ -232,9 +235,10 @@ export class KoopaRules extends ChessRules {
     // Base method is fine because a stunned king (which won't be detected)
     // can still castle after going back to normal.
     super.postPlay(move);
-    const kIdx = move.vanish.findIndex(v => v.p == "l");
+    const kIdx = move.vanish.findIndex(
+      (v,i) => v.p == 'l' || (i >= 1 && v.p == 'k'));
     if (kIdx >= 0)
-      // A stunned king vanish (game over)
+      // A (stunned or not) king vanish: game over
       this.kingPos[move.vanish[kIdx].c] = [-1, -1];
     move.stunned = JSON.stringify(this.stunned);
     // Array of stunned stage 1 pieces (just back to normal then)
@@ -265,9 +269,10 @@ export class KoopaRules extends ChessRules {
 
   postUndo(move) {
     super.postUndo(move);
-    const kIdx = move.vanish.findIndex(v => v.p == "l");
+    const kIdx = move.vanish.findIndex(
+      (v,i) => v.p == 'l' || (i >= 1 && v.p == 'k'));
     if (kIdx >= 0) {
-      // A stunned king vanished
+      // A king vanished
       this.kingPos[move.vanish[kIdx].c] =
         [move.vanish[kIdx].x, move.vanish[kIdx].y];
     }