diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml
index b5d06bc..e3a4679 100644
--- a/.idea/copilotDiffState.xml
+++ b/.idea/copilotDiffState.xml
@@ -20,56 +20,6 @@
             </PendingDiffInfo>
           </value>
         </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.util.ArrayList;&#10;import java.util.HashSet;&#10;import java.util.LinkedList;&#10;import java.util.List;&#10;import java.util.Queue;&#10;import java.util.Set;&#10;&#10;/**&#10; * Representa el tablero de Inazuma Go (9x9 intersecciones).&#10; * Estado de cada celda: vacía (0), negra (1), blanca (2).&#10; */&#10;public class Board {&#10;    private static final int SIZE = 9;&#10;    private int[][] board; // 0 = empty, 1 = black, 2 = white&#10;&#10;    public Board() {&#10;        this.board = new int[SIZE][SIZE];&#10;    }&#10;&#10;    public Board(Board other) {&#10;        this.board = new int[SIZE][SIZE];&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                this.board[r][c] = other.board[r][c];&#10;            }&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Obtiene el tamaño del tablero.&#10;     */&#10;    public int getSize() {&#10;        return SIZE;&#10;    }&#10;&#10;    /**&#10;     * Obtiene el estado de una celda (0=vacía, 1=negra, 2=blanca).&#10;     */&#10;    public int getCell(int row, int col) {&#10;        if (!isValid(row, col)) return -1;&#10;        return board[row][col];&#10;    }&#10;&#10;    /**&#10;     * Coloca una piedra en el tablero.&#10;     */&#10;    public void placeStone(int row, int col, int color) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = color;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Remueve una piedra del tablero.&#10;     */&#10;    public void removeStone(int row, int col) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = 0;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Verifica si una coordenada es válida.&#10;     */&#10;    public boolean isValid(int row, int col) {&#10;        return row &gt;= 0 &amp;&amp; row &lt; SIZE &amp;&amp; col &gt;= 0 &amp;&amp; col &lt; SIZE;&#10;    }&#10;&#10;    /**&#10;     * Verifica si una celda está vacía.&#10;     */&#10;    public boolean isEmpty(int row, int col) {&#10;        return isValid(row, col) &amp;&amp; board[row][col] == 0;&#10;    }&#10;&#10;    /**&#10;     * Obtiene los vecinos ortogonales de una celda.&#10;     */&#10;    public List&lt;int[]&gt; getNeighbors(int row, int col) {&#10;        List&lt;int[]&gt; neighbors = new ArrayList&lt;&gt;();&#10;        int[][] directions = {{-1, 0}, {1, 0}, {0, -1}, {0, 1}};&#10;        for (int[] dir : directions) {&#10;            int nr = row + dir[0];&#10;            int nc = col + dir[1];&#10;            if (isValid(nr, nc)) {&#10;                neighbors.add(new int[]{nr, nc});&#10;            }&#10;        }&#10;        return neighbors;&#10;    }&#10;&#10;    /**&#10;     * Calcula las libertades (grados de libertad) de un grupo.&#10;     * Retorna el número de intersecciones vacías adyacentes al grupo.&#10;     */&#10;    public int countLibertiesForGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return 0;&#10;&#10;        Set&lt;String&gt; visited = new HashSet&lt;&gt;();&#10;        Set&lt;String&gt; liberties = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        visited.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (isEmpty(nr, nc)) {&#10;                    liberties.add(key);&#10;                } else if (board[nr][nc] == color &amp;&amp; !visited.contains(key)) {&#10;                    visited.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return liberties.size();&#10;    }&#10;&#10;    /**&#10;     * Obtiene todas las piedras de un grupo.&#10;     */&#10;    public Set&lt;String&gt; getGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return new HashSet&lt;&gt;();&#10;&#10;        Set&lt;String&gt; group = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        group.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (board[nr][nc] == color &amp;&amp; !group.contains(key)) {&#10;                    group.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return group;&#10;    }&#10;&#10;    /**&#10;     * Detecta y captura grupos sin libertades.&#10;     * Retorna el número de piedras capturadas.&#10;     */&#10;    public int captureGroupsWithoutLiberties() {&#10;        int captured = 0;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (board[r][c] != 0 &amp;&amp; countLibertiesForGroup(r, c) == 0) {&#10;                    Set&lt;String&gt; group = getGroup(r, c);&#10;                    for (String stone : group) {&#10;                        String[] parts = stone.split(&quot;,&quot;);&#10;                        int sr = Integer.parseInt(parts[0]);&#10;                        int sc = Integer.parseInt(parts[1]);&#10;                        removeStone(sr, sc);&#10;                        captured++;&#10;                    }&#10;                }&#10;            }&#10;        }&#10;        return captured;&#10;    }&#10;&#10;    /**&#10;     * Crea una copia del tablero.&#10;     */&#10;    public Board clone() {&#10;        return new Board(this);&#10;    }&#10;&#10;    /**&#10;     * Compara dos tableros.&#10;     */&#10;    @Override&#10;    public boolean equals(Object obj) {&#10;        if (!(obj instanceof Board)) return false;&#10;        Board other = (Board) obj;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (this.board[r][c] != other.board[r][c]) return false;&#10;            }&#10;        }&#10;        return true;&#10;    }&#10;&#10;    /**&#10;     * Representación en texto del tablero.&#10;     */&#10;    @Override&#10;    public String toString() {&#10;        StringBuilder sb = new StringBuilder();&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                char ch = board[r][c] == 0 ? '.' : (board[r][c] == 1 ? 'X' : 'O');&#10;                sb.append(ch).append(&quot; &quot;);&#10;            }&#10;            sb.append(&quot;\n&quot;);&#10;        }&#10;        return sb.toString();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java" />
