handicap

Author: Christopher Strauss

src/main/client/src/store.js

@@ -55,6 +55,7 @@ export const useGameStore = create((set, get) => ({
   moves: [],
   baseBoard: [],
   dim: 0,
+  handicap: 0,
   queueStatus: "behind",
   black: {
     name: "",
@@ -158,7 +159,8 @@ export const useGameStore = create((set, get) => ({
       state.moves = moves
       state.gameState.board = rehydrate(baseBoard)
       state.gameState.forbidden = forbidden
-      state.queueStatue = "up_to_date"
+      state.handicap = game.handicap
+      state.queueStatus = "up_to_date"
     }))
   },
 }))

src/main/java/com/bernd/GameController.java

@@ -78,7 +78,7 @@ private int getCurrentColor(Game game, String principal) {
     if (game.gameHasEnded()) {
       return 0;
     }
-    if (game.handicap() != 0) {
+    if (game.remainingHandicap() != 0) {
       return Board.B;
     }
     int color = getColor(game, principal);
@@ -97,7 +97,7 @@ private static int getColor(Game game, String principal) {
       return 0;
     }
     if (game.isSelfPlay()) {
-      return game.moves().size() + game.handicap() % 2 == 0 ?
+      return game.moves().size() + game.remainingHandicap() % 2 == 0 ?
           Board.B : Board.W;
     }
     return game.isBlack(principal) ? Board.B : Board.W;

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

@@ -77,7 +77,8 @@ public ViewGame startEdit(@RequestBody MatchRequest request) {
         0,
         createEmptyBoard(request.dim()),
         request.dim(),
-        0,
+        request.handicap(),
+        request.handicap(),
         new int[]{-1, -1},
         MoveList.create(request.dim())));
     activeGames.put(ActiveGame.fromGame(game));

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

@@ -21,6 +21,7 @@ public record Game(
     int[][] board,
     int dim,
     int handicap,
+    int remainingHandicap,
     int[] forbidden,
     MoveList moves
 ) {
@@ -71,9 +72,13 @@ private Game updateInternal(Move move) {
     }
     int x = move.x();
     int y = move.y();
+    int handicapUpdated = 0;
     int color = move.color();
     int[][] updated = BoardUpdateImpl.create(board.length, x, y, color).apply(board);
     int[][] result = removeDeadStonesAround(updated, x, y);
+    if (remainingHandicap > 0) {
+      handicapUpdated = remainingHandicap - 1;
+    }
     Direction direction = getDirection(x, y, result, updated);
     if (isKo(x, y, color, result, direction)) {
       return toBuilder()
@@ -82,6 +87,8 @@ private Game updateInternal(Move move) {
           .build();
     }
     return toBuilder()
+        .withRemainingHandicap(handicapUpdated)
+        .withHandicap(handicap)
         .withBoard(result)
         .withForbidden(NOT_FORBIDDEN)
         .build();

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

@@ -5,13 +5,25 @@ public final class GameBuilder {
 
   private boolean counting;
   private int countingAgreed;
+  private int handicap;
+  private int remainingHandicap;
   private int[][] board;
   private int[] forbidden;
 
   private GameBuilder(Game game) {
     this.game = game;
   }
 
+  public GameBuilder withHandicap(int handicap) {
+    this.handicap = handicap;
+    return this;
+  }
+
+  public GameBuilder withRemainingHandicap(int remainingHandicap) {
+    this.remainingHandicap = remainingHandicap;
+    return this;
+  }
+
   public GameBuilder withCounting(boolean counting) {
     this.counting = counting;
     return this;
@@ -38,6 +50,8 @@ public GameBuilder withForbidden(int x, int y) {
 
   static GameBuilder builder(Game game) {
     GameBuilder builder = new GameBuilder(game);
+    builder.handicap = game.handicap();
+    builder.remainingHandicap = game.remainingHandicap();
     builder.counting = game.counting();
     builder.countingAgreed = game.countingAgreed();
     builder.board = game.board();
@@ -54,7 +68,8 @@ public Game build() {
         countingAgreed,
         board,
         game.dim(),
-        game.handicap(),
+        handicap,
+        remainingHandicap,
         forbidden,
         game.moves()
     );

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

@@ -30,6 +30,7 @@ public Game accept(String opponent, AcceptRequest acceptRequest) {
         createEmptyBoard(dim),
         dim,
         acceptRequest.handicap(),
+        acceptRequest.handicap(),
         new int[]{-1, -1},
         MoveList.create(dim));
   }

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

@@ -7,7 +7,8 @@ public record ViewGame(
     User black,
     User white,
     int dim,
-    int handicap,
+    int initialHandicap,
+    int currentHandicap,
     List<GameMove> moves
 ) {
 
@@ -18,6 +19,7 @@ static ViewGame fromGame(Game game) {
         game.white(),
         game.dim(),
         game.handicap(),
+        game.remainingHandicap(),
         game.moves().asList());
   }
 }

src/test/java/com/bernd/model/GameBuilderTest.java

@@ -20,6 +20,7 @@ void unchanged() {
         createEmptyBoard(9),
         9,
         2,
+        2,
         new int[]{-1, -1},
         MoveList.create(2));
     Game game2 = GameBuilder.builder(game).build();