From dab710597badbd14eacb12ac2c475c022602f152 Mon Sep 17 00:00:00 2001
From: Katchan <35238981+KatchanNve@users.noreply.github.com>
Date: Wed, 8 Dec 2021 21:47:34 +0100
Subject: [PATCH] Improve display in terminal view and add Shot icon in Window
 view

---
 .../main/java/fr/lnl/game/client/view/Cell.java  |  10 ++++++++--
 .../java/fr/lnl/game/client/view/Terminal.java   |   4 +++-
 .../fr/lnl/game/client/view/ViewManager.java     |   6 ++++--
 .../java/fr/lnl/game/client/view/Window.java     |   2 +-
 client/src/main/resources/player_shot.png        | Bin 0 -> 8078 bytes
 .../main/java/fr/lnl/game/server/games/Game.java |   7 +++++++
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 client/src/main/resources/player_shot.png

diff --git a/client/src/main/java/fr/lnl/game/client/view/Cell.java b/client/src/main/java/fr/lnl/game/client/view/Cell.java
index 23ccd9f..2c27805 100644
--- a/client/src/main/java/fr/lnl/game/client/view/Cell.java
+++ b/client/src/main/java/fr/lnl/game/client/view/Cell.java
@@ -1,5 +1,7 @@
 package fr.lnl.game.client.view;
 
+import fr.lnl.game.server.games.Game;
+import fr.lnl.game.server.games.action.Shot;
 import fr.lnl.game.server.games.grid.elements.Bomb;
 import fr.lnl.game.server.games.grid.elements.EnergyBall;
 import fr.lnl.game.server.games.grid.elements.Mine;
@@ -18,6 +20,7 @@ public class Cell extends Rectangle {
 
     private static final Image PLAYER_IMAGE = new Image("player.png");
     private static final Image PLAYER_SHIELD_IMAGE = new Image("player_shield.png");
+    private static final Image PLAYER_SHOT_IMAGE = new Image("player_shot.png");
     private static final Image ENERGY_BALL_IMAGE = new Image("energyBall.png");
     private static final Image BOMB_IMAGE = new Image("bomb.png");
     private static final Image MINE_IMAGE = new Image("mine.png");
@@ -33,11 +36,14 @@ public class Cell extends Rectangle {
 
 
 
-    public static StackPane setImageObject(Object object){
+    public static StackPane setImageObject(Object object, Game game){
         StackPane sp = new StackPane();
         Image in;
         if(object instanceof Player){
-            if(((Player) object).isShieldDeploy()){
+            if(object.equals(game.getCurrentPlayer()) && game.getSelectedAction() instanceof Shot){
+                in = PLAYER_SHOT_IMAGE;
+            }
+            else if(((Player) object).isShieldDeploy()){
                 in = PLAYER_SHIELD_IMAGE;
             }
             else{
diff --git a/client/src/main/java/fr/lnl/game/client/view/Terminal.java b/client/src/main/java/fr/lnl/game/client/view/Terminal.java
index 0162831..816d87c 100644
--- a/client/src/main/java/fr/lnl/game/client/view/Terminal.java
+++ b/client/src/main/java/fr/lnl/game/client/view/Terminal.java
@@ -24,7 +24,9 @@ public class Terminal extends AbstractView {
 
     @Override
     public void displayWinner(Player winner) {
-        System.out.println(winner + " " + winner.getId() + " a gagné la partie");
+        System.out.println("\n\033[0;31m====== FIN DU JEU ======\033[0m");
+        System.out.println(game.getGrid().toString());
+        System.out.println("\n\033[0;33mVictoire de " + winner  + " " + winner.getId() + "\033[0m");
     }
 
     @Override
diff --git a/client/src/main/java/fr/lnl/game/client/view/ViewManager.java b/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
index 6e89f8c..126fe5a 100644
--- a/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
+++ b/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
@@ -21,13 +21,15 @@ public record ViewManager(
         DisplayWinnerEvent displayWinnerEvent = new DisplayWinnerEvent();
         while (true) {
             Player player = game.getCurrentPlayer();
+            System.out.println("\n\033[0;34m====== Tour n°" + game.getNbrTurn() + " =======\033[0m");
+            System.out.println("\nA \033[0;31m" + player  + " " + player.getId() + "\033[0m de jouer");
             players.get(game.getCurrentPlayer()).getView().show();
             if(game.getCurrentPlayer() instanceof HumanPlayer human) {
                 game.setSelectedAction(players.get(human).getView().choseAction());
             }
             boolean isOver = game.play();
-            System.out.println("Le joueur ordinateur numéro " + player.getId() + " a joué");
-            System.out.println("Il a joué l'action: " + game.getSelectedAction().getClass().getSimpleName());
+            System.out.println("\n\033[0;31m" + player  + " " + player.getId() + "\033[0m utilise l'action \033[0;36m"+
+                    game.getSelectedAction().getClass().getSimpleName() + "\033[0m");
             if (isOver) {
                 displayWinnerEvent.updateModel(game.getWinner());
                 System.exit(0);
diff --git a/client/src/main/java/fr/lnl/game/client/view/Window.java b/client/src/main/java/fr/lnl/game/client/view/Window.java
index 059433a..00ce2e2 100644
--- a/client/src/main/java/fr/lnl/game/client/view/Window.java
+++ b/client/src/main/java/fr/lnl/game/client/view/Window.java
@@ -113,7 +113,7 @@ public class Window extends AbstractView {
     }
 
     public void addToPrincipalPanel(Object object, Pane principalPane, int i, int j) {
-        StackPane sp = Cell.setImageObject(object);
+        StackPane sp = Cell.setImageObject(object, game);
         sp.setLayoutY(i * cellSize);
         sp.setLayoutX(j * cellSize);
         principalPane.getChildren().add(sp);
diff --git a/client/src/main/resources/player_shot.png b/client/src/main/resources/player_shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..975d15d1483f3727766604813eca51a4357d5812
GIT binary patch
literal 8078
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
KWQDj%(Ek9&VodD-

literal 0
HcmV?d00001

diff --git a/server/src/main/java/fr/lnl/game/server/games/Game.java b/server/src/main/java/fr/lnl/game/server/games/Game.java
index cfaba42..fed49bf 100644
--- a/server/src/main/java/fr/lnl/game/server/games/Game.java
+++ b/server/src/main/java/fr/lnl/game/server/games/Game.java
@@ -21,6 +21,7 @@ public class Game {
     private final List<Player> players;
     private Player currentPlayer;
     private Action selectedAction = null;
+    private int nbrTurn;
 
     public Game(GridFactoryBuilder buildStrategy, List<Player> players) throws IllegalArgumentException {
         this.grid = buildStrategy.build();
@@ -32,6 +33,7 @@ public class Game {
         this.buildStrategy = buildStrategy;
         this.players = players;
         this.currentPlayer = players.get(0);
+        this.nbrTurn = 1;
         initGame();
     }
 
@@ -53,6 +55,7 @@ public class Game {
         gridPlayersUpdate();
         nextCurrentPlayer();
         currentPlayer.setActions(generateAndGetPlayerActions(currentPlayer));
+        nbrTurn++;
         return isOver();
     }
 
@@ -140,4 +143,8 @@ public class Game {
     public void setSelectedAction(Action selectedAction) {
         this.selectedAction = selectedAction;
     }
+
+    public int getNbrTurn() {
+        return nbrTurn;
+    }
 }
\ No newline at end of file