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 9e06c28..65fbcd6 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,7 +5,6 @@ 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; @@ -48,24 +47,7 @@ public class Cell extends Rectangle { image = new Image("/images/mine.webp"); } else{ - //test - if(((Wall)object).getCardinal()== Cardinal.NORTH){ - image = new Image("/images/topWall.png"); - }else if(((Wall)object).getCardinal()== Cardinal.SOUTH) { - image = new Image("/images/bottomWall.png"); - }else if(((Wall)object).getCardinal()== Cardinal.EAST) { - image = new Image("/images/rightWall.png"); - }else if(((Wall)object).getCardinal()== Cardinal.WEST) { - image = new Image("/images/rightWall.png"); // TODO: 03/12/2021 a replace par leftWall - }else if(((Wall)object).getCardinal()== Cardinal.NORTH_EAST) { - image = new Image("/images/topRightWall.png"); - }else if(((Wall)object).getCardinal()== Cardinal.NORTH_WEST) { - image = new Image("/images/topLeftWall.png"); - }else if(((Wall)object).getCardinal()== Cardinal.SOUTH_EAST) { - image = new Image("/images/bottomRightWall.png"); - }else{ - image = new Image("/images/bottomLeftWall.png"); - } + image = new Image("/images/wall.jpg"); } ImageView iv = new ImageView(image); diff --git a/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java b/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java index 2db43c1..dae6c70 100644 --- a/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java +++ b/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java @@ -1,7 +1,6 @@ package fr.lnl.game.server.games.grid; import fr.lnl.game.server.games.player.Player; -import fr.lnl.game.server.utils.Cardinal; import fr.lnl.game.server.utils.Pair; import fr.lnl.game.server.utils.Point; @@ -35,21 +34,21 @@ public class Grid { for (int j = 0; j < column; j++) { Box box; if (i == 0 && j == 0) { - box = new Wall(Cardinal.NORTH_WEST, i, j); + box = new Wall(i, j); } else if (i == 0 && j == column-1) { - box = new Wall(Cardinal.NORTH_EAST, i, j); + box = new Wall(i, j); } else if (i == row-1 && j == 0) { - box = new Wall(Cardinal.SOUTH_WEST, i, j); + box = new Wall(i, j); } else if (i == row-1 && j == column-1) { - box = new Wall(Cardinal.SOUTH_EAST, i, j); + box = new Wall(i, j); } else if (i == 0) { - box = new Wall(Cardinal.NORTH, i, j); + box = new Wall(i, j); } else if (i == row-1) { - box = new Wall(Cardinal.SOUTH, i, j); + box = new Wall(i, j); } else if (j == 0) { - box = new Wall(Cardinal.WEST, i, j); + box = new Wall(i, j); } else if (j == column-1) { - box = new Wall(Cardinal.EAST, i, j); + box = new Wall(i, j); } else { box = null; } @@ -97,7 +96,7 @@ public class Grid { if(Math.random() >= probability){ Point point = new Point(i,j); if(getIllusionNumberWallNeighbour(point) <= 3){ - getBoard().get(point).setB(new Wall(Cardinal.getRandom(),i,j)); + getBoard().get(point).setB(new Wall(i,j)); } else{ getBoard().get(point).setB(new AbstractBox()); @@ -170,23 +169,7 @@ public class Grid { str.append(" \033[0;34mP\033[0m"); } else if (value.getB() instanceof Wall) { - if (((Wall) value.getB()).getCardinal() == Cardinal.NORTH) { - str.append(" \033[0;34m—\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.SOUTH) { - str.append(" \033[0;31m—\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.WEST) { - str.append(" \033[0;33m|\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.EAST) { - str.append(" \033[0;32m|\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.NORTH_EAST) { - str.append(" \033[0;32mN\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.NORTH_WEST) { - str.append(" \033[0;33mN\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.SOUTH_EAST) { - str.append(" \033[0;32mS\033[0m"); - } else if (((Wall) value.getB()).getCardinal() == Cardinal.SOUTH_WEST) { - str.append(" \033[0;33mS\033[0m"); - } + str.append(" \033[0;32m□\033[0m"); } else if(value.getB() instanceof EnergyBall){ str.append(" \033[0;31mE\033[0m"); diff --git a/server/src/main/java/fr/lnl/game/server/games/grid/Wall.java b/server/src/main/java/fr/lnl/game/server/games/grid/Wall.java index dd52cec..70097d9 100644 --- a/server/src/main/java/fr/lnl/game/server/games/grid/Wall.java +++ b/server/src/main/java/fr/lnl/game/server/games/grid/Wall.java @@ -1,24 +1,17 @@ package fr.lnl.game.server.games.grid; -import fr.lnl.game.server.utils.Cardinal; - import java.util.Objects; public class Wall extends AbstractBox { - private final Cardinal cardinal; private final int x; private final int y; - public Wall(Cardinal cardinal, int x, int y){ - this.cardinal = cardinal; + public Wall(int x, int y){ this.x = x; this.y = y; } - public Cardinal getCardinal() { - return cardinal; - } public int getX() { return x; @@ -33,6 +26,6 @@ public class Wall extends AbstractBox { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Wall other = (Wall) o; - return Objects.equals(cardinal, other.cardinal) && x == other.x && y == other.y; + return x == other.x && y == other.y; } } diff --git a/server/src/main/java/fr/lnl/game/server/utils/Cardinal.java b/server/src/main/java/fr/lnl/game/server/utils/Cardinal.java deleted file mode 100644 index 3b8ff91..0000000 --- a/server/src/main/java/fr/lnl/game/server/utils/Cardinal.java +++ /dev/null @@ -1,18 +0,0 @@ -package fr.lnl.game.server.utils; - -public enum Cardinal { - NORTH, - SOUTH, - EAST, - WEST, - NORTH_EAST, - NORTH_WEST, - SOUTH_EAST, - SOUTH_WEST; - - public static Cardinal getRandom() { - return values()[(int) (Math.random() * values().length)]; - } -} - - diff --git a/server/src/test/java/fr/lnl/game/server/GridTest.java b/server/src/test/java/fr/lnl/game/server/GridTest.java index bc2bbab..dad117d 100644 --- a/server/src/test/java/fr/lnl/game/server/GridTest.java +++ b/server/src/test/java/fr/lnl/game/server/GridTest.java @@ -6,7 +6,6 @@ import fr.lnl.game.server.games.grid.EnergyBall; import fr.lnl.game.server.games.grid.Grid; import fr.lnl.game.server.games.grid.Wall; import fr.lnl.game.server.games.player.Player; -import fr.lnl.game.server.utils.Cardinal; import fr.lnl.game.server.utils.Pair; import fr.lnl.game.server.utils.Point; import org.junit.jupiter.api.BeforeEach; @@ -29,10 +28,10 @@ public class GridTest { @Test public void testGrid() { // test Grid#initGrid() - assertEquals(new Wall(Cardinal.NORTH_WEST, 0, 0), grid.getBoard().get(new Point(0,0)).getB()); - assertEquals(new Wall(Cardinal.NORTH_EAST, 0, grid.getColumn() - 1), grid.getBoard().get(new Point(0, grid.getColumn() - 1)).getB()); - assertEquals(new Wall(Cardinal.SOUTH_WEST, grid.getRow() - 1, 0), grid.getBoard().get(new Point(grid.getRow() - 1, 0)).getB()); - assertEquals(new Wall(Cardinal.SOUTH_EAST, grid.getRow() - 1, grid.getColumn() - 1), grid.getBoard().get(new Point(grid.getRow() - 1, grid.getColumn() - 1)).getB()); + assertEquals(new Wall(0, 0), grid.getBoard().get(new Point(0,0)).getB()); + assertEquals(new Wall(0, grid.getColumn() - 1), grid.getBoard().get(new Point(0, grid.getColumn() - 1)).getB()); + assertEquals(new Wall(grid.getRow() - 1, 0), grid.getBoard().get(new Point(grid.getRow() - 1, 0)).getB()); + assertEquals(new Wall(grid.getRow() - 1, grid.getColumn() - 1), grid.getBoard().get(new Point(grid.getRow() - 1, grid.getColumn() - 1)).getB()); // test placePlayersBRUT (mocked) assertEquals(grid.getPlayers().get(0), grid.getBoard().get(new Point(7, 7)).getA()); assertEquals(grid.getPlayers().get(1), grid.getBoard().get(new Point(7, 8)).getA()); 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 98644cb..a2dbb8d 100644 --- a/server/src/test/java/fr/lnl/game/server/Mock.java +++ b/server/src/test/java/fr/lnl/game/server/Mock.java @@ -8,7 +8,6 @@ import fr.lnl.game.server.games.player.ClassPlayer; import fr.lnl.game.server.games.player.Player; import fr.lnl.game.server.games.player.RandomComputerPlayer; import fr.lnl.game.server.listener.GameFinishEvent; -import fr.lnl.game.server.utils.Cardinal; import fr.lnl.game.server.utils.Point; import java.util.Arrays; @@ -39,10 +38,10 @@ public class Mock { } public void placeInternWallBRUT(){ - grid.getBoard().get(new Point(3,6)).setB(new Wall(Cardinal.NORTH,3,6)); - grid.getBoard().get(new Point(7,14)).setB(new Wall(Cardinal.SOUTH,7,14)); - grid.getBoard().get(new Point(10,7)).setB(new Wall(Cardinal.EAST,10,7)); - grid.getBoard().get(new Point(14,2)).setB(new Wall(Cardinal.WEST,14,2)); + grid.getBoard().get(new Point(3,6)).setB(new Wall(3,6)); + grid.getBoard().get(new Point(7,14)).setB(new Wall(7,14)); + grid.getBoard().get(new Point(10,7)).setB(new Wall(10,7)); + grid.getBoard().get(new Point(14,2)).setB(new Wall(14,2)); } }