-              <option name="originalContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;    private Board board;&#10;    private List&lt;Move&gt; moves;&#10;    private int consecutivePasses;&#10;    private Board lastBoardState;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;        this.board = new Board();&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;        this.lastBoardState = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;    public Board getBoard() { return board; }&#10;    public List&lt;Move&gt; getMoves() { return moves; }&#10;    public int getConsecutivePasses() { return consecutivePasses; }&#10;    public void incrementConsecutivePasses() { this.consecutivePasses++; }&#10;    public void resetConsecutivePasses() { this.consecutivePasses = 0; }&#10;    public Board getLastBoardState() { return lastBoardState; }&#10;    public void setLastBoardState(Board boardState) { this.lastBoardState = boardState; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;        this.board = new Board(); // Reinicializar tablero limpio&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.util.UUID;&#10;&#10;/**&#10; * Representa un movimiento en una partida de Inazuma Go.&#10; */&#10;public class Move {&#10;    private String id;&#10;    private String playerId;&#10;    private int row;&#10;    private int col;&#10;    private boolean isPass; // true si es un pase, false si es colocar piedra&#10;    private long timestamp;&#10;    private int capturedCount; // número de piedras capturadas en este movimiento&#10;&#10;    public Move(String playerId, int row, int col) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.playerId = playerId;&#10;        this.row = row;&#10;        this.col = col;&#10;        this.isPass = false;&#10;        this.timestamp = System.currentTimeMillis();&#10;        this.capturedCount = 0;&#10;    }&#10;&#10;    public Move(String playerId, boolean isPass) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.playerId = playerId;&#10;        this.isPass = isPass;&#10;        this.timestamp = System.currentTimeMillis();&#10;        this.capturedCount = 0;&#10;        this.row = -1;&#10;        this.col = -1;&#10;    }&#10;&#10;    public String getId() {&#10;        return id;&#10;    }&#10;&#10;    public String getPlayerId() {&#10;        return playerId;&#10;    }&#10;&#10;    public int getRow() {&#10;        return row;&#10;    }&#10;&#10;    public int getCol() {&#10;        return col;&#10;    }&#10;&#10;    public boolean isPass() {&#10;        return isPass;&#10;    }&#10;&#10;    public long getTimestamp() {&#10;        return timestamp;&#10;    }&#10;&#10;    public int getCapturedCount() {&#10;        return capturedCount;&#10;    }&#10;&#10;    public void setCapturedCount(int count) {&#10;        this.capturedCount = count;&#10;    }&#10;&#10;    @Override&#10;    public String toString() {&#10;        if (isPass) {&#10;            return &quot;Move{&quot; + &quot;playerId='&quot; + playerId + '\'' + &quot;, PASS&quot; + &quot;, timestamp=&quot; + timestamp + '}';&#10;        }&#10;        return &quot;Move{&quot; + &quot;playerId='&quot; + playerId + '\'' + &quot;, row=&quot; + row + &quot;, col=&quot; + col + &quot;, timestamp=&quot; + timestamp + '}';&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/MoveValidator.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/MoveValidator.java" />
-              <option name="updatedContent" value="package es.iesquevedo.service;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.Move;&#10;&#10;/**&#10; * Interfaz para validar movimientos en una partida de Inazuma Go.&#10; */&#10;public interface MoveValidator {&#10;    /**&#10;     * Valida un movimiento en el contexto de una partida.&#10;     * &#10;     * @param game La partida actual&#10;     * @param move El movimiento a validar&#10;     * @throws InvalidMoveException si el movimiento es inválido&#10;     * @throws PlayerNotInTurnException si no es el turno del jugador&#10;     */&#10;    void validateMove(Game game, Move move) throws InvalidMoveException, PlayerNotInTurnException;&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/GameServiceImpl.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/GameServiceImpl.java" />
-              <option name="originalContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.GameService;&#10;&#10;import java.util.HashMap;&#10;import java.util.Map;&#10;&#10;/**&#10; * Implementación de GameService.&#10; * Gestiona la lógica de turnos y validaciones en memoria.&#10; */&#10;public class GameServiceImpl implements GameService {&#10;&#10;    // Almacenamiento en memoria (será reemplazado por repositorio en producción)&#10;    private final Map&lt;String, Game&gt; games = new HashMap&lt;&gt;();&#10;&#10;    @Override&#10;    public Game createGame(String gameName, Player player1) {&#10;        if (gameName == null || gameName.isEmpty()) {&#10;            throw new IllegalArgumentException(&quot;Nombre de partida no puede estar vacío&quot;);&#10;        }&#10;        if (player1 == null) {&#10;            throw new IllegalArgumentException(&quot;Jugador 1 no puede ser nulo&quot;);&#10;        }&#10;        &#10;        Game game = new Game(gameName, player1);&#10;        games.put(game.getId(), game);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game joinGame(String gameId, Player player2) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        if (game.getState() != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;La partida no está en estado WAITING&quot;);&#10;        }&#10;        &#10;        game.addPlayer(player2);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game startGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        &#10;        game.start();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game executeMove(String gameId, String playerId, Object moveData) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        // Validar que es turno del jugador&#10;        Player currentPlayer = game.getCurrentPlayer();&#10;        if (currentPlayer == null || !currentPlayer.getId().equals(playerId)) {&#10;            throw new PlayerNotInTurnException(&quot;No es el turno del jugador: &quot; + playerId);&#10;        }&#10;&#10;        // Validar que el jugador está vivo&#10;        if (!currentPlayer.isAlive()) {&#10;            throw new InvalidMoveException(&quot;El jugador no está vivo&quot;);&#10;        }&#10;&#10;        // Validar que la partida está en curso&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new InvalidMoveException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        // Aquí iría validación específica de reglas del juego&#10;        // Por ahora, aceptamos el movimiento passively&#10;        // (MOTOR completa con lógica real según reglamento)&#10;&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game nextTurn(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        game.nextTurn();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game finishGame(String gameId, String winnerPlayerId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.finish(winnerPlayerId);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game abandonGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.abandon();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game getGame(String gameId) {&#10;        return games.get(gameId);&#10;    }&#10;&#10;    /**&#10;     * Método auxiliar para tests: resetea el almacenamiento en memoria.&#10;     */&#10;    public void reset() {&#10;        games.clear();&#10;    }&#10;}&#10;" />
-              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Board;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.GameService;&#10;import es.iesquevedo.service.MoveValidator;&#10;&#10;import java.util.HashMap;&#10;import java.util.Map;&#10;&#10;/**&#10; * Implementación de GameService.&#10; * Gestiona la lógica de turnos y validaciones en memoria.&#10; */&#10;public class GameServiceImpl implements GameService {&#10;&#10;    // Almacenamiento en memoria (será reemplazado por repositorio en producción)&#10;    private final Map&lt;String, Game&gt; games = new HashMap&lt;&gt;();&#10;    private final MoveValidator moveValidator;&#10;&#10;    public GameServiceImpl() {&#10;        this.moveValidator = new InazumaGoMoveValidator();&#10;    }&#10;&#10;    public GameServiceImpl(MoveValidator moveValidator) {&#10;        this.moveValidator = moveValidator;&#10;    }&#10;&#10;    @Override&#10;    public Game createGame(String gameName, Player player1) {&#10;        if (gameName == null || gameName.isEmpty()) {&#10;            throw new IllegalArgumentException(&quot;Nombre de partida no puede estar vacío&quot;);&#10;        }&#10;        if (player1 == null) {&#10;            throw new IllegalArgumentException(&quot;Jugador 1 no puede ser nulo&quot;);&#10;        }&#10;        &#10;        Game game = new Game(gameName, player1);&#10;        games.put(game.getId(), game);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game joinGame(String gameId, Player player2) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        if (game.getState() != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;La partida no está en estado WAITING&quot;);&#10;        }&#10;        &#10;        game.addPlayer(player2);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game startGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        &#10;        game.start();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game executeMove(String gameId, String playerId, Object moveData) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (!(moveData instanceof Move)) {&#10;            throw new IllegalArgumentException(&quot;moveData debe ser instancia de Move&quot;);&#10;        }&#10;&#10;        Move move = (Move) moveData;&#10;&#10;        // Validar movimiento con reglas de Inazuma Go&#10;        moveValidator.validateMove(game, move);&#10;&#10;        // Guardar estado previo del tablero para detectar repetición&#10;        Board previousBoardState = game.getBoard().clone();&#10;&#10;        if (move.isPass()) {&#10;            // Registrar pase&#10;            game.getMoves().add(move);&#10;            game.incrementConsecutivePasses();&#10;&#10;            // Doble pase = fin de partida&#10;            if (game.getConsecutivePasses() &gt;= 2) {&#10;                game.setState(GameState.FINISHED);&#10;                // Determinar ganador por puntuación (simplificado)&#10;                determineWinner(game);&#10;                return game;&#10;            }&#10;        } else {&#10;            // Ejecutar movimiento: colocar piedra&#10;            int color = game.getCurrentPlayerIndex() == 0 ? 1 : 2; // 1=negro, 2=blanco&#10;            Board board = game.getBoard();&#10;            board.placeStone(move.getRow(), move.getCol(), color);&#10;&#10;            // Capturar grupos enemigos sin libertades&#10;            int capturedCount = board.captureGroupsWithoutLiberties();&#10;            move.setCapturedCount(capturedCount);&#10;&#10;            // Registrar movimiento&#10;            game.getMoves().add(move);&#10;&#10;            // Reiniciar contador de pases si hubo captura&#10;            if (capturedCount &gt; 0) {&#10;                game.resetConsecutivePasses();&#10;            } else {&#10;                game.resetConsecutivePasses(); // También reinicia con colocación normal&#10;            }&#10;&#10;            // Detectar repetición: si el tablero es igual al estado previo, fin de partida&#10;            if (game.getLastBoardState() != null &amp;&amp; game.getLastBoardState().equals(board)) {&#10;                game.setState(GameState.FINISHED);&#10;                determineWinner(game);&#10;                return game;&#10;            }&#10;        }&#10;&#10;        // Guardar estado actual como &quot;último estado&quot; para próxima comparación&#10;        game.setLastBoardState(previousBoardState);&#10;&#10;        // Cambiar turno&#10;        game.nextTurn();&#10;&#10;        return game;&#10;    }&#10;&#10;    /**&#10;     * Determina el ganador de acuerdo a la puntuación simplificada.&#10;     * (En versión completa, implementar algoritmo de conteo según reglamento)&#10;     */&#10;    private void determineWinner(Game game) {&#10;        // Versión simplificada: cuenta piedras en el tablero&#10;        // TODO: Implementar conteo completo según reglamento (libertades, territorio, komi, etc.)&#10;        int blackStones = 0;&#10;        int whiteStones = 0;&#10;&#10;        Board board = game.getBoard();&#10;        for (int r = 0; r &lt; 9; r++) {&#10;            for (int c = 0; c &lt; 9; c++) {&#10;                if (board.getCell(r, c) == 1) blackStones++;&#10;                else if (board.getCell(r, c) == 2) whiteStones++;&#10;            }&#10;        }&#10;&#10;        // Komi de 5.5 para Blanco&#10;        double blackScore = blackStones;&#10;        double whiteScore = whiteStones + 5.5;&#10;&#10;        if (blackScore &gt; whiteScore) {&#10;            game.setWinnerPlayerId(game.getPlayers().get(0).getId());&#10;        } else {&#10;            game.setWinnerPlayerId(game.getPlayers().get(1).getId());&#10;        }&#10;    }&#10;&#10;    @Override&#10;    public Game nextTurn(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        game.nextTurn();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game finishGame(String gameId, String winnerPlayerId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.finish(winnerPlayerId);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game abandonGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.abandon();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game getGame(String gameId) {&#10;        return games.get(gameId);&#10;    }&#10;&#10;    /**&#10;     * Método auxiliar para tests: resetea el almacenamiento en memoria.&#10;     */&#10;    public void reset() {&#10;        games.clear();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java" />
-              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Board;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.MoveValidator;&#10;&#10;/**&#10; * Validador de movimientos para Inazuma Go.&#10; * Implementa las reglas del juego: turno, posición, libertades, suicidio, etc.&#10; */&#10;public class InazumaGoMoveValidator implements MoveValidator {&#10;&#10;    @Override&#10;    public void validateMove(Game game, Move move) throws InvalidMoveException, PlayerNotInTurnException {&#10;        // Verificar que la partida está en progreso&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new InvalidMoveException(&quot;La partida no está en progreso&quot;);&#10;        }&#10;&#10;        // Verificar que es el turno del jugador&#10;        Player currentPlayer = game.getCurrentPlayer();&#10;        if (currentPlayer == null || !currentPlayer.getId().equals(move.getPlayerId())) {&#10;            throw new PlayerNotInTurnException(&quot;No es el turno del jugador: &quot; + move.getPlayerId());&#10;        }&#10;&#10;        // Verificar que el jugador está vivo&#10;        if (!currentPlayer.isAlive()) {&#10;            throw new InvalidMoveException(&quot;El jugador no está vivo&quot;);&#10;        }&#10;&#10;        // Si es un pase, es válido&#10;        if (move.isPass()) {&#10;            return;&#10;        }&#10;&#10;        // Validar posición&#10;        if (move.getRow() &lt; 0 || move.getRow() &gt;= 9 || move.getCol() &lt; 0 || move.getCol() &gt;= 9) {&#10;            throw new InvalidMoveException(&quot;Posición fuera del tablero: (&quot; + move.getRow() + &quot;,&quot; + move.getCol() + &quot;)&quot;);&#10;        }&#10;&#10;        // La posición debe estar vacía&#10;        Board board = game.getBoard();&#10;        if (!board.isEmpty(move.getRow(), move.getCol())) {&#10;            throw new InvalidMoveException(&quot;La posición ya está ocupada: (&quot; + move.getRow() + &quot;,&quot; + move.getCol() + &quot;)&quot;);&#10;        }&#10;&#10;        // Validar que el movimiento no es suicidio&#10;        validateNotSuicide(board, move, game);&#10;    }&#10;&#10;    /**&#10;     * Valida que el movimiento no deja el grupo sin libertades (suicidio).&#10;     * Un movimiento es suicidio si:&#10;     * - Coloca una piedra que quedaría sin libertades&#10;     * - Y no captura piedras enemigas que restauren libertades&#10;     */&#10;    private void validateNotSuicide(Board board, Move move, Game game) throws InvalidMoveException {&#10;        Board testBoard = board.clone();&#10;&#10;        // Colocar la piedra (color: 1 para jugador 0, 2 para jugador 1)&#10;        int color = game.getCurrentPlayerIndex() == 0 ? 1 : 2;&#10;        testBoard.placeStone(move.getRow(), move.getCol(), color);&#10;&#10;        // Capturar grupos enemigos sin libertades&#10;        testBoard.captureGroupsWithoutLiberties();&#10;&#10;        // Si el grupo del jugador sigue sin libertades, es suicidio&#10;        if (testBoard.countLibertiesForGroup(move.getRow(), move.getCol()) == 0) {&#10;            throw new InvalidMoveException(&quot;Movimiento es suicidio: la piedra quedaría sin libertades&quot;);&#10;        }&#10;    }&#10;}&#10;&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
         <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/MainServiceImpl.java">
           <value>
             <PendingDiffInfo>
