Refactored isStalemate()

slowedcodinganai · Sep 28, 2024 · bf634aa · bf634aa
1 parent d86d9a6
commit bf634aa
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Variant/AbstractBoard.php b/src/Variant/AbstractBoard.php
@@ -722,7 +722,20 @@ public function isMate(): bool
 
     public function isStalemate(): bool
     {
-        return $this->isTrapped() && !$this->isCheck();
+        if (!$this->piece($this->turn, Piece::K)->attacking()) {
+            $moveSqs = [];
+            foreach ($this->pieces($this->turn) as $piece) {
+                if (!$piece->isPinned()) {
+                    $moveSqs = [
+                        ...$moveSqs,
+                        ...$piece->moveSqs(),
+                    ];
+                }
+            }
+            return $moveSqs === [];
+        }
+
+        return false;
     }
 
     public function isFivefoldRepetition(): bool

diff --git a/src/Variant/Losing/Board.php b/src/Variant/Losing/Board.php
@@ -107,6 +107,19 @@ public function play(string $color, string $pgn): bool
         return false;
     }
 
+    public function isStalemate(): bool
+    {
+        $moveSqs = [];
+        foreach ($this->pieces($this->turn) as $piece) {
+            $moveSqs = [
+                ...$moveSqs,
+                ...$piece->moveSqs(),
+            ];
+        }
+
+        return $moveSqs === [];
+    }
+
     public function doesWin(): bool
     {
         return count($this->pieces($this->turn)) === 0 || $this->isStalemate();