Remove portal puzzles from puzzle screen

Author: Swon404

src/screens/PuzzlesScreen.tsx

@@ -6,35 +6,11 @@ import {
   PUZZLES, filterPuzzles, puzzleDifficulty,
   type Puzzle, type Difficulty
 } from "../puzzles/puzzles";
-import {
-  PORTAL_PUZZLES, filterPortalPuzzles,
-  type PortalPuzzle
-} from "../puzzles/portal-puzzles";
-import { parseUci, parseSquare, type Square } from "../engine/board";
+import { parseUci } from "../engine/board";
 import { gameResult } from "../engine/rules";
 
 type Status = "solving" | "wrong" | "solved";
 type MateFilter = "all" | 1 | 2 | 3;
-type Mode = "standard" | "portal";
-
-/** Parse extended UCI: "e2e4" or "e2e4@d8" (portal teleport). */
-function parsePortalUci(uci: string): {
-  from: Square; to: Square; portalTo?: Square;
-  promotion?: "Q" | "R" | "B" | "N";
-} {
-  const atIdx = uci.indexOf("@");
-  if (atIdx !== -1) {
-    const base = uci.slice(0, atIdx);
-    const land = uci.slice(atIdx + 1);
-    return {
-      from: parseSquare(base.slice(0, 2)),
-      to: parseSquare(base.slice(2, 4)),
-      portalTo: parseSquare(land.slice(0, 2)),
-    };
-  }
-  const u = parseUci(uci);
-  return { from: u.from, to: u.to, promotion: u.promotion as "Q" | "R" | "B" | "N" | undefined };
-}
 
 const DIFF_LABEL: Record<Difficulty | "all", string> = {
   all: "All",
@@ -46,10 +22,8 @@ const DIFF_LABEL: Record<Difficulty | "all", string> = {
 
 export function PuzzlesScreen() {
   const { loadPosition, state, tryMove, activeProfile, recordPuzzleSolved, recordPuzzleAttempt } = useGame();
-  const [mode, setMode] = useState<Mode>("standard");
   const [difficulty, setDifficulty] = useState<Difficulty | "all">("beginner");
   const [mateIn, setMateIn] = useState<MateFilter>("all");
-  const [portalMateIn, setPortalMateIn] = useState<1 | 2 | "all">("all");
   const [newOnly, setNewOnly] = useState(true);
   const [index, setIndex] = useState(0);
   const [status, setStatus] = useState<Status>("solving");
@@ -73,20 +47,13 @@ export function PuzzlesScreen() {
     return unsolved.length > 0 ? unsolved : basePool;
   }, [basePool, newOnly, solvedIds]);
 
-  const basePortalPool = useMemo(
-    () => filterPortalPuzzles({ mateIn: portalMateIn }),
-    [portalMateIn]
-  );
-  const portalPool = useMemo(() => {
-    if (!newOnly) return basePortalPool;
-    const unsolved = basePortalPool.filter((p) => !solvedIds.has(p.id));
-    return unsolved.length > 0 ? unsolved : basePortalPool;
-  }, [basePortalPool, newOnly, solvedIds]);
-
-  const pool: (Puzzle | PortalPuzzle)[] = mode === "portal" ? portalPool : stdPool;
+  const pool: Puzzle[] = stdPool;
   const puzzle = pool[index];
   const sideToMate = useMemo(() => (puzzle ? puzzle.setup().turn : "w"), [puzzle?.id]);
-  const totalSolved = activeProfile?.stats.puzzlesSolved ?? 0;
+  const totalSolved = useMemo(
+    () => PUZZLES.reduce((n, p) => n + (solvedIds.has(p.id) ? 1 : 0), 0),
+    [solvedIds]
+  );
 
   const diffCounts = useMemo(() => {
     const out: Record<Difficulty | "all", { solved: number; total: number }> = {
@@ -118,7 +85,7 @@ export function PuzzlesScreen() {
     return out;
   }, [solvedIds, difficulty]);
 
-  useEffect(() => { setIndex(0); }, [mateIn, difficulty, newOnly, mode, portalMateIn]);
+  useEffect(() => { setIndex(0); }, [mateIn, difficulty, newOnly]);
 
   useEffect(() => {
     if (!puzzle) return;
@@ -139,20 +106,11 @@ export function PuzzlesScreen() {
     const plyIndex = moved - 1;
     const expected = puzzle.moves[plyIndex];
     const last = state.history[state.history.length - 1];
-    const exp = parsePortalUci(expected);
+    const exp = parseUci(expected);
     let ok =
       last.from.file === exp.from.file && last.from.rank === exp.from.rank &&
       last.to.file === exp.to.file && last.to.rank === exp.to.rank &&
       (!exp.promotion || last.promotion === exp.promotion);
-    if (ok && exp.portalTo) {
-      ok = !!last.isPortalEntry &&
-        !!last.portalTo &&
-        last.portalTo.file === exp.portalTo.file &&
-        last.portalTo.rank === exp.portalTo.rank;
-    } else if (ok && !exp.portalTo && last.isPortalEntry) {
-      // Expected a non-portal move, but the user made a portal move.
-      ok = false;
-    }
 
     // Accept alternative winning moves: if the user has just checkmated,
     // count the puzzle as solved even when it differs from the scripted line.
@@ -184,9 +142,9 @@ export function PuzzlesScreen() {
     }
 
     setPlayedPlies(moved);
-    const reply = parsePortalUci(puzzle.moves[nextIdx]);
+    const reply = parseUci(puzzle.moves[nextIdx]);
     const t = setTimeout(() => {
-      tryMove(reply.from, reply.to, reply.promotion, reply.portalTo);
+      tryMove(reply.from, reply.to, reply.promotion as "Q" | "R" | "B" | "N" | undefined);
       setPlayedPlies((x) => x + 1);
     }, 300);
     return () => clearTimeout(t);
@@ -215,11 +173,9 @@ export function PuzzlesScreen() {
     return <div className="puzzle-banner">You play {side}. Mate in {puzzle.mateIn()} — find the forced win.{done}</div>;
   }, [status, puzzle, alreadySolved, sideToMate]);
 
-  const allSolvedHere = mode === "portal"
-    ? basePortalPool.length > 0 && basePortalPool.every((p) => solvedIds.has(p.id))
-    : basePool.length > 0 && basePool.every((p) => solvedIds.has(p.id));
+  const allSolvedHere = basePool.length > 0 && basePool.every((p) => solvedIds.has(p.id));
 
-  const totalCount = mode === "portal" ? PORTAL_PUZZLES.length : PUZZLES.length;
+  const totalCount = PUZZLES.length;
 
   return (
     <div className="screen">
@@ -230,78 +186,39 @@ export function PuzzlesScreen() {
       <h2>🧩 Puzzles</h2>
 
       <div className="puzzle-tabs">
-        <span className="tabs-label">Mode</span>
-        <button
-          className={mode === "standard" ? "pill active" : "pill"}
-          onClick={() => setMode("standard")}
-        >Standard</button>
-        <button
-          className={mode === "portal" ? "pill active" : "pill"}
-          onClick={() => setMode("portal")}
-        >🌀 Portal</button>
+        <span className="tabs-label">Level</span>
+        {(["beginner", "easy", "medium", "hard", "all"] as const).map((d) => {
+          const c = diffCounts[d];
+          return (
+            <button key={d}
+              className={difficulty === d ? "pill active" : "pill"}
+              onClick={() => setDifficulty(d)}
+            >{DIFF_LABEL[d]}<span className="count">{c.solved}/{c.total}</span></button>
+          );
+        })}
       </div>
 
-      {mode === "standard" && (
-        <div className="puzzle-tabs">
-          <span className="tabs-label">Level</span>
-          {(["beginner", "easy", "medium", "hard", "all"] as const).map((d) => {
-            const c = diffCounts[d];
-            return (
-              <button key={d}
-                className={difficulty === d ? "pill active" : "pill"}
-                onClick={() => setDifficulty(d)}
-              >{DIFF_LABEL[d]}<span className="count">{c.solved}/{c.total}</span></button>
-            );
-          })}
-        </div>
-      )}
-
-      {mode === "standard" ? (
-        <div className="puzzle-tabs">
-          <span className="tabs-label">Type</span>
-          {([
-            { key: "all" as MateFilter, label: "All" },
-            { key: 1 as MateFilter, label: "M1" },
-            { key: 2 as MateFilter, label: "M2" },
-            { key: 3 as MateFilter, label: "M3" }
-          ]).map((it) => {
-            const c = mateCounts[it.key];
-            return (
-              <button key={String(it.key)}
-                className={mateIn === it.key ? "pill active" : "pill"}
-                onClick={() => setMateIn(it.key)}
-              >{it.label}<span className="count">{c.solved}/{c.total}</span></button>
-            );
-          })}
-          <label className="pill toggle" style={{ cursor: "pointer", marginLeft: "auto" }}>
-            <input type="checkbox" checked={newOnly} onChange={(e) => setNewOnly(e.target.checked)} />
-            New only
-          </label>
-        </div>
-      ) : (
-        <div className="puzzle-tabs">
-          <span className="tabs-label">Type</span>
-          {(["all", 1, 2] as const).map((it) => {
-            const count = basePortalPool.length === 0 && it !== portalMateIn
-              ? PORTAL_PUZZLES.filter((p) => it === "all" || p.mateIn() === it).length
-              : 0;
-            const total = PORTAL_PUZZLES.filter((p) => it === "all" || p.mateIn() === it).length;
-            const solved = PORTAL_PUZZLES.filter((p) =>
-              (it === "all" || p.mateIn() === it) && solvedIds.has(p.id)
-            ).length;
-            return (
-              <button key={String(it)}
-                className={portalMateIn === it ? "pill active" : "pill"}
-                onClick={() => setPortalMateIn(it)}
-              >{it === "all" ? "All" : `M${it}`}<span className="count">{solved}/{total || count}</span></button>
-            );
-          })}
-          <label className="pill toggle" style={{ cursor: "pointer", marginLeft: "auto" }}>
-            <input type="checkbox" checked={newOnly} onChange={(e) => setNewOnly(e.target.checked)} />
-            New only
-          </label>
-        </div>
-      )}
+      <div className="puzzle-tabs">
+        <span className="tabs-label">Type</span>
+        {([
+          { key: "all" as MateFilter, label: "All" },
+          { key: 1 as MateFilter, label: "M1" },
+          { key: 2 as MateFilter, label: "M2" },
+          { key: 3 as MateFilter, label: "M3" }
+        ]).map((it) => {
+          const c = mateCounts[it.key];
+          return (
+            <button key={String(it.key)}
+              className={mateIn === it.key ? "pill active" : "pill"}
+              onClick={() => setMateIn(it.key)}
+            >{it.label}<span className="count">{c.solved}/{c.total}</span></button>
+          );
+        })}
+        <label className="pill toggle" style={{ cursor: "pointer", marginLeft: "auto" }}>
+          <input type="checkbox" checked={newOnly} onChange={(e) => setNewOnly(e.target.checked)} />
+          New only
+        </label>
+      </div>
 
       {allSolvedHere && newOnly && (
         <p className="hint" style={{ margin: "4px 0 8px" }}>
@@ -316,8 +233,7 @@ export function PuzzlesScreen() {
           {banner}
           <div className="puzzle-meta">
             <span>Puzzle {index + 1} / {pool.length}</span>
-            {"rating" in puzzle && puzzle.rating !== undefined && <span className="pill">⚡ {puzzle.rating}</span>}
-            {mode === "portal" && <span className="pill">🌀 Portal</span>}
+            {puzzle.rating !== undefined && <span className="pill">⚡ {puzzle.rating}</span>}
             {alreadySolved && <span className="pill solved">✓ Solved</span>}
             {entry && entry.attempts > 0 && <span className="pill">Tries: {entry.attempts}</span>}
           </div>