1 files changed, 61 insertions, 34 deletions

diff --git a/src/ch/epfl/xblast/server/Player.java b/src/ch/epfl/xblast/server/Player.java
index ad1dfe8..46e254d 100644
--- a/src/ch/epfl/xblast/server/Player.java
+++ b/src/ch/epfl/xblast/server/Player.java
@@ -3,7 +3,11 @@ package ch.epfl.xblast.server;
 import ch.epfl.cs108.Sq;
 import ch.epfl.xblast.*;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * A Player.
@@ -13,10 +17,65 @@ import java.util.Objects;
  */
 public final class Player {
 
+    private static final int INITIAL_LIVES = 3;
+    private static final int INITIAL_MAX_BOMB = 5;
+    private static final int INITIAL_BOMB_RANGE = 5;
+    private static final Direction INITIAL_DIRECTION = Direction.S;
+
+    static final List<Player> DEFAULT_PLAYERS = buildDefaultPlayers();
+
+    /**
+     * Builds the default players of the games.
+     *
+     * @return a list of the 4 players built using the default parameters.
+     */
+    private static List<Player> buildDefaultPlayers() {
+        return Collections.unmodifiableList(Arrays.stream(PlayerID.values())
+                .map(Player::buildDefaultPlayer)
+                .collect(Collectors.toList()));
+    }
+
+    /**
+     * Builds a player with default initial characteristics.
+     *
+     * @param id the player id
+     * @return the player
+     */
+    private static Player buildDefaultPlayer(PlayerID id) {
+        return new Player(id, INITIAL_LIVES, id.initialPosition(), INITIAL_MAX_BOMB, INITIAL_BOMB_RANGE);
+    }
+
     /**
-     * The default Direction of a new Player.
+     * Builds a default LifeState sequence with the given number of lives.
+     *
+     * @param lives number of lives of the desired sequence
+     * @return the sequence
      */
-    private static final Direction DEFAULT_DIRECTION = Direction.S;
+    private static Sq<LifeState> buildLifeStateSequence(int lives) {
+        if (ArgumentChecker.requireNonNegative(lives) <= 0)
+            return Sq.constant(new LifeState(lives, LifeState.State.DEAD));
+
+        LifeState invulnerability = new LifeState(lives, LifeState.State.INVULNERABLE);
+        LifeState vulnerability = new LifeState(lives, LifeState.State.VULNERABLE);
+
+        return Sq
+                .repeat(Ticks.PLAYER_INVULNERABLE_TICKS, invulnerability)
+                .concat(Sq.constant(vulnerability));
+    }
+
+    /**
+     * Builds a default DirectedPosition sequence at the given position.
+     *
+     * @param pos the position
+     * @return the sequence
+     */
+    private static Sq<DirectedPosition> buildDefaultDirectedPositionSequence(Cell pos) {
+        DirectedPosition dp = new DirectedPosition(
+                SubCell.centralSubCellOf(Objects.requireNonNull(pos)),
+                Player.INITIAL_DIRECTION);
+
+        return DirectedPosition.stopped(dp);
+    }
 
     private final PlayerID id;
     private final Sq<LifeState> lifeStates;
@@ -69,38 +128,6 @@ public final class Player {
     }
 
     /**
-     * Builds a default LifeState sequence with the given number of lives.
-     *
-     * @param lives number of lives of the desired sequence
-     * @return the sequence
-     */
-    private static Sq<LifeState> buildLifeStateSequence(int lives) {
-        if (ArgumentChecker.requireNonNegative(lives) <= 0)
-            return Sq.constant(new LifeState(lives, LifeState.State.DEAD));
-
-        LifeState invulnerability = new LifeState(lives, LifeState.State.INVULNERABLE);
-        LifeState vulnerability = new LifeState(lives, LifeState.State.VULNERABLE);
-
-        return Sq
-                .repeat(Ticks.PLAYER_INVULNERABLE_TICKS, invulnerability)
-                .concat(Sq.constant(vulnerability));
-    }
-
-    /**
-     * Builds a default DirectedPosition sequence at the given position.
-     *
-     * @param pos the position
-     * @return the sequence
-     */
-    private static Sq<DirectedPosition> buildDefaultDirectedPositionSequence(Cell pos) {
-        DirectedPosition dp = new DirectedPosition(
-                SubCell.centralSubCellOf(Objects.requireNonNull(pos)),
-                Player.DEFAULT_DIRECTION);
-
-        return DirectedPosition.stopped(dp);
-    }
-
-    /**
      * Builds and returns the Player's next life LifeState sequence.
      *
      * @return the sequence related to the Player's next life