@@ -87,39 +37,6 @@
             </PendingDiffInfo>
           </value>
         </entry>
-        <entry key="$PROJECT_DIR$/src/test/java/es/iesquevedo/model/BoardTest.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/test/java/es/iesquevedo/model/BoardTest.java" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import org.junit.jupiter.api.BeforeEach;&#10;import org.junit.jupiter.api.Test;&#10;&#10;import java.util.Set;&#10;&#10;import static org.junit.jupiter.api.Assertions.assertEquals;&#10;import static org.junit.jupiter.api.Assertions.assertFalse;&#10;import static org.junit.jupiter.api.Assertions.assertTrue;&#10;&#10;class BoardTest {&#10;&#10;    private Board board;&#10;&#10;    @BeforeEach&#10;    void setUp() {&#10;        board = new Board();&#10;    }&#10;&#10;    @Test&#10;    void testInitialBoardIsEmpty() {&#10;        for (int r = 0; r &lt; 9; r++) {&#10;            for (int c = 0; c &lt; 9; c++) {&#10;                assertEquals(0, board.getCell(r, c), &quot;Tablero debe estar vacío inicialmente&quot;);&#10;            }&#10;        }&#10;    }&#10;&#10;    @Test&#10;    void testPlaceAndRemoveStone() {&#10;        board.placeStone(0, 0, 1); // Colocar piedra negra&#10;        assertEquals(1, board.getCell(0, 0));&#10;&#10;        board.removeStone(0, 0);&#10;        assertEquals(0, board.getCell(0, 0));&#10;    }&#10;&#10;    @Test&#10;    void testIsValid() {&#10;        assertTrue(board.isValid(0, 0));&#10;        assertTrue(board.isValid(8, 8));&#10;        assertFalse(board.isValid(-1, 0));&#10;        assertFalse(board.isValid(9, 0));&#10;        assertFalse(board.isValid(0, -1));&#10;        assertFalse(board.isValid(0, 9));&#10;    }&#10;&#10;    @Test&#10;    void testIsEmpty() {&#10;        assertTrue(board.isEmpty(0, 0));&#10;&#10;        board.placeStone(0, 0, 1);&#10;        assertFalse(board.isEmpty(0, 0));&#10;    }&#10;&#10;    @Test&#10;    void testGetNeighbors() {&#10;        // Centro: debe tener 4 vecinos&#10;        var neighbors = board.getNeighbors(4, 4);&#10;        assertEquals(4, neighbors.size());&#10;&#10;        // Esquina: debe tener 2 vecinos&#10;        neighbors = board.getNeighbors(0, 0);&#10;        assertEquals(2, neighbors.size());&#10;    }&#10;&#10;    @Test&#10;    void testCountLibertiesForSingleStone() {&#10;        board.placeStone(4, 4, 1);&#10;        int liberties = board.countLibertiesForGroup(4, 4);&#10;        assertEquals(4, liberties, &quot;Piedra aislada debe tener 4 libertades&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testCountLibertiesForConnectedGroup() {&#10;        // Grupo de 2 piedras conectadas&#10;        board.placeStone(4, 4, 1);&#10;        board.placeStone(4, 5, 1);&#10;&#10;        int liberties = board.countLibertiesForGroup(4, 4);&#10;        assertEquals(6, liberties, &quot;Grupo de 2 debe tener 6 libertades (sin contar duplicadas)&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testCountLibertiesWithBlockedGroup() {&#10;        // Piedra negra rodeada parcialmente&#10;        board.placeStone(4, 4, 1);&#10;        board.placeStone(3, 4, 2); // Blanco arriba&#10;        board.placeStone(5, 4, 2); // Blanco abajo&#10;&#10;        int liberties = board.countLibertiesForGroup(4, 4);&#10;        assertEquals(2, liberties, &quot;Piedra con 2 lados bloqueados debe tener 2 libertades&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testGetGroup() {&#10;        // Crear grupo de 3 piedras conectadas (L-shape)&#10;        board.placeStone(4, 4, 1);&#10;        board.placeStone(4, 5, 1);&#10;        board.placeStone(5, 5, 1);&#10;&#10;        Set&lt;String&gt; group = board.getGroup(4, 4);&#10;        assertEquals(3, group.size(), &quot;Grupo debe tener 3 piedras&quot;);&#10;        assertTrue(group.contains(&quot;4,4&quot;));&#10;        assertTrue(group.contains(&quot;4,5&quot;));&#10;        assertTrue(group.contains(&quot;5,5&quot;));&#10;    }&#10;&#10;    @Test&#10;    void testCaptureGroupWithoutLiberties() {&#10;        // Rodear completamente un grupo blanco&#10;        // . . W . .&#10;        // . N N N .&#10;        // . W W W .&#10;        board.placeStone(0, 2, 2); // Blanco arriba&#10;        board.placeStone(1, 1, 1); // Negro izq&#10;        board.placeStone(1, 2, 1); // Negro centro&#10;        board.placeStone(1, 3, 1); // Negro der&#10;        board.placeStone(2, 1, 2); // Blanco izq&#10;        board.placeStone(2, 2, 2); // Blanco centro&#10;        board.placeStone(2, 3, 2); // Blanco der&#10;&#10;        // Cerrar: Negro coloca en (0,3) capturando Blanco&#10;        board.placeStone(0, 3, 1);&#10;        board.placeStone(1, 0, 1); // Pared izquierda&#10;        board.placeStone(0, 1, 1); // Pared arriba-izq&#10;&#10;        int captured = board.captureGroupsWithoutLiberties();&#10;        assertTrue(captured &gt; 0, &quot;Debe haber capturado piedras&quot;);&#10;&#10;        // Verificar que las piedras blancas fueron removidas&#10;        assertEquals(0, board.getCell(0, 2), &quot;Piedra blanca (0,2) debe estar capturada&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testBoardClone() {&#10;        board.placeStone(0, 0, 1);&#10;        board.placeStone(1, 1, 2);&#10;&#10;        Board cloned = board.clone();&#10;        assertEquals(board.getCell(0, 0), cloned.getCell(0, 0));&#10;        assertEquals(board.getCell(1, 1), cloned.getCell(1, 1));&#10;&#10;        // Modificar el clon no debe afectar el original&#10;        cloned.placeStone(2, 2, 1);&#10;        assertEquals(0, board.getCell(2, 2), &quot;Original no debe ser afectado&quot;);&#10;        assertEquals(1, cloned.getCell(2, 2), &quot;Clon debe tener el cambio&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testBoardEquals() {&#10;        Board board2 = new Board();&#10;        assertTrue(board.equals(board2), &quot;Dos tableros vacíos deben ser iguales&quot;);&#10;&#10;        board.placeStone(0, 0, 1);&#10;        assertFalse(board.equals(board2), &quot;Tableros con diferentes estados deben ser distintos&quot;);&#10;&#10;        board2.placeStone(0, 0, 1);&#10;        assertTrue(board.equals(board2), &quot;Tableros con mismo estado deben ser iguales&quot;);&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/GameServiceTest.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/GameServiceTest.java" />
-              <option name="originalContent" value="package es.iesquevedo.service;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.impl.GameServiceImpl;&#10;import org.junit.jupiter.api.BeforeEach;&#10;import org.junit.jupiter.api.Test;&#10;&#10;import static org.junit.jupiter.api.Assertions.*;&#10;&#10;/**&#10; * Tests unitarios de GameService.&#10; */&#10;public class GameServiceTest {&#10;&#10;    private GameService gameService;&#10;    private Player player1;&#10;    private Player player2;&#10;&#10;    @BeforeEach&#10;    void setUp() {&#10;        gameService = new GameServiceImpl();&#10;        player1 = new Player(&quot;p1&quot;, &quot;Alice&quot;);&#10;        player2 = new Player(&quot;p2&quot;, &quot;Bob&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testCreateGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;&#10;        assertNotNull(game);&#10;        assertEquals(&quot;Inazuma Match&quot;, game.getName());&#10;        assertEquals(GameState.WAITING, game.getState());&#10;        assertEquals(1, game.getPlayers().size());&#10;        assertEquals(player1, game.getPlayers().get(0));&#10;    }&#10;&#10;    @Test&#10;    void testJoinGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        game = gameService.joinGame(game.getId(), player2);&#10;&#10;        assertEquals(2, game.getPlayers().size());&#10;        assertEquals(player2, game.getPlayers().get(1));&#10;        assertEquals(GameState.WAITING, game.getState());&#10;    }&#10;&#10;    @Test&#10;    void testJoinGameCannotAddThirdPlayer() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;&#10;        Player player3 = new Player(&quot;p3&quot;, &quot;Charlie&quot;);&#10;        assertThrows(IllegalStateException.class, () -&gt; gameService.joinGame(game.getId(), player3));&#10;    }&#10;&#10;    @Test&#10;    void testStartGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;&#10;        game = gameService.startGame(game.getId());&#10;&#10;        assertEquals(GameState.IN_PROGRESS, game.getState());&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;    }&#10;&#10;    @Test&#10;    void testStartGameRequiresTwoPlayers() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;&#10;        assertThrows(IllegalStateException.class, () -&gt; gameService.startGame(game.getId()));&#10;    }&#10;&#10;    @Test&#10;    void testNextTurn() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        game = gameService.startGame(game.getId());&#10;&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;        assertEquals(0, game.getTurnCount());&#10;&#10;        game = gameService.nextTurn(game.getId());&#10;&#10;        assertEquals(1, game.getCurrentPlayerIndex());&#10;        assertEquals(1, game.getTurnCount());&#10;&#10;        game = gameService.nextTurn(game.getId());&#10;&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;        assertEquals(2, game.getTurnCount());&#10;    }&#10;&#10;    @Test&#10;    void testExecuteMoveValidatesPlayerTurn() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        final Game startedGame = gameService.startGame(game.getId());&#10;&#10;        // Intenta mover con player2 pero es turno de player1&#10;        assertThrows(PlayerNotInTurnException.class, &#10;            () -&gt; gameService.executeMove(startedGame.getId(), player2.getId(), null));&#10;    }&#10;&#10;    @Test&#10;    void testExecuteMoveValidatesPlayerAlive() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        final Game startedGame = gameService.startGame(game.getId());&#10;&#10;        // Marca player1 como muerto&#10;        startedGame.getCurrentPlayer().setAlive(false);&#10;&#10;        assertThrows(InvalidMoveException.class, &#10;            () -&gt; gameService.executeMove(startedGame.getId(), player1.getId(), null));&#10;    }&#10;&#10;    @Test&#10;    void testFinishGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        gameService.startGame(game.getId());&#10;&#10;        game = gameService.finishGame(game.getId(), player1.getId());&#10;&#10;        assertEquals(GameState.FINISHED, game.getState());&#10;        assertEquals(player1.getId(), game.getWinnerPlayerId());&#10;        assertNotNull(game.getFinishedAt());&#10;    }&#10;&#10;    @Test&#10;    void testAbandonGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        gameService.startGame(game.getId());&#10;&#10;        game = gameService.abandonGame(game.getId());&#10;&#10;        assertEquals(GameState.ABANDONED, game.getState());&#10;        assertNotNull(game.getFinishedAt());&#10;    }&#10;&#10;    @Test&#10;    void testGetGameReturnsNull() {&#10;        assertNull(gameService.getGame(&quot;nonexistent&quot;));&#10;    }&#10;}&#10;&#10;&#10;" />
-              <option name="updatedContent" value="package es.iesquevedo.service;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.impl.GameServiceImpl;&#10;import org.junit.jupiter.api.BeforeEach;&#10;import org.junit.jupiter.api.Test;&#10;&#10;import static org.junit.jupiter.api.Assertions.*;&#10;&#10;/**&#10; * Tests unitarios de GameService.&#10; */&#10;public class GameServiceTest {&#10;&#10;    private GameService gameService;&#10;    private Player player1;&#10;    private Player player2;&#10;&#10;    @BeforeEach&#10;    void setUp() {&#10;        gameService = new GameServiceImpl();&#10;        player1 = new Player(&quot;p1&quot;, &quot;Alice&quot;);&#10;        player2 = new Player(&quot;p2&quot;, &quot;Bob&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testCreateGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;&#10;        assertNotNull(game);&#10;        assertEquals(&quot;Inazuma Match&quot;, game.getName());&#10;        assertEquals(GameState.WAITING, game.getState());&#10;        assertEquals(1, game.getPlayers().size());&#10;        assertEquals(player1, game.getPlayers().get(0));&#10;    }&#10;&#10;    @Test&#10;    void testJoinGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        game = gameService.joinGame(game.getId(), player2);&#10;&#10;        assertEquals(2, game.getPlayers().size());&#10;        assertEquals(player2, game.getPlayers().get(1));&#10;        assertEquals(GameState.WAITING, game.getState());&#10;    }&#10;&#10;    @Test&#10;    void testJoinGameCannotAddThirdPlayer() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;&#10;        Player player3 = new Player(&quot;p3&quot;, &quot;Charlie&quot;);&#10;        assertThrows(IllegalStateException.class, () -&gt; gameService.joinGame(game.getId(), player3));&#10;    }&#10;&#10;    @Test&#10;    void testStartGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;&#10;        game = gameService.startGame(game.getId());&#10;&#10;        assertEquals(GameState.IN_PROGRESS, game.getState());&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;    }&#10;&#10;    @Test&#10;    void testStartGameRequiresTwoPlayers() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;&#10;        assertThrows(IllegalStateException.class, () -&gt; gameService.startGame(game.getId()));&#10;    }&#10;&#10;    @Test&#10;    void testNextTurn() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        game = gameService.startGame(game.getId());&#10;&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;        assertEquals(0, game.getTurnCount());&#10;&#10;        game = gameService.nextTurn(game.getId());&#10;&#10;        assertEquals(1, game.getCurrentPlayerIndex());&#10;        assertEquals(1, game.getTurnCount());&#10;&#10;        game = gameService.nextTurn(game.getId());&#10;&#10;        assertEquals(0, game.getCurrentPlayerIndex());&#10;        assertEquals(2, game.getTurnCount());&#10;    }&#10;&#10;    @Test&#10;    void testExecuteMoveValidatesPlayerTurn() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        final Game startedGame = gameService.startGame(game.getId());&#10;&#10;        // Intenta mover con player2 pero es turno de player1&#10;        Move move = new Move(player2.getId(), 0, 0);&#10;        assertThrows(PlayerNotInTurnException.class, &#10;            () -&gt; gameService.executeMove(startedGame.getId(), player2.getId(), move));&#10;    }&#10;&#10;    @Test&#10;    void testExecuteMoveValidatesPlayerAlive() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        final Game startedGame = gameService.startGame(game.getId());&#10;&#10;        // Marca player1 como muerto&#10;        startedGame.getCurrentPlayer().setAlive(false);&#10;&#10;        Move move = new Move(player1.getId(), 0, 0);&#10;        assertThrows(InvalidMoveException.class, &#10;            () -&gt; gameService.executeMove(startedGame.getId(), player1.getId(), move));&#10;    }&#10;&#10;    @Test&#10;    void testFinishGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        gameService.startGame(game.getId());&#10;&#10;        game = gameService.finishGame(game.getId(), player1.getId());&#10;&#10;        assertEquals(GameState.FINISHED, game.getState());&#10;        assertEquals(player1.getId(), game.getWinnerPlayerId());&#10;        assertNotNull(game.getFinishedAt());&#10;    }&#10;&#10;    @Test&#10;    void testAbandonGame() {&#10;        Game game = gameService.createGame(&quot;Inazuma Match&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        gameService.startGame(game.getId());&#10;&#10;        game = gameService.abandonGame(game.getId());&#10;&#10;        assertEquals(GameState.ABANDONED, game.getState());&#10;        assertNotNull(game.getFinishedAt());&#10;    }&#10;&#10;    @Test&#10;    void testGetGameReturnsNull() {&#10;        assertNull(gameService.getGame(&quot;nonexistent&quot;));&#10;    }&#10;}&#10;&#10;&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java" />
-              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import org.junit.jupiter.api.BeforeEach;&#10;import org.junit.jupiter.api.Test;&#10;&#10;import static org.junit.jupiter.api.Assertions.assertEquals;&#10;import static org.junit.jupiter.api.Assertions.assertFalse;&#10;import static org.junit.jupiter.api.Assertions.assertNotNull;&#10;import static org.junit.jupiter.api.Assertions.assertTrue;&#10;&#10;class GameServiceImplExecuteMoveTest {&#10;&#10;    private GameServiceImpl gameService;&#10;    private Game game;&#10;    private Player player1;&#10;    private Player player2;&#10;&#10;    @BeforeEach&#10;    void setUp() {&#10;        gameService = new GameServiceImpl();&#10;        player1 = new Player(&quot;p1&quot;, &quot;Negro&quot;);&#10;        player2 = new Player(&quot;p2&quot;, &quot;Blanco&quot;);&#10;&#10;        game = gameService.createGame(&quot;testGame&quot;, player1);&#10;        gameService.joinGame(game.getId(), player2);&#10;        game = gameService.startGame(game.getId());&#10;    }&#10;&#10;    @Test&#10;    void testPlaceStoneChangesBoard() {&#10;        Move move = new Move(&quot;p1&quot;, 0, 0);&#10;        Game result = gameService.executeMove(game.getId(), &quot;p1&quot;, move);&#10;&#10;        assertEquals(1, result.getBoard().getCell(0, 0)); // Negro (1) en (0,0)&#10;        assertEquals(1, result.getMoves().size());&#10;        assertEquals(1, result.getCurrentPlayerIndex()); // Cambió a Blanco&#10;    }&#10;&#10;    @Test&#10;    void testDoublPassEndsGame() {&#10;        // Negro pasa&#10;        Move pass1 = new Move(&quot;p1&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, pass1);&#10;        assertEquals(1, game.getConsecutivePasses());&#10;        assertEquals(GameState.IN_PROGRESS, game.getState());&#10;&#10;        // Blanco pasa&#10;        Move pass2 = new Move(&quot;p2&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, pass2);&#10;        assertEquals(GameState.FINISHED, game.getState());&#10;        assertNotNull(game.getWinnerPlayerId());&#10;    }&#10;&#10;    @Test&#10;    void testCaptureRemovesPieces() {&#10;        // Crear una situación de captura correcta:&#10;        // Rodear una piedra blanca solitaria en (3,3) con piedras negras&#10;        // N en (2,3)&#10;        Move m1 = new Move(&quot;p1&quot;, 2, 3);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, m1);&#10;        &#10;        // B en (3,3) - la piedra que será capturada&#10;        Move m2 = new Move(&quot;p2&quot;, 3, 3);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, m2);&#10;        &#10;        // N en (4,3)&#10;        Move m3 = new Move(&quot;p1&quot;, 4, 3);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, m3);&#10;        &#10;        // B pasa&#10;        Move m4 = new Move(&quot;p2&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, m4);&#10;        &#10;        // N en (3,2)&#10;        Move m5 = new Move(&quot;p1&quot;, 3, 2);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, m5);&#10;        &#10;        // B pasa&#10;        Move m6 = new Move(&quot;p2&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, m6);&#10;        &#10;        // N en (3,4) y captura la piedra blanca en (3,3)&#10;        Move m7 = new Move(&quot;p1&quot;, 3, 4);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, m7);&#10;        &#10;        // Verificar que la piedra blanca fue capturada&#10;        assertEquals(0, game.getBoard().getCell(3, 3), &#10;            &quot;La piedra blanca en (3,3) debe estar capturada (rodeada por Negro)&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testConsecutivePassesResetAfterMove() {&#10;        // Negro pasa&#10;        Move pass1 = new Move(&quot;p1&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, pass1);&#10;        assertEquals(1, game.getConsecutivePasses());&#10;&#10;        // Blanco juega (no pasa)&#10;        Move move = new Move(&quot;p2&quot;, 0, 0);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, move);&#10;        assertEquals(0, game.getConsecutivePasses(), &quot;Los pases consecutivos deben resetear con un movimiento&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testMoveRecordedInHistory() {&#10;        Move move1 = new Move(&quot;p1&quot;, 0, 0);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, move1);&#10;        assertEquals(1, game.getMoves().size());&#10;&#10;        Move move2 = new Move(&quot;p2&quot;, 1, 1);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, move2);&#10;        assertEquals(2, game.getMoves().size());&#10;    }&#10;&#10;    @Test&#10;    void testTurnAlternatesCorrectly() {&#10;        assertEquals(0, game.getCurrentPlayerIndex(), &quot;Debe empezar con Negro (índice 0)&quot;);&#10;&#10;        Move move1 = new Move(&quot;p1&quot;, 0, 0);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, move1);&#10;        assertEquals(1, game.getCurrentPlayerIndex(), &quot;Debe cambiar a Blanco (índice 1)&quot;);&#10;&#10;        Move move2 = new Move(&quot;p2&quot;, 1, 1);&#10;        game = gameService.executeMove(game.getId(), &quot;p2&quot;, move2);&#10;        assertEquals(0, game.getCurrentPlayerIndex(), &quot;Debe cambiar a Negro (índice 0)&quot;);&#10;    }&#10;&#10;    @Test&#10;    void testPassDoesNotPlaceStone() {&#10;        Move pass = new Move(&quot;p1&quot;, true);&#10;        game = gameService.executeMove(game.getId(), &quot;p1&quot;, pass);&#10;&#10;        // El tablero debe seguir vacío&#10;        for (int r = 0; r &lt; 9; r++) {&#10;            for (int c = 0; c &lt; 9; c++) {&#10;                assertEquals(0, game.getBoard().getCell(r, c), &quot;Tablero debe estar vacío después de pase&quot;);&#10;            }&#10;        }&#10;    }&#10;}&#10;&#10;&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java" />
-              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Board;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import org.junit.jupiter.api.BeforeEach;&#10;import org.junit.jupiter.api.Test;&#10;&#10;import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;&#10;import static org.junit.jupiter.api.Assertions.assertThrows;&#10;&#10;class InazumaGoMoveValidatorTest {&#10;&#10;    private InazumaGoMoveValidator validator;&#10;    private Game game;&#10;    private Player player1;&#10;    private Player player2;&#10;&#10;    @BeforeEach&#10;    void setUp() {&#10;        validator = new InazumaGoMoveValidator();&#10;        player1 = new Player(&quot;p1&quot;, &quot;Negro&quot;);&#10;        player2 = new Player(&quot;p2&quot;, &quot;Blanco&quot;);&#10;        game = new Game(&quot;test&quot;, player1);&#10;        game.addPlayer(player2);&#10;        game.start();&#10;    }&#10;&#10;    @Test&#10;    void testValidPlyacementMove() {&#10;        Move move = new Move(&quot;p1&quot;, 0, 0);&#10;        assertDoesNotThrow(() -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testValidPassMove() {&#10;        Move move = new Move(&quot;p1&quot;, true);&#10;        assertDoesNotThrow(() -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testNotPlayerTurnThrows() {&#10;        Move move = new Move(&quot;p2&quot;, 0, 0); // Blanco intenta jugar pero es turno de Negro&#10;        assertThrows(PlayerNotInTurnException.class, () -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testGameNotInProgressThrows() {&#10;        game.setState(GameState.FINISHED);&#10;        Move move = new Move(&quot;p1&quot;, 0, 0);&#10;        assertThrows(InvalidMoveException.class, () -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testPositionOutOfBoundsThrows() {&#10;        Move move = new Move(&quot;p1&quot;, 9, 0); // Fuera del tablero 9x9&#10;        assertThrows(InvalidMoveException.class, () -&gt; validator.validateMove(game, move));&#10;&#10;        Move move2 = new Move(&quot;p1&quot;, -1, 5);&#10;        assertThrows(InvalidMoveException.class, () -&gt; validator.validateMove(game, move2));&#10;    }&#10;&#10;    @Test&#10;    void testOccupiedPositionThrows() {&#10;        Board board = game.getBoard();&#10;        board.placeStone(0, 0, 1); // Colocar piedra negra&#10;&#10;        Move move = new Move(&quot;p1&quot;, 0, 0);&#10;        assertThrows(InvalidMoveException.class, () -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testSuicideMoveThrows() {&#10;        // Crear una situación de suicidio: piedra rodeada sin libertades&#10;        Board board = game.getBoard();&#10;        // Rodear posición (2,2) de manera que no haya libertades&#10;        board.placeStone(1, 2, 2); // Blanco arriba&#10;        board.placeStone(3, 2, 2); // Blanco abajo&#10;        board.placeStone(2, 1, 2); // Blanco izquierda&#10;        board.placeStone(2, 3, 2); // Blanco derecha&#10;&#10;        Move move = new Move(&quot;p1&quot;, 2, 2); // Negro intenta colocar en centro rodeado&#10;        assertThrows(InvalidMoveException.class, () -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testCaptureMovesAllowed() {&#10;        // Crear situación donde Negro captura: piedra blanca rodeada&#10;        Board board = game.getBoard();&#10;        board.placeStone(0, 1, 2); // Blanco en (0,1)&#10;        board.placeStone(1, 0, 1); // Negro en (1,0)&#10;        board.placeStone(1, 2, 1); // Negro en (1,2)&#10;        board.placeStone(2, 1, 1); // Negro en (2,1)&#10;&#10;        // Negro coloca en (0,0) capturando a Blanco&#10;        Move move = new Move(&quot;p1&quot;, 0, 0);&#10;        assertDoesNotThrow(() -&gt; validator.validateMove(game, move));&#10;    }&#10;&#10;    @Test&#10;    void testSecondPlayerTurnAfterFirst() {&#10;        game.nextTurn(); // Cambiar a turno de Blanco&#10;&#10;        Move move = new Move(&quot;p2&quot;, 1, 1);&#10;        assertDoesNotThrow(() -&gt; validator.validateMove(game, move));&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
       </map>
     </option>
   </component>
