[🚀 사이클2 - 미션 (기물 확장 + DB 적용)] 샤를 미션 제출합니다.

README.md

@@ -77,6 +77,20 @@
 - 이동 위치는 “1,1”와 같이 좌표형태의 숫자값만 입력으로 들어올 수 있다. 좌표는 쉼표로 구분한다.
 - 추가적으로 “한수쉼”이 들어올 수 있다.
 
+## 2-3. 기물 점수 규칙
+- 현재 장기판에 남아있는 기물들의 각 점수를 합산하여, 현재 점수를 계산한다.
+- 각 기물의 점수는 중요도 순으로 높은 배점을 가지며, 각 점수는 다음과 같다.
+
+| 기물  | 점수             |
+|-----|----------------|
+| 궁   | 0점(점수 계산에서 배제) |
+| 차   | 13점            |
+| 포   | 7점             |
+| 마   | 5점             |
+| 상   | 3점             |
+| 사   | 3점             |
+| 졸(병) | 2점             |
+
 # 3. 용어 사전
 
 ### 3-1. 기본 용어

src/main/java/controller/JanggiController.java

@@ -3,12 +3,16 @@
 import controller.dto.CurrentBoardStatus;
 import controller.dto.MovedPieceRequest;
 import domain.GameManager;
+import domain.HorseElephantFormation;
 import domain.Team;
 import exception.GameExceptionHandler;
 import exception.custom.GameException;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import strategy.InitializeStrategy;
+
 import view.InputView;
 import view.OutputView;
 
