do not send counting flag

Author: h908714124

src/main/client/src/Game.jsx

@@ -52,7 +52,7 @@ export const Game = () => {
   let {board, forbidden: [forbidden_x, forbidden_y], gameHasEnded} = useGameStore(state => state.gameState)
   let initialized = useRef()
   let canvasRef = useRef()
-  let countingGroup = !gameHasEnded && counting() ? getCountingGroup(board, cursor_x, cursor_y) : undefined
+  let countingGroup = !gameHasEnded && counting ? getCountingGroup(board, cursor_x, cursor_y) : undefined
 
   let context = useMemo(() => {
     let dim = board.length
@@ -122,7 +122,7 @@ export const Game = () => {
     if (!board.length) {
       return
     }
-    if (!counting() && currentPlayer() !== auth.name) {
+    if (!counting && currentPlayer() !== auth.name) {
       return
     }
     let cursor_x = Math.round((e.nativeEvent.offsetX - context.margin) / context.step)
@@ -143,7 +143,7 @@ export const Game = () => {
     if (!context.isCursorInBounds(cursor_x, cursor_y)) {
       return
     }
-    if (counting()) {
+    if (counting) {
       if (!board[cursor_y][cursor_x].hasStone) {
         return
       }
@@ -175,7 +175,7 @@ export const Game = () => {
       return
     }
     paintGrid(context)
-    if (counting()) {
+    if (counting) {
       paintStonesCounting(context, board, countingGroup)
       return
     } else {

src/main/client/src/feature/GamePanel.jsx

@@ -136,11 +136,11 @@ function Panel({zoom, setZoom}) {
         <Button
           onClick={onPass}
           className="py-1 px-4"
-          disabled={gameHasEnded || counting() || currentPlayer() !== auth.name}>
+          disabled={gameHasEnded || counting || currentPlayer() !== auth.name}>
           Pass
         </Button>
       </div>
-      {counting() && <>
+      {counting && <>
         <div className="mt-2">
           <Button
             className="py-1 px-4"

src/main/client/src/store.js

@@ -64,7 +64,7 @@ export const useGameStore = create((set, get) => ({
     name: "",
   },
   countingComplete: () => {
-    if (!get().counting()) {
+    if (!get().counting) {
       return false
     }
     let baseBoard = get().baseBoard
@@ -105,13 +105,7 @@ export const useGameStore = create((set, get) => ({
     }
     return moves[moves.length - 1].color ^ (BLACK | WHITE)
   },
-  counting: () => {
-    let moves = get().moves
-    if (!moves.length) {
-      return false
-    }
-    return moves[moves.length - 1].counting
-  },
+  counting: false,
   gameState: {
     board: [],
     forbidden: [-1, -1],
@@ -134,11 +128,15 @@ export const useGameStore = create((set, get) => ({
         return
       }
       state.queueStatus = "up_to_date"
-      let [storedMove, updated, forbidden] = createMoveData(baseBoard, moves, move)
+      let counting = get().counting
+      let [storedMove, updated, forbidden] = createMoveData(baseBoard, moves, move, counting)
       state.moves.push(storedMove)
       state.baseBoard = updated
       state.gameState.board = rehydrate(updated)
       state.gameState.forbidden = forbidden
+      if (move.pass && moves.length && moves[moves.length - 1].pass) {
+        state.counting = true
+      }
     }))
   },
   setGameState: (game) => {
@@ -151,17 +149,29 @@ export const useGameStore = create((set, get) => ({
       }
       let moves = []
       let forbidden = [-1, -1]
+      let passes = 0
+      let counting = false
       for (let move of game.moves) {
         if (move.end) {
           moves.push(move)
           state.gameState.gameHasEnded = true
           break
         }
-        let [storedMove, updated, newForbidden] = createMoveData(baseBoard, moves, move)
+        if (move.pass) {
+          if (passes) {
+            counting = true
+          } else {
+            passes = 1
+          }
+        } else {
+          passes = 0
+        }
+        let [storedMove, updated, newForbidden] = createMoveData(baseBoard, moves, move, counting)
         moves.push(storedMove)
         forbidden = newForbidden
         baseBoard = updated
       }
+      state.counting = counting
       state.dim = game.dim
       state.baseBoard = baseBoard
       state.moves = moves
@@ -173,11 +183,11 @@ export const useGameStore = create((set, get) => ({
   },
 }))
 
-function createMoveData(baseBoard, moves, move) {
+function createMoveData(baseBoard, moves, move, counting) {
   if (move.pass && moves.length && moves[moves.length - 1].pass) {
     return [move, count(baseBoard), [-1, -1]]
   }
-  if (move.counting) {
+  if (counting) {
     let updated = move.resetCounting ?
       resetCounting(baseBoard) :
       toggleStonesAt(baseBoard, move.x, move.y)

src/main/java/com/bernd/game/MoveList.java

@@ -19,11 +19,11 @@ public static MoveList create(int size) {
   }
 
   public void addGameEndMarker() {
-    moves.add(new GameMove(moves.size(), 0, true, -1, -1, true, false, false, true));
+    moves.add(new GameMove(moves.size(), 0, true, -1, -1, false, false, true));
   }
 
-  public void add(Move move, boolean counting) {
-    moves.add(move.toGameMove(counting));
+  public void add(Move move) {
+    moves.add(move.toGameMove());
   }
 
   public GameMove get(int i) {

src/main/java/com/bernd/model/Game.java

@@ -42,7 +42,7 @@ private Game updateInternal(Move move) {
     if (move.agreeCounting() && (countingAgreed | move.color()) == COLORS) {
       moves.addGameEndMarker();
     } else {
-      moves.add(move, counting || move.pass() && opponentPassed());
+      moves.add(move);
     }
     if (move.agreeCounting()) {
       return toBuilder()

src/main/java/com/bernd/model/GameMove.java

@@ -6,7 +6,6 @@ public record GameMove(
     boolean pass,
     int x,
     int y,
-    boolean counting,
     boolean resetCounting,
     boolean agreeCounting,
     boolean end) {

src/main/java/com/bernd/model/Move.java

@@ -10,12 +10,12 @@ public record Move(
     int x,
     int y) {
 
-  public GameMove toGameMove(boolean counting) {
-    return new GameMove(n, color, pass, x, y, counting, resetCounting, agreeCounting, false);
+  public GameMove toGameMove() {
+    return new GameMove(n, color, pass, x, y, resetCounting, agreeCounting, false);
   }
 
-  public GameMove gameEnd(boolean counting) {
-    return new GameMove(n, color, pass, x, y, counting, resetCounting, agreeCounting, true);
+  public GameMove gameEnd() {
+    return new GameMove(n, color, pass, x, y, resetCounting, agreeCounting, true);
   }
 
   public Move withColor(int color) {

src/test/java/com/bernd/game/MoveListTest.java

@@ -12,8 +12,8 @@ class MoveListTest {
   @Test
   void testGet() {
     MoveList list = MoveList.create(9);
-    list.add(move(B, 0, 1), false);
-    list.add(move(W, 2, 3), false);
+    list.add(move(B, 0, 1));
+    list.add(move(W, 2, 3));
     assertEquals(2, list.size());
     assertEquals(0, list.get(0).x());
     assertEquals(1, list.get(0).y());
@@ -28,7 +28,7 @@ void testGrow() {
     MoveList list = MoveList.create(9);
     for (int y = 0; y < 9; y++) {
       for (int x = 0; x < 9; x++) {
-        list.add(move(B, x, y), false);
+        list.add(move(B, x, y));
       }
     }
     assertEquals(81, list.size());