moved score out of game

This commit is contained in:
ramollia
2025-10-28 09:53:33 +01:00
parent 75fb865dad
commit 0638a38fc1
2 changed files with 7 additions and 7 deletions

View File

@@ -7,13 +7,12 @@ public abstract class Game {
NORMAL,
DRAW,
WIN,
MOVE_SKIPPED,
TURN_SKIPPED,
}
public record Move(int position, char value) {}
public record Score(int player1Score, int player2Score) {}
public static final char EMPTY = (char)0;
public final int rowSize;

View File

@@ -2,7 +2,6 @@ package org.toop.game.reversi;
import org.toop.game.Game;
import org.toop.game.TurnBasedGame;
import org.toop.game.tictactoe.TicTacToe;
import java.awt.*;
import java.util.ArrayList;
@@ -17,6 +16,8 @@ public final class Reversi extends TurnBasedGame {
private Set<Point> filledCells = new HashSet<>();
private Move[] mostRecentlyFlippedPieces;
public record Score(int player1Score, int player2Score) {}
public Reversi() {
super(8, 8, 2);
addStartPieces();
@@ -150,7 +151,7 @@ public final class Reversi extends TurnBasedGame {
if (getLegalMoves().length == 0) {
skipMyTurn();
if (getLegalMoves().length > 0) {
return State.MOVE_SKIPPED;
return State.TURN_SKIPPED;
}
else {
Score score = getScore();
@@ -191,7 +192,7 @@ public final class Reversi extends TurnBasedGame {
}
}
public Game.Score getScore(){
public Score getScore(){
int player1Score = 0, player2Score = 0;
for (int count = 0; count < rowSize * columnSize; count++) {
if (board[count] == 'B') {
@@ -201,7 +202,7 @@ public final class Reversi extends TurnBasedGame {
player2Score += 1;
}
}
return new Game.Score(player1Score, player2Score);
return new Score(player1Score, player2Score);
}
public Move[] sortMovesFromCenter(Move[] moves, Move center) {
int centerX = center.position()%columnSize;