Fix #1705 Missing materialPoint info in ataxx puzzles

gbtami · Nov 23, 2024 · 59a7b99 · 59a7b99
1 parent a7c499d
commit 59a7b99
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/client/analysisCtrl.ts b/client/analysisCtrl.ts
@@ -31,6 +31,7 @@ import { analysisSettings, EngineSettings } from './analysisSettings';
 import { setAriaTabClick } from './view';
 import { createWebsocket } from "@/socket/webSocketUtils";
 import { setPocketRowCssVars } from './pocketRow';
+import { updatePoint } from './info';
 
 const EVAL_REGEX = new RegExp(''
   + /^info depth (\d+) seldepth \d+ multipv (\d+) /.source
@@ -191,14 +192,16 @@ export class AnalysisController extends GameController {
         }
 
         if (this.variant.ui.materialPoint) {
-            const miscW = document.getElementById('misc-infow') as HTMLElement;
-            const miscB = document.getElementById('misc-infob') as HTMLElement;
-            miscW.style.textAlign = 'right';
-            miscB.style.textAlign = 'left';
-            miscW.style.width = '100px';
-            miscB.style.width = '100px';
+            this.vmiscInfoW = document.getElementById('misc-infow') as HTMLElement;
+            this.vmiscInfoB = document.getElementById('misc-infob') as HTMLElement;
+            this.vmiscInfoW.style.textAlign = 'right';
+            this.vmiscInfoB.style.textAlign = 'left';
+            this.vmiscInfoW.style.width = '100px';
+            this.vmiscInfoB.style.width = '100px';
             patch(document.getElementById('misc-info-center') as HTMLElement, h('div#misc-info-center', '-'));
             (document.getElementById('misc-info') as HTMLElement).style.justifyContent = 'space-around';
+
+            [this.vmiscInfoW, this.vmiscInfoB] = updatePoint(this.variant, this.fullfen, this.vmiscInfoW, this.vmiscInfoB);
         }
 
         if (this.variant.ui.counting) {
@@ -994,6 +997,10 @@ export class AnalysisController extends GameController {
             }
         }
 
+        if (this.variant.ui.materialPoint) {
+            [this.vmiscInfoW, this.vmiscInfoB] = updatePoint(this.variant, msg.fen, this.vmiscInfoW, this.vmiscInfoB);
+        }
+
         // TODO: But sending moves to the server will be useful to implement shared live analysis!
         // this.doSend({ type: "analysis_move", gameId: this.gameId, move: move, fen: this.fullfen, ply: this.ply + 1 });
     }

diff --git a/client/puzzleCtrl.ts b/client/puzzleCtrl.ts
@@ -9,6 +9,7 @@ import { lmBeforeEp, uci2LastMove, UCIMove, uci2cg } from './chess';
 import { updateMovelist } from './movelist';
 import { variants } from './variants';
 import { RatedSettings, AutoNextSettings } from './puzzleSettings';
+import { updatePoint } from './info';
 
 
 export class PuzzleController extends AnalysisController {
@@ -300,6 +301,10 @@ export class PuzzleController extends AnalysisController {
         this.steps.push(step);
         this.ply += 1
         updateMovelist(this);
+
+        if (this.variant.ui.materialPoint) {
+            [this.vmiscInfoW, this.vmiscInfoB] = updatePoint(this.variant, this.ffishBoard.fen(), this.vmiscInfoW, this.vmiscInfoB);
+        }
     }
 
     cgConfig = (move: string) => {

diff --git a/client/roundCtrl.ts b/client/roundCtrl.ts
@@ -849,7 +849,7 @@ export class RoundController extends GameController {
         }
 
         if (this.variant.ui.materialPoint) {
-            this.updatePoint(msg.fen);
+            [this.vmiscInfoW, this.vmiscInfoB] = updatePoint(this.variant, msg.fen, this.vmiscInfoW, this.vmiscInfoB);
         }
 
         const oppclock = !this.flipped() ? 0 : 1;
@@ -1062,10 +1062,6 @@ export class RoundController extends GameController {
         }
     }
 
-    private updatePoint = (fen: cg.FEN) => {
-        [this.vmiscInfoW, this.vmiscInfoB] = updatePoint(this.variant, fen, this.vmiscInfoW, this.vmiscInfoB);
-    }
-
     private updateMaterial(): void {
         if (this.variant.material.showDiff && this.materialDifference)
             [this.vmaterial0, this.vmaterial1] = updateMaterial(this.variant, this.fullfen, this.vmaterial0, this.vmaterial1, this.flipped(), this.mycolor);