X-Git-Url: https://git.auder.net/game/current/gitweb.js?a=blobdiff_plain;f=base_rules.js;h=9cedfd054e9819a8408285fb916cb4a1828e718d;hb=296f846a620c361b3fe4e61f6bb369adc361d312;hp=20ffbee4cdddfc6661f1c031782937800b289827;hpb=6bf2ab3498d5d469ea456b528c178dc481789b76;p=xogo.git

diff --git a/base_rules.js b/base_rules.js
index 20ffbee..9cedfd0 100644
--- a/base_rules.js
+++ b/base_rules.js
@@ -97,6 +97,14 @@ export default class ChessRules {
     return true;
   }
 
+  // Allow to take (moving: not disappearing) own pieces?
+  get hasSelfCaptures() {
+    return (
+      this.options["recycle"] ||
+      (this.options["teleport"] && this.subTurnTeleport == 1)
+    );
+  }
+
   get hasReserve() {
     return (
       !!this.options["crazyhouse"] ||
@@ -1188,7 +1196,7 @@ export default class ChessRules {
   }
 
   pieces(color, x, y) {
-    const pawnShift = this.getPawnShift(color);
+    const pawnShift = this.getPawnShift(color || 'w');
     return {
       'p': {
         "class": "pawn",
@@ -1720,10 +1728,7 @@ export default class ChessRules {
       });
       Array.prototype.push.apply(squares, zenCaptures);
     }
-    if (
-      this.options["recycle"] ||
-      (this.options["teleport"] && this.subTurnTeleport == 1)
-    ) {
+    if (this.hasSelfCaptures) {
       const selfCaptures = this.findDestSquares(
         [x, y],
         {
@@ -1833,6 +1838,8 @@ export default class ChessRules {
     }
   }
 
+  // TODO here: should/could use getPotentialMovesFrom ?! (not sure)
+  // --> would be useful for variants like Copycat.
   // Search for enemy (or not) pieces attacking [x, y]
   findCapturesOn([x, y], o, allowed) {
     if (!o.byCol)