diff --git a/src/main/java/es/iesquevedo/MainGUI.java b/src/main/java/es/iesquevedo/MainGUI.java
index b40725d..c5de527 100644
--- a/src/main/java/es/iesquevedo/MainGUI.java
+++ b/src/main/java/es/iesquevedo/MainGUI.java
@@ -1,8 +1,7 @@
 package es.iesquevedo;
 
-import es.iesquevedo.config.AppConfig;
-import es.iesquevedo.service.impl.MainServiceImpl;
-import es.iesquevedo.ui.MainScreenController;
+import es.iesquevedo.controller.LoginController;
+import es.iesquevedo.service.auth.AuthServiceMock;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -18,23 +17,23 @@ public class MainGUI extends Application {
     @Override
     public void start(Stage primaryStage) {
         try {
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainScreen.fxml"));
+            // Cargar pantalla de login
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Login.fxml"));
             Parent root = loader.load();
 
-            MainScreenController controller = loader.getController();
-            String firebaseUrl = System.getenv("FIREBASE_URL");
-            var repository = AppConfig.createMainRepository(firebaseUrl);
-            var mainService = new MainServiceImpl(repository);
-            controller.setService(mainService);
+            // Configurar LoginController
+            LoginController controller = loader.getController();
+            controller.setAuthService(new AuthServiceMock());
 
-            Scene scene = new Scene(root, 700, 500);
-            primaryStage.setTitle("InazumaGo - Pantalla Principal");
+            Scene scene = new Scene(root, 500, 400);
+            primaryStage.setTitle("InazumaGo - Login");
             primaryStage.setScene(scene);
             primaryStage.show();
 
-            LOGGER.log(Level.INFO, "Aplicación JavaFX iniciada - Pantalla principal cargada");
+            LOGGER.log(Level.INFO, "Aplicación JavaFX iniciada - Pantalla de login cargada");
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Error al iniciar la aplicación", e);
+            e.printStackTrace();
         }
     }
 
diff --git a/src/main/java/es/iesquevedo/controller/GameController.java b/src/main/java/es/iesquevedo/controller/GameController.java
index d403057..24b1b19 100644
--- a/src/main/java/es/iesquevedo/controller/GameController.java
+++ b/src/main/java/es/iesquevedo/controller/GameController.java
@@ -1,5 +1,14 @@
 package es.iesquevedo.controller;
 
+import es.iesquevedo.model.Board;
+import es.iesquevedo.model.Game;
+import es.iesquevedo.model.GameState;
+import es.iesquevedo.model.Move;
+import es.iesquevedo.model.Player;
+import es.iesquevedo.service.impl.InazumaGoMoveValidator;
+import es.iesquevedo.exception.InvalidMoveException;
+import es.iesquevedo.exception.PlayerNotInTurnException;
+
 import javafx.animation.AnimationTimer;
 import javafx.fxml.FXML;
 import javafx.scene.canvas.Canvas;
@@ -34,30 +43,32 @@ public class GameController {
 
     private String player1Name = "Jugador 1";
     private String player2Name = "Jugador 2";
-    private int player1Score = 0;
-    private int player2Score = 0;
     private long player1TimeMs = 0;
     private long player2TimeMs = 0;
-    private boolean isPlayer1Turn = true;
-    private Stone[][] board;
     private AnimationTimer gameTimer;
     private long lastTime = 0;
     private boolean gameEnded = false;
-
-    enum Stone {
-        EMPTY, BLACK, WHITE
-    }
+    
+    // Lógica real del juego
+    private Game game;
+    private InazumaGoMoveValidator moveValidator;
+    private boolean moveInProgress = false;
 
     @FXML
     public void initialize() {
         LOGGER.log(Level.INFO, "GameController inicializado");
-        board = new Stone[BOARD_SIZE][BOARD_SIZE];
-        for (int i = 0; i < BOARD_SIZE; i++) {
-            for (int j = 0; j < BOARD_SIZE; j++) {
-                board[i][j] = Stone.EMPTY;
-            }
-        }
-
+        
+        // Inicializar validador de movimientos
+        moveValidator = new InazumaGoMoveValidator();
+        
+        // Crear juego con dos jugadores locales
+        Player player1 = new Player("1", player1Name);
+        Player player2 = new Player("2", player2Name);
+        
+        game = new Game("Local Game", player1);
+        game.addPlayer(player2);
+        game.start();
+        
         updatePlayerInfo();
         drawBoard();
         boardCanvas.setOnMouseClicked(this::onBoardClick);
@@ -72,12 +83,30 @@ private void updatePlayerInfo() {
     }
 
     private void updateScores() {
-        player1ScoreLabel.setText("Puntos: " + player1Score);
-        player2ScoreLabel.setText("Puntos: " + player2Score);
+        // Calcular puntuación simple: contar piedras por color
+        Board board = game.getBoard();
+        int blackStones = 0;
+        int whiteStones = 0;
+        
+        for (int r = 0; r < BOARD_SIZE; r++) {
+            for (int c = 0; c < BOARD_SIZE; c++) {
+                int cell = board.getCell(r, c);
+                if (cell == 1) blackStones++;
+                else if (cell == 2) whiteStones++;
+            }
+        }
+        
+        // Komi (ventaja blanca): 5.5
+        double blackScore = blackStones;
+        double whiteScore = whiteStones + 5.5;
+        
+        player1ScoreLabel.setText(String.format("Puntos: %.1f", blackScore));
+        player2ScoreLabel.setText(String.format("Puntos: %.1f", whiteScore));
     }
 
     private void updateCurrentTurn() {
-        String turn = isPlayer1Turn ? player1Name : player2Name;
+        Player currentPlayer = game.getCurrentPlayer();
+        String turn = currentPlayer != null ? currentPlayer.getName() : player1Name;
         currentTurnLabel.setText("Turno: " + turn);
     }
 
@@ -170,22 +199,26 @@ private void drawBoard() {
             }
         }
 
-        // Dibujar piedras actuales (usa drawStone)
+        // Dibujar piedras del tablero real (Board)
+        Board board = game.getBoard();
         for (int r = 0; r < BOARD_SIZE; r++) {
             for (int c = 0; c < BOARD_SIZE; c++) {
-                if (board[r][c] != Stone.EMPTY) {
-                    drawStone(gc, r, c, board[r][c]);
+                int cell = board.getCell(r, c);
+                if (cell == 1) { // Negro
+                    drawStone(gc, r, c, 1);
+                } else if (cell == 2) { // Blanco
+                    drawStone(gc, r, c, 2);
                 }
             }
         }
     }
 
-    private void drawStone(GraphicsContext gc, int row, int col, Stone stone) {
+    private void drawStone(GraphicsContext gc, int row, int col, int stoneColor) {
         double x = getIntersectionX(col);
         double y = getIntersectionY(row);
         double radius = CELL_SIZE / 2 - 3;
 
-        if (stone == Stone.BLACK) {
+        if (stoneColor == 1) { // Negro
             // sombra proyectada
             gc.setFill(Color.color(0, 0, 0, 0.28));
             gc.fillOval(x - radius + 2, y - radius + 3, radius * 1.9, radius * 1.9);
@@ -220,7 +253,7 @@ private void drawStone(GraphicsContext gc, int row, int col, Stone stone) {
             gc.setLineWidth(0.6);
             gc.strokeOval(x - radius, y - radius, radius * 2, radius * 2);
 
-        } else {
+        } else if (stoneColor == 2) { // Blanco
             // piedra blanca: sombra más suave
             gc.setFill(Color.color(0.06, 0.06, 0.06, 0.14));
             gc.fillOval(x - radius + 1.8, y - radius + 2.6, radius * 1.95, radius * 1.95);
@@ -262,8 +295,7 @@ private void drawStone(GraphicsContext gc, int row, int col, Stone stone) {
 
     @FXML
     private void onBoardClick(MouseEvent event) {
-        if (gameEnded) {
-            statusLabel.setText("Partida finalizada");
+        if (gameEnded || moveInProgress) {
             return;
         }
 
@@ -285,40 +317,119 @@ private boolean isValidPosition(int row, int col) {
     }
 
     private void placeStone(int row, int col) {
-        if (board[row][col] != Stone.EMPTY) {
-            statusLabel.setText("Posición ocupada");
+        if (moveInProgress || gameEnded) {
             return;
         }
-
-        Stone stone = isPlayer1Turn ? Stone.BLACK : Stone.WHITE;
-        board[row][col] = stone;
-
-        if (isPlayer1Turn) {
-            player1Score++;
-        } else {
-            player2Score++;
+        
+        moveInProgress = true;
+        
+        try {
+            Player currentPlayer = game.getCurrentPlayer();
+            
+            if (currentPlayer == null) {
+                statusLabel.setText("Error: sin jugador actual");
+                moveInProgress = false;
+                return;
+            }
+            
+            // Crear movimiento con playerId
+            Move move = new Move(currentPlayer.getId(), row, col);
+            
+            // Validar movimiento
+            moveValidator.validateMove(game, move);
+            
+            // Guardar estado previo para detectar repetición
+            Board previousBoardState = game.getBoard().clone();
+            
+            // Ejecutar movimiento en el tablero
+            Board board = game.getBoard();
+            int playerColor = (game.getCurrentPlayerIndex() == 0) ? 1 : 2; // 1=Negro, 2=Blanco
+            board.placeStone(row, col, playerColor);
+            
+            // Capturar grupos enemigos sin libertades
+            int capturedCount = board.captureGroupsWithoutLiberties();
+            
+            // Registrar movimiento
+            move.setCapturedCount(capturedCount);
+            game.getMoves().add(move);
+            
+            // Detectar repetición de posición (se ignora la reversión por ahora)
+            if (game.getLastBoardState() != null && board.equals(game.getLastBoardState())) {
+                statusLabel.setText("Movimiento rechazado: repetición de posición");
+                moveInProgress = false;
+                return;
+            }
+            
+            game.setLastBoardState(previousBoardState);
+            
+            // Movimiento exitoso
+            statusLabel.setText("Movimiento realizado" + (capturedCount > 0 ? " (" + capturedCount + " piedras capturadas)" : ""));
+            
+            // Cambiar turno
+            game.nextTurn();
+            game.resetConsecutivePasses();
+            
+            updatePlayerInfo();
+            drawBoard();
+            moveInProgress = false;
+            
+            LOGGER.log(Level.INFO, "Piedra colocada en [" + row + "," + col + "], capturadas: " + capturedCount);
+            
+        } catch (InvalidMoveException | PlayerNotInTurnException ex) {
+            statusLabel.setText("Movimiento inválido: " + ex.getMessage());
+            moveInProgress = false;
+            LOGGER.log(Level.WARNING, "Error en movimiento: " + ex.getMessage());
+        } catch (Exception ex) {
+            statusLabel.setText("Error: " + ex.getMessage());
+            moveInProgress = false;
+            LOGGER.log(Level.SEVERE, "Error inesperado en movimiento: " + ex.getMessage());
         }
-
-        isPlayer1Turn = !isPlayer1Turn;
-        updateScores();
-        updateCurrentTurn();
-        drawBoard();
-
-        statusLabel.setText("Piedra colocada");
-        LOGGER.log(Level.INFO, "Piedra colocada en [" + row + "," + col + "]");
     }
 
     @FXML
     private void onPassTurn() {
-        if (gameEnded) {
-            statusLabel.setText("Partida finalizada");
+        if (gameEnded || moveInProgress) {
             return;
         }
 
-        isPlayer1Turn = !isPlayer1Turn;
-        updateCurrentTurn();
-        statusLabel.setText((isPlayer1Turn ? player1Name : player2Name) + " pasó su turno");
-        LOGGER.log(Level.INFO, "Turno pasado");
+        moveInProgress = true;
+        
+        try {
+            Player currentPlayer = game.getCurrentPlayer();
+            if (currentPlayer == null) {
+                statusLabel.setText("Error: sin jugador actual");
+                moveInProgress = false;
+                return;
+            }
+            
+            // Crear movimiento de PASE
+            Move move = new Move(currentPlayer.getId(), true); // PASE
+            
+            // Validar (pasadas sin validación especial)
+            moveValidator.validateMove(game, move);
+            
+            // Registrar pase
+            game.getMoves().add(move);
+            game.incrementConsecutivePasses();
+            
+            // Cambiar turno
+            game.nextTurn();
+            
+            statusLabel.setText(currentPlayer.getName() + " pasó su turno. Pases consecutivos: " + game.getConsecutivePasses());
+            
+            // Verificar doble pase = fin de partida
+            if (game.getConsecutivePasses() >= 2) {
+                endGame();
+            }
+            
+            updateCurrentTurn();
+            moveInProgress = false;
+            
+            LOGGER.log(Level.INFO, "Turno pasado. Pases consecutivos: " + game.getConsecutivePasses());
+        } catch (Exception ex) {
+            statusLabel.setText("Error al pasar: " + ex.getMessage());
+            moveInProgress = false;
+        }
     }
 
     @FXML
@@ -330,10 +441,15 @@ private void onUndo() {
     @FXML
     private void onSurrender() {
         gameEnded = true;
-        String winner = isPlayer1Turn ? player2Name : player1Name;
-        String loser = isPlayer1Turn ? player1Name : player2Name;
-        statusLabel.setText(winner + " ganó. " + loser + " se rindió");
-        LOGGER.log(Level.INFO, loser + " se rindió. Ganador: " + winner);
+        game.setState(GameState.FINISHED);
+        
+        Player winner = game.getPlayers().get((game.getCurrentPlayerIndex() + 1) % 2);
+        Player loser = game.getCurrentPlayer();
+        
+        game.setWinnerPlayerId(winner.getId());
+        
+        statusLabel.setText(winner.getName() + " ganó. " + loser.getName() + " se rindió");
+        LOGGER.log(Level.INFO, loser.getName() + " se rindió. Ganador: " + winner.getName());
     }
 
     @FXML
@@ -344,6 +460,36 @@ private void onBackToMenu() {
         javafx.stage.Stage stage = (javafx.stage.Stage) boardCanvas.getScene().getWindow();
         stage.close();
     }
+    
+    private void endGame() {
+        gameEnded = true;
+        game.setState(GameState.FINISHED);
+        
+        // Calcular puntuación final
+        Board board = game.getBoard();
+        int blackStones = 0;
+        int whiteStones = 0;
+        
+        for (int r = 0; r < BOARD_SIZE; r++) {
+            for (int c = 0; c < BOARD_SIZE; c++) {
+                int cell = board.getCell(r, c);
+                if (cell == 1) blackStones++;
+                else if (cell == 2) whiteStones++;
+            }
+        }
+        
+        double blackScore = blackStones;
+        double whiteScore = whiteStones + 5.5;
+        
+        String winner = blackScore > whiteScore ? player1Name : player2Name;
+        String result = String.format("Partida finalizada. %s gana %.1f - %.1f", 
+            winner, Math.max(blackScore, whiteScore), Math.min(blackScore, whiteScore));
+        
+        statusLabel.setText(result);
+        LOGGER.log(Level.INFO, result);
+        
+        stopGameTimer();
+    }
 
     private void startGameTimer() {
         gameTimer = new AnimationTimer() {
@@ -358,7 +504,7 @@ public void handle(long now) {
                 lastTime = now;
 
                 if (!gameEnded) {
-                    if (isPlayer1Turn) {
+                    if (game.getCurrentPlayerIndex() == 0) {
                         player1TimeMs += elapsedNanos / 1_000_000;
                     } else {
                         player2TimeMs += elapsedNanos / 1_000_000;
@@ -397,8 +543,7 @@ public void setPlayerNames(String player1, String player2) {
     }
 
     public void setInitialScores(int score1, int score2) {
-        this.player1Score = score1;
-        this.player2Score = score2;
+        // Puntuación inicial se calcula del Board, no se establece manualmente
         if (player1ScoreLabel != null) {
             updateScores();
         }
diff --git a/src/main/java/es/iesquevedo/model/Board.java b/src/main/java/es/iesquevedo/model/Board.java
index 218efeb..3a33bde 100644
--- a/src/main/java/es/iesquevedo/model/Board.java
+++ b/src/main/java/es/iesquevedo/model/Board.java
@@ -220,4 +220,3 @@ public String toString() {
         return sb.toString();
     }
 }
-
diff --git a/src/main/java/es/iesquevedo/model/Move.java b/src/main/java/es/iesquevedo/model/Move.java
index 3f71917..014b3d7 100644
--- a/src/main/java/es/iesquevedo/model/Move.java
+++ b/src/main/java/es/iesquevedo/model/Move.java
@@ -74,4 +74,3 @@ public String toString() {
         return "Move{" + "playerId='" + playerId + '\'' + ", row=" + row + ", col=" + col + ", timestamp=" + timestamp + '}';
     }
 }
-
diff --git a/src/main/java/es/iesquevedo/service/MoveValidator.java b/src/main/java/es/iesquevedo/service/MoveValidator.java
index 390874f..b54c7a3 100644
--- a/src/main/java/es/iesquevedo/service/MoveValidator.java
+++ b/src/main/java/es/iesquevedo/service/MoveValidator.java
@@ -19,4 +19,3 @@ public interface MoveValidator {
      */
     void validateMove(Game game, Move move) throws InvalidMoveException, PlayerNotInTurnException;
 }
-
diff --git a/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java b/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java
index 0a13988..6e663b1 100644
--- a/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java
+++ b/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java
@@ -76,4 +76,3 @@ private void validateNotSuicide(Board board, Move move, Game game) throws Invali
     }
 }
 
-
diff --git a/src/test/java/es/iesquevedo/model/BoardTest.java b/src/test/java/es/iesquevedo/model/BoardTest.java
index e7dfc3a..eff7d9e 100644
--- a/src/test/java/es/iesquevedo/model/BoardTest.java
+++ b/src/test/java/es/iesquevedo/model/BoardTest.java
@@ -160,4 +160,3 @@ void testBoardEquals() {
         assertTrue(board.equals(board2), "Tableros con mismo estado deben ser iguales");
     }
 }
-
diff --git a/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java b/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java
index 5c57e67..d938676 100644
--- a/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java
+++ b/src/test/java/es/iesquevedo/service/impl/GameServiceImplExecuteMoveTest.java
@@ -144,4 +144,3 @@ void testPassDoesNotPlaceStone() {
 }
 
 
-
diff --git a/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java b/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java
index ca8399a..ff70974 100644
--- a/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java
+++ b/src/test/java/es/iesquevedo/service/impl/InazumaGoMoveValidatorTest.java
@@ -109,4 +109,3 @@ void testSecondPlayerTurnAfterFirst() {
         assertDoesNotThrow(() -> validator.validateMove(game, move));
     }
 }
-