From 4c7017ff974247ac1c470038df395e51fb75a560 Mon Sep 17 00:00:00 2001
From: Quentin Legot <legotquentin@gmail.com>
Date: Thu, 2 Dec 2021 18:33:18 +0100
Subject: [PATCH 1/2] FINALLY fix the game with Window (currently not work with
 terminal)

---
 .../src/main/java/fr/lnl/game/client/App.java |  5 +-
 .../game/client/listener/ButtonListener.java  | 17 +++++-
 .../game/client/listener/UpdateViewEvent.java | 12 ----
 .../fr/lnl/game/client/view/TimerService.java | 19 ------
 .../fr/lnl/game/client/view/ViewManager.java  | 13 ----
 .../java/fr/lnl/game/client/view/Window.java  |  7 ++-
 .../java/fr/lnl/game/server/games/Game.java   | 61 ++++++-------------
 .../game/server/games/InterfaceAction.java    |  3 +-
 .../lnl/game/server/listener/AwakeGame.java   | 17 ------
 .../game/server/listener/GameFinishEvent.java |  2 -
 .../test/java/fr/lnl/game/server/Mock.java    |  3 +-
 .../lnl/game/server/games/MockViewUpdate.java | 10 ---
 12 files changed, 42 insertions(+), 127 deletions(-)
 delete mode 100644 client/src/main/java/fr/lnl/game/client/listener/UpdateViewEvent.java
 delete mode 100644 client/src/main/java/fr/lnl/game/client/view/TimerService.java
 delete mode 100644 server/src/main/java/fr/lnl/game/server/listener/AwakeGame.java
 delete mode 100644 server/src/test/java/fr/lnl/game/server/games/MockViewUpdate.java

diff --git a/client/src/main/java/fr/lnl/game/client/App.java b/client/src/main/java/fr/lnl/game/client/App.java
index 7b41864..574a030 100644
--- a/client/src/main/java/fr/lnl/game/client/App.java
+++ b/client/src/main/java/fr/lnl/game/client/App.java
@@ -1,7 +1,6 @@
 package fr.lnl.game.client;
 import fr.lnl.game.client.view.*;
 import fr.lnl.game.server.listener.GameFinishEvent;
-import fr.lnl.game.client.listener.UpdateViewEvent;
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.grid.Grid;
 import fr.lnl.game.server.games.player.*;
