add edit mode

Author: h908714124

src/main/client/src/Lobby.jsx

@@ -8,6 +8,9 @@ import {
 import {
   useNavigate,
 } from "react-router-dom"
+import {
+  Button,
+} from "./component/Button.jsx"
 import {
   base,
   StompContext,
@@ -51,27 +54,37 @@ export function Lobby() {
       }),
     })
     return () => {
-      sub1.unsubscribe
-      sub2.unsubscribe
-      sub3.unsubscribe
+      sub1.unsubscribe()
+      sub2.unsubscribe()
+      sub3.unsubscribe()
     }
   }, [setInit, setUsers, setMatchRequested, auth, initialized, stompClient, navigate])
-  let matchRequest = useCallback(() => {
+  let matchRequest = useCallback((editMode) => {
     stompClient.publish({
       destination: "/app/lobby/match",
       body: JSON.stringify({
         name: auth.name,
+        dim: 9,
+        editMode: editMode,
       }),
     })
   }, [auth, stompClient])
   if (!matchRequested) {
     return (
       <div className="m-4">
-        <button type="button"
-          className="p-2 border border-black"
-          onClick={matchRequest}>
-          Find match
-        </button>
+        <div>
+          <button type="Button"
+            onClick={() => matchRequest(true)}>
+            Create
+          </button>
+        </div>
+        <div className="mt-2">
+          <button type="button"
+            className="p-2 border border-black"
+            onClick={() => matchRequest(false)}>
+            Find match
+          </button>
+        </div>
         <div className="mt-2">
           {users.map(user => (
             <div key={user.name}>{user.name}</div>

src/main/client/src/Play.jsx

@@ -61,7 +61,7 @@ export const Play = () => {
       }),
     })
     return () => {
-      sub1.unsubscribe
+      sub1.unsubscribe()
     }
   }, [setGameState, initialized, stompClient, auth, gameId])
   let onPass = useCallback(() => {
@@ -174,8 +174,8 @@ function getStyle(check) {
 }
 
 function EmptyActive({ onClick }) {
-  let symbol = useGameStore(state => state.symbol)
-  let hovercolor = symbol === BLACK ? "hover:text-black" : "hover:text-white"
+  let currentColor = useGameStore(state => state.gameState.currentColor)
+  let hovercolor = currentColor === BLACK ? "hover:text-black" : "hover:text-white"
   let classes = twJoin(
     tileClasses,
     "text-transparent",

src/main/client/src/store.js

@@ -29,8 +29,9 @@ export const useAuthStore = create((set) => ({
   },
 }))
 
-export const useGameStore = create((set, get) => ({
+export const useGameStore = create((set) => ({
   symbol: 0,
+  editMode: false,
   black: {
     name: "",
   },
@@ -39,24 +40,20 @@ export const useGameStore = create((set, get) => ({
   },
   gameState: {
     currentPlayer: undefined,
+    currentColor: BLACK,
     counting: false,
   },
   setGameState: (game, auth) => {
     set(produce(state => {
-      let oldState = get()
-      if (oldState.black.name !== game.black.name) {
-        state.black = game.black
-      }
-      if (oldState.white.name !== game.white.name) {
-        state.white = game.white
-      }
+      state.black = game.black
+      state.white = game.white
+      state.editMode = game.editMode
       state.gameState.board = game.board
       state.gameState.currentPlayer = game.currentPlayer
+      state.gameState.currentColor = game.currentColor
       state.gameState.counting = game.counting
       let symbol = game.black.name === auth.name? BLACK : WHITE 
-      if (oldState.symbol !== symbol) {
-        state.symbol = symbol
-      }
+      state.symbol = symbol
     }))
   },
 }))

src/main/java/com/bernd/LobbyController.java

@@ -11,6 +11,8 @@
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.stereotype.Controller;
 
+import static com.bernd.game.Board.B;
+
 @Controller
 public class LobbyController {
 
@@ -36,31 +38,55 @@ public void lobbyJoinedAction(Principal principal) {
   }
 
   @MessageMapping("/lobby/match")
-  public void matchAction(MatchRequest message, Principal principal) {
+  public void matchAction(MatchRequest request, Principal principal) {
     User user = lobbyUsers.get(principal);
+    if (request.editMode()) {
+      lobbyUsers.remove(principal.getName());
+      operations.convertAndSend("/topic/lobby/users",
+          new UserList(lobbyUsers.users()));
+      Game game = games.put(new Game(
+          RandomString.get(),
+          user,
+          user,
+          true,
+          false,
+          user.name(),
+          B,
+          false,
+          createEmptyBoard(request)));
+      operations.convertAndSend("/topic/lobby/gamestart", game);
+    }
     if (lookingForMatch == null) {
       lookingForMatch = user;
       operations.convertAndSend("/topic/lobby/gamerequest",
-          new Status(message.name(), "ready"));
+          new Status(request.name(), "ready"));
       return;
     }
+    User black = lookingForMatch;
+    lookingForMatch = null;
     lobbyUsers.remove(principal.getName());
-    lobbyUsers.remove(lookingForMatch.name());
+    lobbyUsers.remove(black.name());
     operations.convertAndSend("/topic/lobby/users",
         new UserList(lobbyUsers.users()));
-    String gameId = RandomString.get();
-    Game game = games.put(new Game(gameId, user, lookingForMatch, false, user.name(), false, new int[][]{
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9],
-        new int[9]
-    }));
+    Game game = games.put(new Game(
+        RandomString.get(),
+        black,
+        user,
+        false,
+        false,
+        user.name(),
+        B,
+        false,
+        createEmptyBoard(request)));
     operations.convertAndSend("/topic/lobby/gamestart", game);
-    lookingForMatch = null;
+  }
+
+  private static int[][] createEmptyBoard(MatchRequest request) {
+    int dim = Math.max(request.dim(), 2);
+    int[][] board = new int[dim][];
+    for (int y = 0; y < dim; y++) {
+      board[y] = new int[dim];
+    }
+    return board;
   }
 }

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

@@ -4,9 +4,9 @@
 import java.util.Arrays;
 
 import static com.bernd.game.Board.B;
-import static com.bernd.game.Board.REMOVED;
 import static com.bernd.game.Board.TERRITORY;
 import static com.bernd.game.Board.W;
+import static com.bernd.util.Util.isPlainColor;
 import static com.bernd.util.Util.keepMarkers;
 
 public class Count {
@@ -15,7 +15,7 @@ static int getImpliedColor(
       int[][] board,
       int xx,
       int yy) {
-    if (board[yy][xx] != 0) {
+    if (isPlainColor(board[yy][xx])) {
       return board[yy][xx];
     }
     int dim = board.length;
@@ -27,7 +27,7 @@ static int getImpliedColor(
       int ptId = pointsToCheck.poll();
       int y = ptId / dim;
       int x = ptId % dim;
-      if (board[y][x] != 0 && (board[y][x] & REMOVED) == 0) {
+      if (isPlainColor(board[y][x])) {
         return board[y][x] | TERRITORY;
       }
       if (y > 0 && !pointsChecked.has(x, y - 1)) {

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

@@ -76,9 +76,11 @@ public String toString() {
       return "[]";
     }
     StringBuilder sb = new StringBuilder("[");
-    forEach((x, y) -> sb.append("(")
-        .append(x).append(" ").append(y)
-        .append("), "));
+    for (int i = 0; i < pos; i++) {
+      sb.append("(")
+          .append(x(i)).append(" ").append(y(i))
+          .append("), ");
+    }
     sb.setLength(sb.length() - 2);
     sb.append("]");
     return sb.toString();

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

@@ -8,7 +8,7 @@
 
 public class Toggle {
 
-  private static Function<int[][], int[][]> toggle(
+  private static Function<int[][], int[][]> toggleRemoved(
       int[][] board,
       int xx,
       int yy) {
@@ -65,7 +65,7 @@ private static Function<int[][], int[][]> toggle(
 
   public static int[][] toggleStonesAt(
       int[][] board, int x, int y) {
-    Function<int[][], int[][]> update = toggle(board, x, y);
+    Function<int[][], int[][]> update = toggleRemoved(board, x, y);
     return update.apply(board);
   }
 }

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

@@ -8,12 +8,17 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import static com.bernd.game.Board.B;
+import static com.bernd.game.Board.W;
+
 public record Game(
     String id,
     User black,
     User white,
+    boolean editMode,
     boolean counting,
     String currentPlayer,
+    int currentColor,
     boolean opponentPassed,
     int[][] board
 ) {
@@ -31,7 +36,9 @@ public Game update(Move move) {
 
   private Game updateInternal(Move move) {
     if (counting) {
-      return game(Count.count(Toggle.toggleStonesAt(board, move.x(), move.y())));
+      int[][] toggled = Toggle.toggleStonesAt(board, move.x(), move.y());
+      int[][] counted = Count.count(toggled);
+      return game(counted);
     }
     if (move.pass()) {
       if (opponentPassed) {
@@ -54,8 +61,10 @@ private Game game(
         id,
         black,
         white,
+        editMode,
         counting,
         nextPlayer(),
+        nextColor(),
         opponentPassed,
         board);
   }
@@ -69,10 +78,13 @@ private Game startCounting() {
   }
 
   private String nextPlayer() {
+    if (editMode) {
+      return currentPlayer;
+    }
     return currentPlayer.equals(black.name()) ? white().name() : black().name();
   }
 
-  private int currentColor() {
-    return currentPlayer.equals(black().name()) ? Board.B : Board.W;
+  private int nextColor() {
+    return currentColor == B ? W : B;
   }
 }

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

@@ -1,4 +1,4 @@
 package com.bernd.model;
 
-public record MatchRequest(String name) {
-}
+public record MatchRequest(String name, int dim, boolean editMode) {
+}

src/main/java/com/bernd/util/Util.java

@@ -6,6 +6,7 @@
 
 public final class Util {
   private static final int MARKERS = ~B & ~W;
+  private static final int COLORS = B | W;
 
   private Util() {
   }
@@ -34,4 +35,8 @@ public static int keepMarkers(int color, int colorWithMarkers) {
   public static int divUp(int i, int div) {
     return i % div == 0 ? i / div : (i / div) + 1;
   }
+
+  public static boolean isPlainColor(int color) {
+    return (color & COLORS) != 0 && (color & MARKERS) == 0;
+  }
 }