calculate remaining handicap

Author: h908714124

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

@@ -66,6 +66,9 @@ public void action(Move move, Principal p) {
     if (p == null || game == null) {
       return;
     }
+    if (game.isForbidden(move)) {
+      return;
+    }
     int principalColor = getColorFromPrincipal(game, getPrincipal(p));
     int color = getColorFromGameState(game);
     if (color == 0

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

@@ -76,7 +76,6 @@ public ViewGame startEdit(@RequestBody MatchRequest request) {
         createEmptyBoard(request.dim()),
         request.dim(),
         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,7 +21,6 @@ public record Game(
     int[][] board,
     int dim,
     int handicap,
-    int remainingHandicap,
     int[] forbidden,
     MoveList moves
 ) {
@@ -83,7 +82,6 @@ private Game updateInternal(Move move) {
           .build();
     }
     return toBuilder()
-        .withRemainingHandicap(Math.max(0, remainingHandicap - 1))
         .withBoard(result)
         .withForbidden(NOT_FORBIDDEN)
         .build();
@@ -175,4 +173,12 @@ boolean opponentPassed() {
     }
     return getLastMove().pass();
   }
+
+  public int remainingHandicap() {
+    return Math.max(0, handicap - moves.size());
+  }
+
+  public boolean isForbidden(Move move) {
+    return move.x() == forbidden[0] && move.y() == forbidden[1];
+  }
 }

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

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

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

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