1 files changed, 82 insertions, 29 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 830b48c..05fdcd2 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,15 +1,20 @@
 package esieequest.model;
 
+import lombok.Getter;
+import lombok.Setter;
+import net.pacien.util.CleanJSONObject;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import esieequest.controller.utils.SerialisableObject;
 import esieequest.model.characters.Character;
-import esieequest.model.characters.Sumobot;
 import esieequest.model.doors.Door;
 import esieequest.model.doors.HiddenDoor;
 import esieequest.model.doors.LockedDoor;
 import esieequest.model.doors.TransporterDoor;
 import esieequest.model.doors.TrapDoor;
-import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
-import esieequest.model.items.KeyCard;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 
@@ -18,9 +23,25 @@ import esieequest.model.map.Room;
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class Game {
+public class Game implements SerialisableObject {
+
+        public static final int DEFAULT_INVENTORY_LIMIT = 10;
+        public static final int DEFAULT_STEPS_LIMIT = 0;
+        public static final int CHALLENGE_STEPS_LIMIT = 50;
+        public static final Direction DEFAULT_DIRECTION = Direction.NORTH;
+        public static final Room DEFAULT_ROOM = Room.AMPHITHEATER_SEAT;
+
+        private static final String CHALLENGE_LABEL = "L";
+        private final boolean challenge;
+
+        private static final String PLAYER_LABEL = "P";
+        @Getter
+        @Setter
+        private Player player;
 
-        private final Player player;
+        private static final String ROOMS_LABEL = "R";
+        private static final String ITEMS_LABEL = "I";
+        private static final String CHARACTERS_LABEL = "C";
 
         /**
          * Creates a Game with a step limit for the Player.
@@ -28,31 +49,36 @@ public class Game {
          * @param maxNbSteps
          *            the step limit for the Player
          */
-        public Game(final int maxNbSteps) {
-                this.player = new Player(10, maxNbSteps);
-                this.connectRooms();
-                this.addItems();
-                this.addCharacters();
+        public Game(final boolean challenge) {
+                this.challenge = challenge;
         }
 
         /**
          * Creates a Game.
          */
         public Game() {
-                this(0);
+                this(false);
         }
 
         /**
-         * @return the player
+         * Initialises a new Game.
          */
-        public Player getPlayer() {
-                return this.player;
+        public void newGame(final boolean populate, final boolean challengeMode) {
+                Room.createAllSides();
+                this.connectRooms();
+
+                this.setPlayer(new Player(Game.DEFAULT_ROOM, Game.DEFAULT_DIRECTION, Game.DEFAULT_INVENTORY_LIMIT, challengeMode ? Game.CHALLENGE_STEPS_LIMIT : Game.DEFAULT_STEPS_LIMIT));
+
+                if (populate) {
+                        this.addItems();
+                        this.addCharacters();
+                }
         }
 
         /**
          * Connects Room-s together using Door-s.
          */
-        private void connectRooms() {
+        public void connectRooms() {
                 this.d(Room.AMPHITHEATER_SEAT, Direction.NORTH, Room.AMPHITHEATER_STAGE);
                 this.d(Room.AMPHITHEATER_STAGE, Direction.WEST, Room.CAFETERIA);
                 this.d(Room.CAFETERIA, Direction.NORTH, Room.CAFETERIA_STREET);
@@ -70,7 +96,8 @@ public class Game {
                 this.d(Room.WING_STREET, Direction.NORTH, Room.WING_FLOOR_ONE);
                 this.d(Room.WING_FLOOR_ONE, Direction.WEST, Room.WING_STAIRS_ONE);
                 this.d(Room.WING_STAIRS_ONE, Direction.SOUTH, Room.WING_STAIRS_TWO);
-                this.d(Room.WING_STAIRS_ONE, Direction.UP, Room.WING_STAIRS_TWO);
+                this.d(Room.WING_STAIRS_ONE, Direction.UP, new HiddenDoor(Room.WING_STAIRS_TWO));
+                this.d(Room.WING_STAIRS_TWO, Direction.DOWN, new HiddenDoor(Room.WING_STAIRS_ONE));
                 this.d(Room.WING_STAIRS_TWO, Direction.EAST, Room.WING_FLOOR_TWO);
                 this.d(Room.WING_FLOOR_TWO, Direction.NORTH, Room.WING_OFFICE_CORRIDOR);
                 this.d(Room.WING_OFFICE_CORRIDOR, Direction.EAST, Room.WING_OFFICE);
@@ -86,8 +113,15 @@ public class Game {
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.SOUTH, Room.SECRET_LAB);
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.EAST, Room.SECRET_CORRIDOR_END);
                 this.d(Room.SECRET_CORRIDOR_END, Direction.NORTH, new TrapDoor(Room.DEAD_END));
-                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, new LockedDoor(Room.LOCKED_ROOM));
-                this.d(Room.LOCKED_ROOM, Direction.NORTH, new LockedDoor(Room.SECRET_CORRIDOR_END));
+
+                final LockedDoor lockedDoorEnter = new LockedDoor(Room.LOCKED_ROOM);
+                lockedDoorEnter.setKey(Item.KEYCARD);
+                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, lockedDoorEnter);
+
+                final LockedDoor lockedDoorExit = new LockedDoor(Room.SECRET_CORRIDOR_END);
+                lockedDoorExit.setKey(Item.KEYCARD);
+                this.d(Room.LOCKED_ROOM, Direction.NORTH, lockedDoorExit);
+
                 this.d(Room.SECRET_CORRIDOR_END, Direction.EAST, new TransporterDoor(Room.values()));
         }
 
@@ -123,17 +157,14 @@ public class Game {
         /**
          * Adds Item-s in the map.
          */
-        private void addItems() {
-                this.i(Room.STORAGE_ROOM, Direction.WEST, new Item("Weighted Storage Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.EAST, new Item("Edgeless Safety Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.NORTH, new Item("Portable black-hole", -10, false));
+        public void addItems() {
+                this.i(Room.STORAGE_ROOM, Direction.WEST, Item.STORAGE_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.EAST, Item.SAFETY_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.NORTH, Item.BLACK_HOLE);
 
-                this.i(Room.SECRET_LAB, Direction.SOUTH, new Beamer("Beamer"));
+                this.i(Room.SECRET_LAB, Direction.SOUTH, Item.BEAMER);
 
-                KeyCard keyCard = new KeyCard("KeyCard");
-                this.i(Room.DEAD_END, Direction.NORTH, keyCard);
-                ((LockedDoor) Room.SECRET_CORRIDOR_END.getSide(Direction.SOUTH).getDoor()).setKey(keyCard);
-                ((LockedDoor) Room.LOCKED_ROOM.getSide(Direction.NORTH).getDoor()).setKey(keyCard);
+                this.i(Room.DEAD_END, Direction.NORTH, Item.KEYCARD);
         }
 
         /**
@@ -153,8 +184,8 @@ public class Game {
         /**
          * Adds Character-s to the map.
          */
-        private void addCharacters() {
-                this.c(Room.LOCKED_ROOM, Direction.SOUTH, new Sumobot(Room.LOCKED_ROOM, Direction.SOUTH));
+        public void addCharacters() {
+                this.c(Room.LOCKED_ROOM, Direction.SOUTH, Character.SUMOBOT);
         }
 
         /**
@@ -171,4 +202,26 @@ public class Game {
                 room.getSide(direction).setCharacter(character);
         }
 
+        @Override
+        public JSONObject serialise() {
+                final CleanJSONObject o = new CleanJSONObject();
+
+                o.put(Game.CHALLENGE_LABEL, this.challenge);
+
+                o.put(Game.PLAYER_LABEL, this.player.serialise());
+                o.put(Game.ROOMS_LABEL, Room.serialiseAll());
+                o.put(Game.ITEMS_LABEL, Item.serialiseAll());
+                o.put(Game.CHARACTERS_LABEL, Character.serialiseAll());
+
+                return o;
+        }
+
+        @Override
+        public void deserialise(final JSONObject o) {
+                this.player.deserialise((JSONObject) o.get(Game.PLAYER_LABEL));
+                Room.deserialiseAll((JSONArray) o.get(Game.ROOMS_LABEL));
+                Item.deserialiseAll((JSONArray) o.get(Game.ITEMS_LABEL));
+                Character.deserialiseAll((JSONArray) o.get(Game.CHARACTERS_LABEL));
+        }
+
 }