17 files changed, 803 insertions, 684 deletions

diff --git a/src/ch/epfl/xblast/ArgumentChecker.java b/src/ch/epfl/xblast/ArgumentChecker.java
index 8ba744e..7e77b61 100644
--- a/src/ch/epfl/xblast/ArgumentChecker.java
+++ b/src/ch/epfl/xblast/ArgumentChecker.java
@@ -13,6 +13,10 @@ import java.util.Objects;
  */
 public final class ArgumentChecker {
 
+    private ArgumentChecker() {
+        // Static class
+    }
+
     /**
      * Returns the given value if it is non-negative.
      *
diff --git a/src/ch/epfl/xblast/Lists.java b/src/ch/epfl/xblast/Lists.java
index b943162..073e0cc 100644
--- a/src/ch/epfl/xblast/Lists.java
+++ b/src/ch/epfl/xblast/Lists.java
@@ -152,4 +152,19 @@ public final class Lists {
         return new ArrayList<>(l.subList(n, l.size()));
     }
 
+    /**
+     * Returns an immutable copy of the given lists, concatenated.
+     *
+     * @param lists the lists to concatenate
+     * @param <T>   the type of the list's elements
+     * @return the list result of the concatenation
+     */
+    public static <T> List<T> concatenated(List<T>... lists) {
+        return Collections.unmodifiableList(
+                Stream.of(lists)
+                        .map(List::stream)
+                        .reduce(Stream::concat).orElse(Stream.empty())
+                        .collect(Collectors.toList()));
+    }
+
 }
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/RunLengthEncoder.java b/src/ch/epfl/xblast/RunLengthEncoder.java
index d7ab106..3784e0d 100644
--- a/src/ch/epfl/xblast/RunLengthEncoder.java
+++ b/src/ch/epfl/xblast/RunLengthEncoder.java
@@ -171,10 +171,10 @@ public final class RunLengthEncoder {
     public static List<Byte> encode(List<Byte> bl) {
         List<RunLength> rll = bl.stream().map(RunLength::new).collect(Collectors.toList());
 
-        return collapseRunLengths(rll).stream()
+        return Collections.unmodifiableList(collapseRunLengths(rll).stream()
                 .flatMap(rl -> rl.split().stream())
                 .flatMap(rl -> rl.encode().stream())
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
     }
 
     /**
@@ -184,9 +184,9 @@ public final class RunLengthEncoder {
      * @return the decoded byte sequence
      */
     public static List<Byte> decode(List<Byte> el) {
-        return decodeRunLengths(el).stream()
+        return Collections.unmodifiableList(decodeRunLengths(el).stream()
                 .flatMap(rl -> rl.expand().stream())
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/ch/epfl/xblast/server/Block.java b/src/ch/epfl/xblast/server/Block.java
index 5ada099..4f3d033 100644
--- a/src/ch/epfl/xblast/server/Block.java
+++ b/src/ch/epfl/xblast/server/Block.java
@@ -1,6 +1,7 @@
 package ch.epfl.xblast.server;
 
 import java.util.NoSuchElementException;
+import java.util.Random;
 
 /**
  * Blocks.
@@ -41,9 +42,25 @@ public enum Block {
     BONUS_RANGE(Bonus.INC_RANGE);
 
     /**
+     * The list of bonuses to choose randomly from.
+     */
+    private static final Block[] RANDOM_BONUSES = new Block[]{BONUS_BOMB, BONUS_RANGE, FREE};
+
+    /**
+     * The seed used for random value generation.
+     * Constant between executions to make tests reproducible.
+     */
+    private static final int RANDOM_SEED = 2016;
+
+    /**
+     * Pseudo-random source for randomized behaviours.
+     */
+    private static final Random RANDOM_SOURCE = new Random(RANDOM_SEED);
+
+    /**
      * Corresponding bonus, or null.
      */
-    private Bonus maybeAssociatedBonus;
+    private final Bonus maybeAssociatedBonus;
 
     /**
      * Main builder, used by the bonus blocks.
@@ -56,7 +73,17 @@ public enum Block {
      * Default builder, used by the non-bonus blocks.
      */
     Block() {
-        this.maybeAssociatedBonus = null;
+        this(null);
+    }
+
+    /**
+     * Returns a randomly chosen bonus Block with an equal probability distribution.
+     *
+     * @return a random bonus block
+     */
+    static Block getRandomBonusBlock() {
+        int randomIndex = RANDOM_SOURCE.nextInt(RANDOM_BONUSES.length);
+        return RANDOM_BONUSES[randomIndex];
     }
 
     /**
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();
-
+    private static Board buildDefaultBoard() {
+        Block __ = Block.FREE;
+        Block XX = Block.INDESTRUCTIBLE_WALL;
+        Block xx = Block.DESTRUCTIBLE_WALL;