7 files changed, 156 insertions, 144 deletions

diff --git a/src/ch/epfl/xblast/PlayerID.java b/src/ch/epfl/xblast/PlayerID.java
index c2c5c58..9377fdf 100644
--- a/src/ch/epfl/xblast/PlayerID.java
+++ b/src/ch/epfl/xblast/PlayerID.java
@@ -11,6 +11,21 @@ public enum PlayerID {
     PLAYER_1,
     PLAYER_2,
     PLAYER_3,
-    PLAYER_4
+    PLAYER_4;
+
+    public Cell initialPosition() {
+        switch (this) {
+            case PLAYER_1:
+                return new Cell(1, 1);
+            case PLAYER_2:
+                return new Cell(13, 1);
+            case PLAYER_3:
+                return new Cell(13, 11);
+            case PLAYER_4:
+                return new Cell(1, 11);
+            default:
+                return null;
+        }
+    }
 
 }
diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index 4519781..4f5e045 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -4,6 +4,7 @@ import ch.epfl.cs108.Sq;
 import ch.epfl.xblast.Cell;
 import ch.epfl.xblast.Lists;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -17,6 +18,8 @@ import java.util.stream.Collectors;
  */
 public final class Board {
 
+    static final Board DEFAULT_BOARD = buildDefaultBoard();
+
     /**
      * Distance (in SubCells) from a bomb to block a player.
      */
@@ -38,21 +41,22 @@ public final class Board {
     private static final int BLOCKS_LIST_SIZE = BOARD_ROWS * BOARD_COLUMNS;
 
     /**
-     * List containing all the blocks of the board.
-     */
-    private final List<Sq<Block>> blocks;
-
-    /**
-     * Instantiates a new Board with the given sequence of blocks.
+     * Build the default board of the game.
      *
-     * @param blocks sequence containing all the blocks of the Boards
-     * @throws IllegalArgumentException if the blocks is not composed of BLOC_LIST_SIZE elements
+     * @return the default board.
      */
-    public Board(List<Sq<Block>> blocks) {
-        if (blocks == null || blocks.size() != BLOCKS_LIST_SIZE)
-            throw new IllegalArgumentException();
-
-        this.blocks = Lists.immutableList(blocks);
+    private static Board buildDefaultBoard() {
+        Block __ = Block.FREE;
+        Block XX = Block.INDESTRUCTIBLE_WALL;
+        Block xx = Block.DESTRUCTIBLE_WALL;
+
+        return Board.ofQuadrantNWBlocksWalled(Arrays.asList(
+                Arrays.asList(__, __, __, __, __, xx, __),
+                Arrays.asList(__, XX, xx, XX, xx, XX, xx),
+                Arrays.asList(__, xx, __, __, __, xx, __),
+                Arrays.asList(xx, XX, __, XX, XX, XX, XX),
+                Arrays.asList(__, xx, __, xx, __, __, __),
+                Arrays.asList(xx, XX, xx, XX, xx, XX, __)));
     }
 
     /**
@@ -128,6 +132,24 @@ public final class Board {
     }
 
     /**
+     * List containing all the blocks of the board.
+     */
+    private final List<Sq<Block>> blocks;
+
+    /**
+     * Instantiates a new Board with the given sequence of blocks.
+     *
+     * @param blocks sequence containing all the blocks of the Boards
+     * @throws IllegalArgumentException if the blocks is not composed of BLOC_LIST_SIZE elements
+     */
+    public Board(List<Sq<Block>> blocks) {
+        if (blocks == null || blocks.size() != BLOCKS_LIST_SIZE)
+            throw new IllegalArgumentException();
+
+        this.blocks = Lists.immutableList(blocks);
+    }
+
+    /**
      * Returns the block related to the given cell.
      *
      * @param c cell
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 564ef38..16cb01b 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -16,6 +16,8 @@ import java.util.stream.Collectors;
  */
 public final class GameState {
 
+    static final GameState DEFAULT_GAME_STATE = new GameState(Board.DEFAULT_BOARD, Player.DEFAULT_PLAYERS);
+
     private final int ticks;
     private final Board board;
     private final List<Player> players;
diff --git a/src/ch/epfl/xblast/server/Level.java b/src/ch/epfl/xblast/server/Level.java
index 155b99a..a386429 100644
--- a/src/ch/epfl/xblast/server/Level.java
+++ b/src/ch/epfl/xblast/server/Level.java
@@ -1,112 +1,27 @@
 package ch.epfl.xblast.server;
 
-import ch.epfl.xblast.*;
-import ch.epfl.xblast.server.painter.*;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.HashMap;
+import ch.epfl.xblast.server.painter.BoardPainter;
 
 /**
+ * A level.
+ *
+ * @author Pacien TRAN-GIRARD (261948)
  * @author Timothée FLOURE (257420)
  */
 public final class Level {
 
-    /** Players' initial parameters **/
-    private static final int PLAYER_INITIAL_LIVES = 3;
-    private static final int PLAYER_INITIAL_BOMB_MAXIMUM = 5;
-    private static final int PLAYER_INITIAL_BOMB_RANGE = 5;
-
-    /** Players' initial positions (Ugly!) **/
-    private static final Cell PLAYER_1_INITIAL_POSITION = new Cell(1,1);
-    private static final Cell PLAYER_2_INITIAL_POSITION = new Cell(13,1);
-    private static final Cell PLAYER_3_INITIAL_POSITION = new Cell(13,11);
-    private static final Cell PLAYER_4_INITIAL_POSITION = new Cell(1,11);
-
-    /** Level values **/
-    private final BoardPainter painter;
-    private final GameState initialState;
-
-    /**
-     * Build the default board of the game.
-     *
-     * @return the default board
-     */
-    private static BoardPainter buildDefaultBoardPainter() {
-        // Create the blocks map
-        HashMap<Block,BlockImage> blocksMap = new HashMap<>();
-
-        // Fill the blocks map
-        blocksMap.put(Block.FREE, BlockImage.IRON_FLOOR);
-        blocksMap.put(Block.DESTRUCTIBLE_WALL, BlockImage.EXTRA);
-        blocksMap.put(Block.CRUMBLING_WALL, BlockImage.EXTRA_O);
-        blocksMap.put(Block.INDESTRUCTIBLE_WALL, BlockImage.DARK_BLOCK);
-        blocksMap.put(Block.BONUS_BOMB, BlockImage.BONUS_BOMB);
-        blocksMap.put(Block.BONUS_RANGE, BlockImage.BONUS_RANGE);
-
-        // Create and return the board painter
-        return new BoardPainter(blocksMap, BlockImage.IRON_FLOOR_S);
-    }
-
-    /**
-     * Build the default game state of the game.
-     *
-     * @return the default game state
-     */
-    private static GameState buildDefaultGameState() {
-        return new GameState(buildDefaultBoard(), buildDefaultPlayers());
-    }
-
-    /**
-     * Build the default board of the game.
-     *
-     * @return the default board.
-     */
-    private static Board buildDefaultBoard() {
-
-        // Ugly!
-        Block __ = Block.FREE;
-        Block XX = Block.INDESTRUCTIBLE_WALL;
-        Block xx = Block.DESTRUCTIBLE_WALL;
-
-        return Board.ofQuadrantNWBlocksWalled(
-                Arrays.asList(
-                        Arrays.asList(__, __, __, __, __, xx, __),
-                        Arrays.asList(__, XX, xx, XX, xx, XX, xx),
-                        Arrays.asList(__, xx, __, __, __, xx, __),
-                        Arrays.asList(xx, XX, __, XX, XX, XX, XX),
-                        Arrays.asList(__, xx, __, xx, __, __, __),
-                        Arrays.asList(xx, XX, xx, XX, xx, XX, __)));
-    }
-
-    /**
-     * Build the default players of the games.
-     *
-     * @return a list of the 4 players built using the default parameters.
-     */
-    private static List<Player> buildDefaultPlayers() {
-        // Ugly!
-        return Arrays.asList(