Merge remote-tracking branch 'origin/main'

# Conflicts: # src/main/java/controller/gamephasescontrollers/GameController.java
Advanced-Programming-2021 · Jun 24, 2021 · 16ae077 · 16ae077
2 parents 64c3e2e + 8667cdf
commit 16ae077
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/controller/gamephasescontrollers/GameController.java b/src/main/java/controller/gamephasescontrollers/GameController.java
@@ -1,5 +1,6 @@
 package controller.gamephasescontrollers;
 
+import controller.AIPlayerController;
 import model.CoinDice;
 import model.Player;
 import model.User;
@@ -312,14 +313,15 @@ public void endGameRound() {
             currentRound++;
             ViewInterface.showResult(response);
             changeCards(currentTurnPlayer);
+            AIPlayerController.setIsGameEnded(true);
             changeCards(currentTurnOpponentPlayer);
+            AIPlayerController.setIsGameEnded(false);
             Duel.runGame(this);
         }
-
     }
 
     private void undoMakeAICheatCommand() {
-        if (!currentTurnPlayer.getUser().getNickname().equals("ai") && currentTurnPlayer.isAI())
+        if (!(currentTurnPlayer.getUser().getNickname().equals("ai")) && currentTurnPlayer.isAI())
             currentTurnPlayer.setAI(false);
         if (!currentTurnOpponentPlayer.getUser().getNickname().equals("ai") && currentTurnOpponentPlayer.isAI())
             currentTurnOpponentPlayer.setAI(false);
@@ -424,7 +426,9 @@ public String getSideDeckCards(Player player) {
     }
 
     private void changeCards(Player player) {
-        if (player.isAI())
+        if(player.isAI())
+            return;
+        if(player.getUser().getNickname().equals("ai"))
             return;
         Deck deck = player.getPlayDeck();
         String deckInfo = player.getUser().getNickname() + "’s Deck: " + deck.getName() + "\n";

diff --git a/testcases/AI.txt b/testcases/AI.txt
@@ -2,13 +2,13 @@ user create --username parham --nickname pari --password 123
 user create --username abolfazl --nickname abol --password 123
 user login --username parham --password 123
 menu enter Duel
-duel --new --ai --rounds 1
+duel --new --ai --rounds 3
 1
 yes
 make me ai
 
 -----------------------------------------
-duel --new --ai --rounds 1
+duel --new --ai --rounds 3
 1
 yes
 make me ai