@@ -26,8 +30,9 @@ public JanggiController(GameExceptionHandler gameExceptionHandler, InputView inp
 
     public void start() {
         Map<Team, String> horseElephantFormations = readHorseElephantFormation();
-        startJanggiGame(horseElephantFormations);
-        playJanggiGame();
+        initializeJanggiGame(horseElephantFormations);
+        Team winnerTeam = playJanggiGame();
+        printGameWinner(winnerTeam);
     }
 
     private Map<Team, String> readHorseElephantFormation() {
@@ -38,24 +43,40 @@ private Map<Team, String> readHorseElephantFormation() {
         return horseElephantInputs;
     }
 
-    private void startJanggiGame(Map<Team, String> horseElephantFormations) {
-        this.gameManager = new GameManager(horseElephantFormations);
+    /**
+     * 1. 장기 게임 초기화
+     */
+    private void initializeJanggiGame(Map<Team, String> horseElephantFormations) {
+        this.gameManager = new GameManager(toInitializeStrategies(horseElephantFormations));
         printCurrentBoardStatus();
     }
 
+    private Map<Team, InitializeStrategy> toInitializeStrategies(Map<Team, String> horseElephantFormations) {
+        Map<Team, InitializeStrategy> initializeStrategies = new HashMap<>();
+        horseElephantFormations.forEach(
+                (team, formation) -> initializeStrategies.put(team, getBoardInitializeStrategy(formation))
+        );
+        return initializeStrategies;
+    }
+
+    private InitializeStrategy getBoardInitializeStrategy(String formationInput) {
+        return HorseElephantFormation.getStrategy(formationInput);
+    }
+
     private void printCurrentBoardStatus() {
         List<CurrentBoardStatus> statuses = gameManager.getCurrentBoardStatus();
         outputView.printCurrentBoard(statuses);
     }
 
-    private void playJanggiGame() {
-        /**
-         * TODO: 2차 사이클 - 게임 종료 조건 추가 예정
-         */
-        while (true) {
-            playTurn(Team.CHO);
-            playTurn(Team.HAN);
+    private Team playJanggiGame() {
+        Team currentTeam = Team.CHO;
+
+        while (!gameManager.isGameFinished(currentTeam)) {
+            playTurn(currentTeam);
+            currentTeam = switchTeam(currentTeam);
         }
+
+        return switchTeam(currentTeam);
     }
 
     private void playTurn(Team team) {
@@ -69,6 +90,17 @@ private void playTurn(Team team) {
         }
     }
 
+    private Team switchTeam(Team team) {
+        if (team == Team.CHO) {
+            return Team.HAN;
+        }
+        return Team.CHO;
+    }
+
+    private void printGameWinner(Team team) {
+        outputView.printGameWinner(team.getKoreanName());
+    }
+
     private void movePiece(Team team) {
         MovedPieceRequest movedPieceRequest = readMovedPiece();
         gameManager.movePiece(movedPieceRequest, team);

src/main/java/domain/Board.java

@@ -16,11 +16,21 @@ public class Board {
     private static final int MAX_COLUMN = 9;
     private static final int MIN_COLUMN = 1;
 
+    private static final int CHO_PALACE_MAX_ROW = 10;
+    private static final int CHO_PALACE_MIN_ROW = 8;
+    private static final int HAN_PALACE_MAX_ROW = 3;
+    private static final int HAN_PALACE_MIN_ROW = 1;
+    private static final int PALACE_MAX_COLUMN = 6;
+    private static final int PALACE_MIN_COLUMN = 4;
+
+    private static final Position CHO_PALACE_CENTER = Position.from(9, 5);
+    private static final Position HAN_PALACE_CENTER = Position.from(2, 5);
+
     protected final Map<Position, Piece> pieces = new HashMap<>();
 
-    public Board(InitializeStrategy choInitializeStrategy, InitializeStrategy hanInitializeStrategy) {
-        initTeamBoard(choInitializeStrategy, Team.CHO);
-        initTeamBoard(hanInitializeStrategy, Team.HAN);
+    public Board(Map<Team, InitializeStrategy> initializeStrategies) {
+        initializeStrategies.forEach(((team, initializeStrategy) ->
+                initTeamBoard(initializeStrategy, team)));
     }
 
     public void move(Position from, Position to, PieceType pieceType, Team team) {
@@ -72,6 +82,26 @@ public List<CurrentBoardStatus> getCurrentStatus() {
         return currentBoardStatuses;
     }
 
+    public boolean isInPalace(Team team, Position target) {
+        if (Team.CHO == team) {
+            return target.isPossiblePosition(CHO_PALACE_MAX_ROW, CHO_PALACE_MIN_ROW, PALACE_MAX_COLUMN,
+                    PALACE_MIN_COLUMN);
+        }
+        return target.isPossiblePosition(HAN_PALACE_MAX_ROW, HAN_PALACE_MIN_ROW, PALACE_MAX_COLUMN, PALACE_MIN_COLUMN);
+    }
+
+    public boolean isCenterPositionInPalace(Team team, Position target) {
+        if (Team.CHO == team) {
+            return CHO_PALACE_CENTER.isSamePosition(target);
+        }
+        return HAN_PALACE_CENTER.isSamePosition(target);
+    }
+
+    public boolean isExistPiece(PieceType target, Team team) {
+        return pieces.values().stream()
+                .anyMatch(piece -> piece.getType() == target && piece.getTeam() == team);
+    }
+
     /**
      * 헬퍼 메서드
      */

src/main/java/domain/GameManager.java

@@ -9,11 +9,8 @@
 public class GameManager {
     private final Board board;
 
-    public GameManager(Map<Team, String> formationInput) {
-        this.board = new Board(
-                getBoardInitializeStrategy(formationInput.get(Team.CHO)),
-                getBoardInitializeStrategy(formationInput.get(Team.HAN))
-        );
+    public GameManager(Map<Team, InitializeStrategy> initializeStrategies) {
+        this.board = new Board(initializeStrategies);
     }
 
     public List<CurrentBoardStatus> getCurrentBoardStatus() {
@@ -27,10 +24,7 @@ public void movePiece(MovedPieceRequest request, Team team) {
                 team);
     }
 
-    /**
-     * 헬퍼 메서드
-     */
-    private InitializeStrategy getBoardInitializeStrategy(String formationInput) {
-        return HorseElephantFormation.getStrategy(formationInput);
+    public boolean isGameFinished(Team currentTeam) {
+        return !board.isExistPiece(PieceType.KING, currentTeam);
     }
 }

src/main/java/domain/Position.java

@@ -57,6 +57,10 @@ public boolean isSameRow(Position other) {
         return false;
     }
 
+    public boolean isSamePosition(Position other){
+        return other.row == row && other.column == column;
+    }
+
     public boolean isPossiblePosition(int maxRow, int minRow, int maxColumn, int minColumn) {
         if (this.row > maxRow || this.row < minRow) {
             return false;

src/main/java/domain/piece/Guard.java

@@ -12,7 +12,15 @@ public Guard(Team team) {
 
     @Override
     public boolean canMove(Position from, Position to, Board board) {
-        if (!isCorrectMoveDistanceAndDirection(from, to)) {
+        if (!isPossiblePosition(to, board)) {
+            return false;
+        }
+
+        if (!isCorrectMoveDistance(from, to)) {
+            return false;
+        }
+
+        if (!isCorrectDirection(from, to, board)) {
             return false;
         }
 
@@ -23,11 +31,30 @@ public boolean canMove(Position from, Position to, Board board) {
         return !board.hasSameTeamOn(to, this);
     }
 
-    private boolean isEmptySpace(Position to, Board board) {
-        return board.isEmpty(to);
+    private boolean isPossiblePosition(Position to, Board board) {
+        return board.isInPalace(this.team, to);
     }
 
-    private boolean isCorrectMoveDistanceAndDirection(Position from, Position to) {
+    private boolean isCorrectMoveDistance(Position from, Position to) {
         return Math.abs(from.columnDistanceTo(to)) == 1 || Math.abs(from.rowDistanceTo(to)) == 1;
     }
+
+    private boolean isCorrectDirection(Position from, Position to, Board board) {
+        // 1. 출발지가 정중앙인 경우, 궁성 내 어디든지 이동 가능
+        if (board.isCenterPositionInPalace(team, from)) {
+            return true;
+        }
+
+        // 2. 출발지가 정중앙이 아닌 경우, 중앙으로 이동 가능
+        if (board.isCenterPositionInPalace(team, to)) {
+            return true;
+        }
+
+        // 3. 출발지가 정중앙이 아닌 경우, 상하좌우로 이동 가능
+        return !(Math.abs(from.columnDistanceTo(to)) == 1 && Math.abs(from.rowDistanceTo(to)) == 1);
+    }
+
+    private boolean isEmptySpace(Position to, Board board) {
+        return board.isEmpty(to);
+    }
 }

src/main/java/domain/piece/King.java

@@ -12,7 +12,15 @@ public King(Team team) {
 
     @Override
     public boolean canMove(Position from, Position to, Board board) {
-        if (!isCorrectMoveDistanceAndDirection(from, to)) {
+        if (!isPossiblePosition(to, board)) {
+            return false;
+        }
+
+        if (!isCorrectMoveDistance(from, to)) {
+            return false;
+        }
+
+        if (!isCorrectDirection(from, to, board)) {
             return false;
         }
 
@@ -23,11 +31,30 @@ public boolean canMove(Position from, Position to, Board board) {
         return !board.hasSameTeamOn(to, this);
     }
 
-    private boolean isEmptySpace(Position to, Board board) {
-        return board.isEmpty(to);
+    private boolean isPossiblePosition(Position to, Board board) {
+        return board.isInPalace(this.team, to);
     }
 
-    private boolean isCorrectMoveDistanceAndDirection(Position from, Position to) {
+    private boolean isCorrectMoveDistance(Position from, Position to) {
         return Math.abs(from.columnDistanceTo(to)) == 1 || Math.abs(from.rowDistanceTo(to)) == 1;
     }
+
+    private boolean isCorrectDirection(Position from, Position to, Board board) {
+        // 1. 출발지가 정중앙인 경우, 궁성 내 어디든지 이동 가능
+        if (board.isCenterPositionInPalace(team, from)) {
+            return true;
+        }
+
+        // 2. 출발지가 정중앙이 아닌 경우, 중앙으로 이동 가능
+        if (board.isCenterPositionInPalace(team, to)) {
+            return true;
+        }
+
+        // 3. 출발지가 정중앙이 아닌 경우, 상하좌우로 이동 가능
+        return !(Math.abs(from.columnDistanceTo(to)) == 1 && Math.abs(from.rowDistanceTo(to)) == 1);
+    }
+
+    private boolean isEmptySpace(Position to, Board board) {
+        return board.isEmpty(to);
+    }
 }

src/main/java/view/OutputView.java

@@ -4,6 +4,8 @@
 import java.util.List;
 
 public class OutputView {
+    private static final String GAME_WINNER_GUIDE = "장기 게임이 종료되었습니다. 게임의 우승자는 %s나라 입니다.";
+
     private static final int BOARD_ROW_SIZE = 10;
     private static final int BOARD_COLUMN_SIZE = 9;
     private static final String EMPTY_CELL = "   ";
@@ -29,10 +31,13 @@ public void printErrorMessage(String message){
         System.out.println(message);
     }
 
+    public void printGameWinner(String winner) {
+        System.out.println(String.format(GAME_WINNER_GUIDE, winner));
+    }
+
     /**
      * 헬퍼 메서드
      */
-
     private String[][] createEmptyBoard() {
         String[][] board = new String[BOARD_ROW_SIZE][BOARD_COLUMN_SIZE];