@@ -39,7 +38,7 @@ public class App extends Application {
     public static void startGame(ViewLambda lambda) throws IllegalArgumentException, InvocationTargetException, NoSuchMethodException,
             InstantiationException, IllegalAccessException {
         List<Player> players = parsePlayers();
-        game = new Game(new Grid(12, 12, players), players, new UpdateViewEvent(), new GameFinishEvent());
+        game = new Game(new Grid(12, 12, players), players, new GameFinishEvent());
         for (Player player : game.getPlayers()) {
             playerList.put(player, new ClientPlayer(player, lambda.createViewLambda(player)));
         }
@@ -54,7 +53,6 @@ public class App extends Application {
             throw new CrashException(e.getMessage(), e);
         }
         viewManager = new ViewManager(playerList, game);
-        new Thread(() -> game.play()).start();
     }
 
     public static void launchTerminal() {
@@ -65,7 +63,6 @@ public class App extends Application {
             throw new CrashException(e.getMessage(), e);
         }
         viewManager = new ViewManager(playerList, game);
-        new Thread(() -> game.play()).start();
     }
 
     public static List<Player> parsePlayers() throws IllegalArgumentException, NoSuchMethodException,
diff --git a/client/src/main/java/fr/lnl/game/client/listener/ButtonListener.java b/client/src/main/java/fr/lnl/game/client/listener/ButtonListener.java
index bfcf322..4d8e7f4 100644
--- a/client/src/main/java/fr/lnl/game/client/listener/ButtonListener.java
+++ b/client/src/main/java/fr/lnl/game/client/listener/ButtonListener.java
@@ -1,12 +1,21 @@
 package fr.lnl.game.client.listener;
 
 import fr.lnl.game.client.App;
+import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.listener.AbstractModelListening;
 import fr.lnl.game.server.listener.ModelListener;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Dialog;
 
 public class ButtonListener extends AbstractModelListening {
 
 
+    private final Game game;
+
+    public ButtonListener(Game game) {
+        this.game = game;
+    }
+
     @Override
     public void addListener(ModelListener e) {
        this.listeners.add(e);
@@ -20,6 +29,12 @@ public class ButtonListener extends AbstractModelListening {
 
     @Override
     public void updateModel(Object event) {
-        App.viewManager.setNeedUpdate(true);
+        game.play();
+        App.viewManager.updateView();
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Un joueur ordinateur a joué");
+        alert.setHeaderText("Le joueur ordinateur numéro" + game.getCurrentPlayer().getId() + " a joué");
+        alert.setContentText("Il a joué l'action: " + game.getSelectedAction());
+        alert.showAndWait();
     }
 }
diff --git a/client/src/main/java/fr/lnl/game/client/listener/UpdateViewEvent.java b/client/src/main/java/fr/lnl/game/client/listener/UpdateViewEvent.java
deleted file mode 100644
index ac6b91e..0000000
--- a/client/src/main/java/fr/lnl/game/client/listener/UpdateViewEvent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package fr.lnl.game.client.listener;
-
-import fr.lnl.game.client.App;
-import fr.lnl.game.server.listener.AbstractModelListening;
-
-public class UpdateViewEvent extends AbstractModelListening {
-
-    @Override
-    public void updateModel(Object obj) {
-        App.viewManager.setNeedUpdate(true);
-    }
-}
diff --git a/client/src/main/java/fr/lnl/game/client/view/TimerService.java b/client/src/main/java/fr/lnl/game/client/view/TimerService.java
deleted file mode 100644
index 936bb35..0000000
--- a/client/src/main/java/fr/lnl/game/client/view/TimerService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fr.lnl.game.client.view;
-
-import fr.lnl.game.client.App;
-import javafx.concurrent.ScheduledService;
-import javafx.concurrent.Task;
-
-public class TimerService extends ScheduledService<Integer> {
-    @Override
-    protected Task<Integer> createTask() {
-        return new Task<>() {
-            protected Integer call() {
-                if(App.viewManager.getNeedUpdate()) {
-                    App.viewManager.updateView();
-                }
-                return 0;
-            }
-        };
-    }
-}
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 50d11df..c71bfd3 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
@@ -12,27 +12,14 @@ public class ViewManager {
 
     private final HashMap<Player, ClientPlayer> players;
     private final Game game;
-    private Boolean needUpdate = true;
 
     public ViewManager(HashMap<Player, ClientPlayer> players, Game game) {
         this.players = players;
         this.game = game;
-        TimerService timer = new TimerService();
-        timer.setPeriod(Duration.millis(30));
         updateView();
-        timer.start();
     }
 
     public void updateView() {
         players.get(game.getCurrentPlayer()).getView().show();
-        setNeedUpdate(false);
-    }
-
-    public Boolean getNeedUpdate() {
-        return needUpdate;
-    }
-
-    public void setNeedUpdate(Boolean needUpdate) {
-        this.needUpdate = needUpdate;
     }
 }
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 65bb4e0..9ad05fa 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
@@ -25,9 +25,10 @@ public class Window extends AbstractView {
         String javaVersion = System.getProperty("java.version");
         String javafxVersion = System.getProperty("javafx.version");
         Label l = new Label("Hello, JavaFX version " + javafxVersion + ", running on Java " + javaVersion + ".");
-        Label l2 = new Label("I'm " + player.getClass().getSimpleName() + " num " + player.getId() + " my class is " + player.getClassPlayer().toString());
-        Button b = new Button("Click to see others players informations");
-        b.setOnAction(new ClientEventHandler(new ButtonListener()));
+        Label l2 = new Label("I'm " + player.getClass().getSimpleName() + " num " + player.getId() + "" +
+                " my class is " + player.getClassPlayer().toString() + ", my remaining energy is " + player.getEnergy());
+        Button b = new Button("Click to continue the game");
+        b.setOnAction(new ClientEventHandler(new ButtonListener(game)));
         GridPane grid = new GridPane();
         grid.add(l, 0, 0);
         grid.add(l2, 0, 1);
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 993219d..0966e38 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
@@ -5,7 +5,6 @@ import fr.lnl.game.server.games.grid.Grid;
 import fr.lnl.game.server.games.player.ComputerPlayer;
 import fr.lnl.game.server.games.player.HumanPlayer;
 import fr.lnl.game.server.games.player.Player;
-import fr.lnl.game.server.listener.AwakeGame;
 import fr.lnl.game.server.listener.ModelListener;
 import fr.lnl.game.server.utils.CrashException;
 import fr.lnl.game.server.utils.Point;
@@ -13,31 +12,25 @@ import fr.lnl.game.server.utils.Point;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 public class Game {
 
     private final Grid grid;
     private final List<Player> players;
-    private final ModelListener viewUpdateEvent;
     private final ModelListener gameFinishEvent;
     private Player currentPlayer;
-    private InterfaceAction interfaceAction;
     private Action selectedAction = null;
-    ModelListener awakeEvent;
-    private final Object lock = new Object();
 
-    public Game(Grid grid, List<Player> players, ModelListener viewUpdate, ModelListener gameFinishEvent) throws IllegalArgumentException {
+    public Game(Grid grid, List<Player> players, ModelListener gameFinishEvent) throws IllegalArgumentException {
         if(players.size() < 2)
             throw new IllegalArgumentException("The game need 2 or more player to start");
         this.players = players;
         this.currentPlayer = players.get(0);
         this.grid = grid;
-        this.viewUpdateEvent = viewUpdate;
         this.gameFinishEvent = gameFinishEvent;
         placePlayersBRUT();
-
+        currentPlayer.setActions(generateAndGetPlayerActions(currentPlayer));
     }
 
     /**
@@ -52,54 +45,36 @@ public class Game {
     }
     
     public void play() {
-        while(!isOver()) {
-            awakeEvent = new AwakeGame(this);
-            currentPlayer.setActions(generateAndGetPlayerActions(currentPlayer));
-            if(currentPlayer instanceof HumanPlayer) {
-                interfaceAction = InterfaceAction.SELECT_ACTION;
-                waitForInterfaceEvent();
-                selectedAction.doAction();
-            } else {
-                ComputerPlayer player = (ComputerPlayer) currentPlayer;
-                Action action = player.choseAction();
-                action.doAction();
-                waitNSeconds(2);
-            }
-            selectedAction = null;
-            nextCurrentPlayer();
-            viewUpdateEvent.updateModel(null);
+        if (currentPlayer instanceof ComputerPlayer player) {
+            selectedAction = player.choseAction();
         }
-        gameFinishEvent.updateModel(null);
+        selectedAction.doAction();
+        nextCurrentPlayer();
+        currentPlayer.setActions(generateAndGetPlayerActions(currentPlayer));
+        if(isOver()) {
+            gameFinishEvent.updateModel(null);
+        }
+
     }
 
     private void waitForInterfaceEvent() {
-        synchronized (lock){
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-    }
-
-    private void waitNSeconds(int n) {
         synchronized (this){
             try {
-                wait(TimeUnit.SECONDS.toMillis(n));
+                wait();
             } catch (InterruptedException e) {
                 throw new CrashException(e.getMessage(), e);
             }
         }
+
     }
 
     public void resumeThread() {
-        synchronized (lock) {
-            lock.notifyAll();
+        synchronized (this) {
+            notifyAll();
         }
     }
 
-    protected List<Action> generateAndGetPlayerActions(Player player) {
+    public List<Action> generateAndGetPlayerActions(Player player) {
         List<Action> actions = new ArrayList<>();
         for(Direction direction : Direction.values()) {
             try {
@@ -164,7 +139,7 @@ public class Game {
         return players;
     }
 
-    public InterfaceAction getInterfaceAction() {
-        return interfaceAction;
+    public Action getSelectedAction() {
+        return selectedAction;
     }
 }
\ No newline at end of file
diff --git a/server/src/main/java/fr/lnl/game/server/games/InterfaceAction.java b/server/src/main/java/fr/lnl/game/server/games/InterfaceAction.java
index 01591f1..2322f1f 100644
--- a/server/src/main/java/fr/lnl/game/server/games/InterfaceAction.java
+++ b/server/src/main/java/fr/lnl/game/server/games/InterfaceAction.java
@@ -2,6 +2,7 @@ package fr.lnl.game.server.games;
 
 public enum InterfaceAction {
 
-    SELECT_ACTION
+    SELECT_ACTION,
+    DIALOG_TO_CONTINUE_COMPUTER_IA
 
 }
diff --git a/server/src/main/java/fr/lnl/game/server/listener/AwakeGame.java b/server/src/main/java/fr/lnl/game/server/listener/AwakeGame.java
deleted file mode 100644
index c5bc122..0000000
--- a/server/src/main/java/fr/lnl/game/server/listener/AwakeGame.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package fr.lnl.game.server.listener;
-
-import fr.lnl.game.server.games.Game;
-
-public class AwakeGame extends AbstractModelListening {
-
-    private final Game game;
-
-    public AwakeGame(Game game) {
-        this.game = game;
-    }
-
-    @Override
-    public void updateModel(Object obj) {
-        game.resumeThread();
-    }
-}
diff --git a/server/src/main/java/fr/lnl/game/server/listener/GameFinishEvent.java b/server/src/main/java/fr/lnl/game/server/listener/GameFinishEvent.java
index f09595f..183b1ea 100644
--- a/server/src/main/java/fr/lnl/game/server/listener/GameFinishEvent.java
+++ b/server/src/main/java/fr/lnl/game/server/listener/GameFinishEvent.java
@@ -1,7 +1,5 @@
 package fr.lnl.game.server.listener;
 
-import fr.lnl.game.server.listener.AbstractModelListening;
-
 public class GameFinishEvent extends AbstractModelListening {
 
     private final Object lock = new Object();
diff --git a/server/src/test/java/fr/lnl/game/server/Mock.java b/server/src/test/java/fr/lnl/game/server/Mock.java
index 19e13bb..89aa984 100644
--- a/server/src/test/java/fr/lnl/game/server/Mock.java
+++ b/server/src/test/java/fr/lnl/game/server/Mock.java
@@ -1,7 +1,6 @@
 package fr.lnl.game.server;
 
 import fr.lnl.game.server.games.Game;
-import fr.lnl.game.server.games.MockViewUpdate;
 import fr.lnl.game.server.games.grid.EnergyBall;
 import fr.lnl.game.server.games.grid.Grid;
 import fr.lnl.game.server.games.grid.Wall;
@@ -27,7 +26,7 @@ public class Mock {
         placePlayersBRUT();
         placeEnergyBallBRUT();
         placeInternWallBRUT();
-        game = new Game(grid, players, new MockViewUpdate(), new GameFinishEvent());
+        game = new Game(grid, players, new GameFinishEvent());
     }
 
     public void placePlayersBRUT(){
diff --git a/server/src/test/java/fr/lnl/game/server/games/MockViewUpdate.java b/server/src/test/java/fr/lnl/game/server/games/MockViewUpdate.java
deleted file mode 100644
index 05ec33f..0000000
--- a/server/src/test/java/fr/lnl/game/server/games/MockViewUpdate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package fr.lnl.game.server.games;
-
-import fr.lnl.game.server.listener.AbstractModelListening;
-
-public class MockViewUpdate extends AbstractModelListening {
-    @Override
-    public void updateModel(Object obj) {
-        // no op
-    }
-}

From 0876b4c7732d1f5651eb51fc87b51b6cb7db0dbe Mon Sep 17 00:00:00 2001
From: Valentin Lucas <21901740@etu.unicaen.fr>
Date: Thu, 2 Dec 2021 19:56:37 +0100
Subject: [PATCH 2/2] Ajouts d'images et quelques modification de cell et Gui

---
 .../java/fr/lnl/game/client/view/Cell.java    |  26 +++++++++++++++---
 .../java/fr/lnl/game/client/view/GUI.java     |  16 ++++++++---
 .../main/resources/images/bottomLeftWall.PNG  | Bin 0 -> 6059 bytes
 .../main/resources/images/bottomRightWall.PNG | Bin 0 -> 6136 bytes
 .../src/main/resources/images/bottomWall.PNG  | Bin 0 -> 4777 bytes
 .../src/main/resources/images/rightWall.PNG   | Bin 0 -> 6101 bytes
 .../src/main/resources/images/topLeftWall.PNG | Bin 0 -> 5623 bytes
 .../main/resources/images/topRightWall.PNG    | Bin 0 -> 6346 bytes
 client/src/main/resources/images/topWall.PNG  | Bin 0 -> 4741 bytes
 9 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 client/src/main/resources/images/bottomLeftWall.PNG
 create mode 100644 client/src/main/resources/images/bottomRightWall.PNG
 create mode 100644 client/src/main/resources/images/bottomWall.PNG
 create mode 100644 client/src/main/resources/images/rightWall.PNG
 create mode 100644 client/src/main/resources/images/topLeftWall.PNG
 create mode 100644 client/src/main/resources/images/topRightWall.PNG
 create mode 100644 client/src/main/resources/images/topWall.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 7028f9d..fa51585 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
@@ -5,6 +5,7 @@ import fr.lnl.game.server.games.grid.EnergyBall;
 import fr.lnl.game.server.games.grid.Mine;
 import fr.lnl.game.server.games.grid.Wall;
 import fr.lnl.game.server.games.player.Player;
+import fr.lnl.game.server.utils.Cardinal;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
@@ -37,17 +38,34 @@ public class Cell extends Rectangle {
         if(object instanceof Player){
             image = new Image("file:resources/images/player.png");
         }
-        if(object instanceof EnergyBall){
+        else if(object instanceof EnergyBall){
             image = new Image("file:resources/images/energyBall.png");
         }
-        if(object instanceof Bomb){
+        else if(object instanceof Bomb){
             image = new Image("file:resources/images/bomb.jpg");
         }
-        if(object instanceof Mine){
+        else if(object instanceof Mine){
             image = new Image("file:resources/images/mine.webp");
         }
         else{
-            image = new Image("file:resources/images/wall.jpg");
+            //test
+            if(((Wall)object).getCardinal()== Cardinal.NORTH){
+                image = new Image("file:resources/topWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.SOUTH) {
+                image = new Image("file:resources/bottomWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.EAST) {
+                image = new Image("file:resources/rightWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.WEST) {
+                image = new Image("file:resources/leftWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.NORTH_EAST) {
+                image = new Image("file:resources/topRightWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.NORTH_WEST) {
+                image = new Image("file:resources/topLeftWall.png");
+            }else if(((Wall)object).getCardinal()== Cardinal.SOUTH_EAST) {
+                image = new Image("file:resources/bottomRightWall.png");
+            }else{
+                image = new Image("file:resources/bottomLeftWall.png");
+            }
         }
 
         ImageView iv = new ImageView(image);
diff --git a/client/src/main/java/fr/lnl/game/client/view/GUI.java b/client/src/main/java/fr/lnl/game/client/view/GUI.java
index 175918f..95ec317 100644
--- a/client/src/main/java/fr/lnl/game/client/view/GUI.java
+++ b/client/src/main/java/fr/lnl/game/client/view/GUI.java
@@ -52,9 +52,8 @@ public class GUI {
     private Parent createContent() {
         Pane principalPane = new Pane();
         principalPane.setPrefSize(width * cellSize, height * cellSize);
-        //PARTIE1
-        //à définir avec n pour moduler la taille du plateau
 
+        //à définir avec n pour moduler la taille du plateau
         for (int i = 0; i < 16; i++) {
             for (int j = 0; j < 16; j++) {
                 Cell cell = new Cell(i, j);
@@ -62,7 +61,6 @@ public class GUI {
             }
         }
 
-        //PARTIE2
         board = grid.getBoard();
         for (int i = 0; i < 16; i++) {
             for (int j = 0; j < 16; j++) {
@@ -71,11 +69,20 @@ public class GUI {
                     addToPrincipalPanel(value.getA(), principalPane, i, j);
                 }
                 if (value.getB() instanceof Wall || value.getB() instanceof EnergyBall || value.getB() instanceof Mine || value.getB() instanceof Bomb) {
+                    System.out.println(value.getB());
                     addToPrincipalPanel(value.getB(), principalPane, i, j);
                 }
             }
         }
-        //PARTIE3
+
+        Rectangle shape = new Rectangle();
+        shape.setX(700);
+        shape.setY(20);
+        shape.setWidth(200);
+        shape.setHeight(600);
+        shape.setFill(javafx.scene.paint.Color.WHITE);
+
+
         Button followingButton = new Button("SUIVANT");
         followingButton.setLayoutX(775);
         followingButton.setLayoutY(600);
@@ -84,6 +91,7 @@ public class GUI {
         //add un eventListener au button
 
         principalPane.getChildren().add(followingButton);
+        //pas compris le principe
         return principalPane;
     }
 
diff --git a/client/src/main/resources/images/bottomLeftWall.PNG b/client/src/main/resources/images/bottomLeftWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..af2c6309af8867c5dff1b5e07154af0efbf33b7c
GIT binary patch
literal 6059
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFaF6!yx
z7*fIb_U^%~SW5<%gB2(K|Nk`mq~7$Kku5Lg={X;W(g+LJpXJW<@7Kr2$Di-Fzq)>X
zmcdRA0R@MK1Mivs|Ec?6%gDq6<bUvEZ2oud-kw<uAifO?&#&ggjbQek-~$WxZ#G}A
z=FkA-^8=MVC;(~)vfqmsym<fS>}pQ1an1)8*jvazjJ9Uw`DI=GISXR6fWZrXK6YwZ
z^Wgd8FYSEu&;PG?etmuV{hVLzJN|A3dBH&Af$*<{mrBAw*E#qfSn%CyY6r*%Y(U41
z3Xg`#Xo48c4WmWDXz@5&H;h({qpgC`Cedg!akPy*+CdoY9gX%FN4v|TV+ErFC8MK6
zkdd<o>H3$HFFr3Uf{gM7GS0uS_-L0aXv8m?iLG{ZekN$ZPeChTBnyA|od5J!ja~g~
z_uo4~gO3gmyc*Z9U!TAKwECC)%R4<lp~dn}(BQ@Ql834g1-F^l{@yOp69NTmV>NJu
z)i$<*6ExZ?@MGJ7_4T#i_g~(3_PG*RWQX$s^)J>{AGpAyrUfbq7y5t1Kt^E8IV479
d@Pxr1?nf;=uNPc;n++N$_jL7hS?83{1ONxq>ZJex

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/bottomRightWall.PNG b/client/src/main/resources/images/bottomRightWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..3e87801394b12e783ff2b3e76a37259cd524c7ba
GIT binary patch
literal 6136
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFap5*D`
z7*fIb_O4@Jh@k+hqtw~I>+ftx_gw0|srm1f!ym<0PMq-L&!=_<MkW@HJ<1>UeqFgg
zzjj8spn^jKL*sN7mcL8azg^41A)rvOwqZg1?@ZeskkU9IfiKhdZQCvcRCZu1Q&ZjB
z<zEeeCJ0n`I$VhVb?cs215nv@E{<PY=U+Pv)a~#<mC>>OWp=eT$f6i+g%{WBqWG1m
zV#%MF-$r1g7@4@4?!Vvv-}&|P&nN$@)j6N<<ONy{^hlh;h3aH(kT)C@#09?0xdHaC
zzzbHEz2@713V@C(Vsso;J{mHkiC{E)jFtqWW#njeFj`TLwh2aCOQQ|L(I)d~?_jjw
zG}=WR?L3c;6O4|aj1CsjZW!&s^Y=%#&)*0MVvZ?Hb<X;wch$h$cHl^)z!pi+5Til>
z7f02~*JhxBL;(vGg%|A$&O%1{f*dY*$8P5YaSkXlI@+`3wt>g_rZ6?dz1rmq&c1w{
z9KRGZjKK+cfr!ADpzFC{Lkm0{F7P|fRs`F&v|+*YU3tRbp+jfj=qAT49<Xg1!12N>
zrL)0?$^eHzoiC(;O2q~TO@$Xr*WCsi`d~uC0{JF0XRvKvjE=PS!jGTxAK!ofy}s_w
zdC+Jq&~47ZfRk@3f%rWKI0n0HAH<Iaz`$~za1Ih!zKo9duWW||N*jw^{rex&bDd{E
zC3PA1FU&uATNP|xGgFgY$4e1#2;2brTDNjH*ry2r4j0%B=PH2}MKd++Q_Y_a4jLYy
zoeIl>A&R^mE^L4D7VNY}M@C2aBPCs6MLEETn6@Vt9QXzr3NM;x_(2Apb%73>wA~vV
zer&8PwE~wl!HPDhD!hpPR0fIO1q}=MldN39ing(^)Oz331G`TG7^RLr%fYd7U|Pch
dntS38<4zBr=YDsqHiJgpJzf1=);T3K0RZE?nf(9&

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/bottomWall.PNG b/client/src/main/resources/images/bottomWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..328719693a63ee845a398f2e03904d287c2d0823
GIT binary patch
literal 4777
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFaB<$(p
z7*fIb_LgIo6C)2xfbQP^Q**ufA2j&PI9i-tCln`k*j=7qo{5D+K*6DbfpL^E8VI8)
zVKf(v=7P~&Fq#WSbHQjX7|jKvxnMLGjOK#TTripom{_!!&fj0R-Yeag6C4_i#*OPY
zd$I{a`p%||jd6>w&H(qK?{IQ_vCf_h?p8baIxM)JVX6l1V3#v7{XKU}1)QM*gauxh
zM)iWtIxx4vVgF{cPO$DPEG$*MVaZ@c1?mbH-mmdh0_z^aR($w-a>e!6Ur#=srwSQq
zxW{2L|Gc^A|M+U>{uv_RFl@|aY}{8Xe;dN_a9H5((*+K~1KS!L?(ge=3kgq^58u6a
z*KczTfl97xF#mG*_KhBJ*d1YFvRxMB0nV>wtSrCY<>t77IZ2F-a>1G^V9R$iG1Y!I
zGgAh0Ha0l)uM`miMPg$t&;ixbvmp+Ma9D6WgbNZq>wpf}+j|z`03C%3$y%-8L6d}V
zhXwEN9ZLgq6vPBx7*2Hp$J+*Ng$w2R$;M!g05`{%8D5Iu@s%5*0xx!N-zW*@bg;5i
m`7E6PcKI7F4%&O;0Ds#f*4*8@kK2NVi9B8XT-G@yGywo58Mo8`

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/rightWall.PNG b/client/src/main/resources/images/rightWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f2f5278ddc04ddbe187b500e3dbe0641478dc5ff
GIT binary patch
literal 6101
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFaZtv;h
z7*fIb_U^%4Wk&%P$F&asW8)+j<g2&6=rm5~mi_GUqV#-!Jqw3`g2My3#`4!I_eb*=
zi!(9-MRs^PT*$A=-7ciy&~PA%(J}t_7CvQ%28PDjEG&PQT`$uHsahi{@MWw2YlDH%
z(0KmVX&JW$2B16mIQG2%|9|1v%6WgL|KPS&Hv_s8C|t$p_`X*c=r^FNV;n9NCozM4
zx<Fju%e@;+U|*hKWf@gI8Zx7aU^IJ-mIR|^<Y;v;T2Ts&CW6sKFq#NPo6H=eiC{Dl
zj3$E7&NFb-V6;sz+9nuH1f$i#Xh}e1b<ntc{szb>>^`>#e`m!T{c--&YRB`c7&6%0
z(y(BDz;;jYFl`$vORdC}=b%C8h69|8j`j=lCWD4=Ie54^ei^JdF9;sM6=rIxbGoYr
z9<`Ma6Zn!CFdsA=&B&w<9FK0<<qH~uRxr>}cyV}vojcfEKMsyxoTanD7A8bETxfT!
z?E{-TM?m0<@GCP;u!S2M7VtO!k^!4*p{Vde{Yoxq$eW=tvC)14H^=jM`QF{2A$3nz
KKbLh*2~7ZQfL}KN

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/topLeftWall.PNG b/client/src/main/resources/images/topLeftWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..73a2dd5178939c38af150674c9e257a20b1586c9
GIT binary patch
literal 5623
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFan&|1`
z7*fIb_SQu&CPs;tK=Yda;rDcQeaT|JnD2MNH{so!pNSK!^0wdp`Qw{w0|O%y3rEd{
z1J~K@ce|@QfcgJecy<LVfZ2?U&2k!nEI>5^3JDkPf>jG}a7cV{=u{E_D`|em29$GX
zaBw)VfZa=^5v)X_#2jK26BC<lz#<NicA)%jkYxf20s;mv8iiaTHn8301sl}Z(BQ~F
zMS}^f#Nb69#APfjJXH%^1i>~mIF>Vm4N?F)g;})=Vgt`EX=*w3dw7b)`Ol*Hk8Q#B
z9dPHCIbQhlXRXtIpXaS$n;+D&@cjB+^3W5aAeFJXZss{|PLKx<{04@~_m_tzLws|Z
zN&n~a9qInx=iC3W|6N<>2KLW1)*7eyy!bLuFq{CY_nF!R*1M^}aRdt=u$BAQ@m#nc
zoOJ$h{b+e701n?_kferC>K}C~Ey|S9P#q1`p;G^irq$83I+|9g-mDzWR-@T!G+T{k
zD^Q<i(D#8y3#-w>YP7H#Ev!f^tSsbM(q}wWpRW%d;F}=+fzvjAV*_Z+Yy)txPCRPb
kM9|>QC*Ww{kQe^I`<<8L!;POoput-PPgg&ebxsLQ0HOZ;CIA2c

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/topRightWall.PNG b/client/src/main/resources/images/topRightWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..74ff2dcb07920c32bc3b560292d793bd97e9f489
GIT binary patch
literal 6346
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFaVdClH
z7*fIb_LgIwjJtrV<HZYq*ZX8Yl-?tCE!>i)V&>hO6PaxUzFl7*zklEVKd<GPSU3a}
z93JS4{dlf_@9rxwui-#FQ`5WU4h;;9Oe}H&0$<qsUI>GfH8d>v%?qL#8rfM`{x&NA
zVgc({cu~g;F^7@SvHn4aT_Z>*2gk1aU|OKU!Qq0u#Ug)@PDY^7=0n8j2jxH8-oJlu
zls66Rk3ae>`}Xa#`#1NW(|?PN;*fwi&&~1cdGB6`k85HaF4+6MVTA<7XQrlqmC5-K
zU(1Vo{13k4|Hu7bKX(NqD0l=cGzwnVOMDmqbx^rV1T3;cRpG_<Cwr%Zt&<TE_|iN>
z&J`RDd7K=-bSvMhf<um-mF2I(GIv36Ohhv^)p_5m<^(zCfFq-$eaFi{i2c(V7Tllo
zJq{d21py8h_>+c@H4nbePp_4&nFkGo)W-KupPtJ5=cHei1__Cdh6VjHhorzEv4Df4
z>Y}kXI3V3vSZbdLT!Tc4tHXuvd6D1%GEh=@q1?WK4IB>|OigiL&Ip0SSCG+B-m=9M
zoc<jI1->jwhopuc4vt?Z6xTR{P3>w}Aa1)EY*~Vf!v%M~L|(9|0W2(gU(AHWnle+9
zT@gn%B-sFMb3LyEwoC$O=tSp;W^km7FglKUVKf#%sckeNjpl{X5^1zh9jzAx6h>?3
z(FVq78)>wqI@;Lg5E$(*jP}|_JD#I`XYf$a=m^H>Ak64E(twQS#Vc1s2kri}9Qf|P
z=gBeaKdp7ncda1<kcq&dSe{pfkfGQ%;81M9cR$EbYy@y9wz*0MGUBVK@WTAc-pP;=
zUon9%hZo4XLq>do<BPnd?^VFryd5~=Yp~)tWW-k*IO0o1YyNQi{^EIk;%vVdXdc1S
L)z4*}Q$iB}y!NaT

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/images/topWall.PNG b/client/src/main/resources/images/topWall.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..c769e829e33c5777a92924a77856a1523209f03e
GIT binary patch
literal 4741
zcmeAS@N?(olHy`uVBq!ia0y~yVEh8Y9Be?5)7S2I0V&4fAa^H*b?0PW0y!?J5uRzj
zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColV$v}fEmFCDJ;)B*TBFa_}<gS
zF{Fa=?JdVFra%Ff3o{@5U2o%7lHWLcQ%&QVOHTj8d0jouJ+@f)KR=#@LqNfy;ea^z
zpW2V_!qgoa7#NvY;+VMZYJ$WW8W|Z|?F1I7gE@??@7N&98ycMCIW7u=ISo$b%wSUz
z92^$%x4hs4a~u}#1{wrZV4$$z0=v@}7BFYQg}Wg0IRqpG0$wmHRxyD&0Wb2v)^hN0
zXnbiDux$jZ(I_#8xQ2~I<d;LoJP1c*mo&&-j7-c-T(t@={tyn=U0$j=x8U~^-s`2c
zp9<%zLae;UG3WWuv`0Ua_b+t!X#@M&VS9tq`*X+3z+P1l3V0znSrP2P3%Uy~?Ebt_
z7VNJM7P<P&@AGp7r$QyQADDl+my_cL_H7blt6Z?83fPXlOk8`-rDqF*gFM1v;qeeQ
zPLPKj)&uQ1dn^rNk66G9!>NuCd$bo^sNTF$5@HXlNR?0O1aPQ*;nEleRzQ*)*r$*<
z0Eapx=|Ex}93qfZGpcwrphi=|Xf7Dd1*5rOG#8BKg3(+snhQpA!DucR%>|>mVA$t^
c2hUmF9h}da+Y<hBDrgAE)78&qol`;+0EG&jyZ`_I

literal 0
HcmV?d00001