Merge pull request #19 from ijehyunpark/feature/card-communication

Feature/card communication
ijehyunpark · Jun 10, 2023 · 58102ee · 58102ee
2 parents fd6623b + 0b607e2
commit 58102ee
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 39 deletions.
diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/AgricolaGame.java b/src/main/java/com/semoss/agricola/GamePlay/domain/AgricolaGame.java
@@ -43,6 +43,7 @@ public class AgricolaGame implements Game {
     private final GameType gameType = GameType.Agricola;
 
 
+
     @Getter
     public static class GameState {
         private int round = -1;
@@ -207,16 +208,18 @@ public Player findNextPlayer(Player player) {
 
     /**
      * 플레이를 하지 않은 다음 플레이어를 찾는다.
-     * @param player 현재 플레이를 진행한 플레이어
      * @return 모든 플레이어가 플레이를 마친 경우 null, 아닌 경우 다음 플레이어
      */
-    public Optional<Player> findNextActionPlayer(Player player){
+    public Optional<Player> findNextActionPlayer(){
+        Player player = getGameState().getPlayer();
+
         Player nextPlayer = player;
         do{
-            nextPlayer = findNextPlayer(player);
+            nextPlayer = findNextPlayer(nextPlayer);
             if(!nextPlayer.isCompletedPlayed())
                 return Optional.of(nextPlayer);
         } while (nextPlayer != player);
+
         return Optional.empty();
     }
 
@@ -335,6 +338,17 @@ public void playExchange(Long improvementId, AnimalType animal, int count) {
         cookingMajorCard.cooking(player, AnimalStruct.builder().animal(animal).count(count).build());
     }
 
+
+    /**
+     * 식량 토큰과 구걸 토큰을 교환한다.
+     */
+    public void addBegging(int count) {
+        Player player = this.getGameState().getPlayer();
+
+        player.addResource(ResourceType.BEGGING, count);
+        player.addResource(ResourceType.FOOD, count);
+    }
+
     public void playRelocation(int y, int x, int newY, int newX, int count) {
         Player player = this.getGameState().getPlayer();
 

diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/action/component/ActionFactory.java b/src/main/java/com/semoss/agricola/GamePlay/domain/action/component/ActionFactory.java
@@ -250,7 +250,7 @@ public BasicAction resourceMarketAction() {
                         .build())
                 .resource(ResourceStruct.builder()
                         .resource(ResourceType.FOOD)
-                        .count(2)
+                        .count(1)
                         .build())
                 .build();
     }

diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/action/component/StackAction.java b/src/main/java/com/semoss/agricola/GamePlay/domain/action/component/StackAction.java
@@ -11,12 +11,12 @@ public interface StackAction extends Action {
     default void runStackAction(Player player, List<ResourceStructInterface> stacks) {
         stacks.stream()
                 .filter(ResourceStructInterface::isResource)
-                .map(resourceStructInterface -> (ResourceStruct) stacks)
+                .map(resourceStructInterface -> (ResourceStruct) resourceStructInterface)
                 .forEach(player::addResource);
 
         stacks.stream()
                 .filter(ResourceStructInterface::isAnimal)
-                .map(resourceStructInterface -> (AnimalStruct) stacks)
+                .map(resourceStructInterface -> (AnimalStruct) resourceStructInterface)
                 .forEach(player::addAnimal);
     }
 }
diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/player/Player.java b/src/main/java/com/semoss/agricola/GamePlay/domain/player/Player.java
@@ -28,6 +28,7 @@
  */
 @Getter
 @NoArgsConstructor
+
 public class Player {
     private Long userId;
     private boolean startingToken;

diff --git a/src/main/java/com/semoss/agricola/GamePlay/service/AgricolaService.java b/src/main/java/com/semoss/agricola/GamePlay/service/AgricolaService.java
@@ -6,14 +6,23 @@
 
 import java.util.List;
 
+/**
+ * 아그리 콜라 게임 메인 로직
+ */
 public interface AgricolaService {
+    // 게임 시작
     void start(Long gameRoomId);
+    // 플레이어 액션 요청 수락
     void playAction(Long gameRoomId, Long eventId, List<AgricolaActionRequest.ActionFormat> acts);
+    // 플레이어 교환 요청 수락
     void playExchange(Long gameRoomId, Long improvementId, ResourceType resource, int count);
     void playExchange(Long gameRoomId, Long improvementId, AnimalType resource, int count);
+    // 플레이어 재배치 요청 수락
     void playRelocation(Long gameRoomId, Integer y, Integer x, Integer newY, Integer newX, Integer count);
     void playRelocation(Long gameRoomId, AnimalType animalType, Integer newY, Integer newX, Integer count);
+    // 게임 종료
     void finish(Long gameRoomId);
+    // 플레이어 턴 검증
     boolean validatePlayer(Long gameRoomId, Object userId);
 
-}
+}
diff --git a/src/main/java/com/semoss/agricola/GamePlay/service/AgricolaServiceImpl.java b/src/main/java/com/semoss/agricola/GamePlay/service/AgricolaServiceImpl.java
@@ -5,8 +5,8 @@
 import com.semoss.agricola.GamePlay.domain.GameProgress;
 import com.semoss.agricola.GamePlay.domain.action.implement.DefaultAction;
 import com.semoss.agricola.GamePlay.domain.card.CardDictionary;
-import com.semoss.agricola.GamePlay.domain.resource.AnimalType;
 import com.semoss.agricola.GamePlay.domain.player.Player;
+import com.semoss.agricola.GamePlay.domain.resource.AnimalType;
 import com.semoss.agricola.GamePlay.domain.resource.ResourceType;
 import com.semoss.agricola.GamePlay.dto.AgricolaActionRequest;
 import com.semoss.agricola.GamePlay.exception.BlockingException;
@@ -54,35 +54,37 @@ private AgricolaGame extractGame(Long gameRoomId){
      * @param gameRoomId 게임을 시작할 게임방 고유 식발자
      */
     @Override
-    public void start(Long gameRoomId) {
-        log.info("게임이 시작되었습니다.");
+    public synchronized void start(Long gameRoomId) {
         // 게임을 사작할 게임방 검색
         GameRoom gameRoom =  gameRoomRepository.findById(gameRoomId).orElseThrow(
                 () -> new NoSuchElementException("해당 id를 가진 게임방이 존재하지 않습니다.")
         );
 
+//          // TODO: 다인용 지원 혹은 제약 결정
+//          if (gameRoom.getParticipants().size() != 4){
+//              throw new RuntimeException("현재 4인용만 지원합니다.");
+//          }
+        AgricolaGame game;
         if (gameRoom.getGame() != null)
             throw new RuntimeException("현재 진행중인 게임이 있습니다.");
 
-        // TODO: 다인용 지원 혹은 제약 결정
-//      if (gameRoom.getParticipants().size() != 4){
-//          throw new RuntimeException("현재 4인용만 지원합니다.");
-//      }
-
         // 새로운 아그리콜라 게임 시스템을 제작한다.
         List<DefaultAction> actions = actionProvider.stream().toList();
         CardDictionary cardDictionary = cardDictionaryProvider.getObject();
-        AgricolaGame game = agricolaGameProvider.getObject(gameRoom.getParticipants(), "NONE", actions, cardDictionary);
+        game = agricolaGameProvider.getObject(gameRoom.getParticipants(), "NONE", actions, cardDictionary);
         gameRoom.setGame(game);
 
-        // 선공 플레이어의 경우 음식 토큰 2개, 아닌 경우 3개를 받는다.
-        game.setUpStartingFood();
+        log.info("게임이 시작되었습니다. :" + gameRoomId);
+
+            // 선공 플레이어의 경우 음식 토큰 2개, 아닌 경우 3개를 받는다.
+            game.setUpStartingFood();
 
-        // 각 플레이어에게 보조설비 및 직업카드를 7장 배포한다.
-        game.distributeMinorCardsAndOccupations(CardDistributeStrategy.RANDOM);
+            // 각 플레이어에게 보조설비 및 직업카드를 7장 배포한다.
+            game.distributeMinorCardsAndOccupations(CardDistributeStrategy.RANDOM);
+
+            // 게임 시작 후 최초 라운드 시작을 개시한다.
+            roundStart(gameRoomId);
 
-        // 게임 시작 후 최초 라운드 시작을 개시한다.
-        roundStart(gameRoomId);
     }
 
     /**
@@ -95,10 +97,10 @@ public void start(Long gameRoomId) {
     - 지금까지 게임의 플레이어 점수를 확인할 수 있다.
      * @param gameRoomId 라운드 시작 프로세스를 진행할 게임방 고유 식별자
      */
-    private void roundStart(Long gameRoomId) {
+    private synchronized void roundStart(Long gameRoomId) {
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
-        log.info("round가 시작되었습니다.: " + game.getGameState().getRound());
+        log.info("round가 시작되었습니다.: " + game.getGameState().getRound() + 1);
 
         // 현재 게임 상태를 선공 플레이어의 행동 단계로 변경한다.
         game.update(GameProgress.PlayerAction, game.getStartingPlayer());
@@ -119,7 +121,7 @@ private void roundStart(Long gameRoomId) {
      * @param gameRoomId
      */
     @Override
-    public void playAction(Long gameRoomId, Long eventId, List<AgricolaActionRequest.ActionFormat> acts) {
+    public synchronized void playAction(Long gameRoomId, Long eventId, List<AgricolaActionRequest.ActionFormat> acts) {
         log.info("playAction 요청이 입력되었습니다. : " + eventId.toString());
 
         // 아그리콜라 게임 추출
@@ -137,7 +139,7 @@ public void playAction(Long gameRoomId, Long eventId, List<AgricolaActionRequest
         game.playAction(eventId, acts);
 
         // 모든 플레이어가 플레이를 마칠 경우 라운드 종료, 아닌 경우 다음 플레이어로 상태 변경
-        Optional<Player> nextPlayer = game.findNextActionPlayer(game.getGameState().getPlayer());
+        Optional<Player> nextPlayer = game.findNextActionPlayer();
         if(nextPlayer.isEmpty()){
             roundEnd(gameRoomId);
         } else{
@@ -153,7 +155,7 @@ public void playAction(Long gameRoomId, Long eventId, List<AgricolaActionRequest
      * @param count
      */
     @Override
-    public void playExchange(Long gameRoomId, Long improvementId, ResourceType resource, int count) {
+    public synchronized void playExchange(Long gameRoomId, Long improvementId, ResourceType resource, int count) {
         log.info("playExchange 요청이 입력되었습니다. : " + improvementId.toString());
         log.info(resource.getName());
         log.info(count);
@@ -162,10 +164,15 @@ public void playExchange(Long gameRoomId, Long improvementId, ResourceType resou
         AgricolaGame game = extractGame(gameRoomId);
 
         // 교환 작업 수행
-        game.playExchange(improvementId, resource, count);
+        if(resource != ResourceType.BEGGING){
+            game.playExchange(improvementId, resource, count);
+        }
 
         // 만약 게임 상태가 수확단계에서 이루어진 교환이라면 이후에 수확 과정을 진행한다.
         if(game.getGameState().getGameProgress() == GameProgress.HARVEST){
+            if(resource == ResourceType.BEGGING){
+                game.addBegging(count);
+            }
             feeding(gameRoomId);
         }
     }
@@ -178,8 +185,8 @@ public void playExchange(Long gameRoomId, Long improvementId, ResourceType resou
      * @param count
      */
     @Override
-    public void playExchange(Long gameRoomId, Long improvementId, AnimalType animal, int count) {
-        log.info("playExchange 요청이 입력되었습니다. : " + improvementId.toString());
+    public synchronized void playExchange(Long gameRoomId, Long improvementId, AnimalType animal, int count) {
+        log.info("playExchange 요청이 입력되었습니다. : " + improvementId);
         log.info(animal.getName());
         log.info(count);
 
@@ -199,7 +206,7 @@ public void playExchange(Long gameRoomId, Long improvementId, AnimalType animal,
      * 가축 재비치 진행
      */
     @Override
-    public void playRelocation(Long gameRoomId, Integer y, Integer x, Integer newY, Integer newX, Integer count) {
+    public synchronized void playRelocation(Long gameRoomId, Integer y, Integer x, Integer newY, Integer newX, Integer count) {
         log.info("playRelocation 요청이 입력되었습니다.");
 
         // 아그리콜라 게임 추출
@@ -214,7 +221,7 @@ public void playRelocation(Long gameRoomId, Integer y, Integer x, Integer newY,
      * 가축 재비치 진행
      */
     @Override
-    public void playRelocation(Long gameRoomId, AnimalType animalType, Integer newY, Integer newX, Integer count) {
+    public synchronized void playRelocation(Long gameRoomId, AnimalType animalType, Integer newY, Integer newX, Integer count) {
         log.info("playRelocation 요청이 입력되었습니다.");
 
         // 아그리콜라 게임 추출
@@ -229,7 +236,7 @@ public void playRelocation(Long gameRoomId, AnimalType animalType, Integer newY,
      * 라운드 종료 매커니즘
      * @param gameRoomId
      */
-    private void roundEnd(Long gameRoomId) {
+    private synchronized void roundEnd(Long gameRoomId) {
         log.info("라운드가 종료되었습니다.");
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
@@ -247,7 +254,7 @@ private void roundEnd(Long gameRoomId) {
         }
     }
 
-    private void roundEndExtension(Long gameRoomId) {
+    private synchronized void roundEndExtension(Long gameRoomId) {
         log.info("라운드가 종료되었습니다. - Extension");
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
@@ -271,7 +278,7 @@ private void roundEndExtension(Long gameRoomId) {
      * 수확 단계
      * @param gameRoomId
      */
-    public void harvesting(Long gameRoomId) {
+    public synchronized void harvesting(Long gameRoomId) {
         log.info("수확 라운드입니다.");
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
@@ -291,7 +298,7 @@ public void harvesting(Long gameRoomId) {
      * 먹여 살리기 단계
      * @param gameRoomId
      */
-    public void feeding(Long gameRoomId) {
+    public synchronized void feeding(Long gameRoomId) {
         log.info("먹여살리기 라운드입니다.");
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
@@ -310,7 +317,7 @@ public void feeding(Long gameRoomId) {
      * 번식 단계
      * @param gameRoomId
      */
-    private void breeding(Long gameRoomId) {
+    private synchronized void breeding(Long gameRoomId) {
         log.info("번식 라운드입니다.");
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);
@@ -336,7 +343,7 @@ private void breeding(Long gameRoomId) {
      * @param gameRoomId
      */
     @Override
-    public void finish(Long gameRoomId) {
+    public synchronized void finish(Long gameRoomId) {
         log.info("종료되었습니다.");
 
         // 아그리콜라 게임 추출
@@ -349,7 +356,7 @@ public void finish(Long gameRoomId) {
     }
 
     @Override
-    public boolean validatePlayer(Long gameRoomId, Object userId) {
+    public synchronized boolean validatePlayer(Long gameRoomId, Object userId) {
         // 아그리콜라 게임 추출
         AgricolaGame game = extractGame(gameRoomId);