1 files changed, 65 insertions, 16 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 549fdc8..7f124e7 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,7 +1,12 @@
 package esieequest.model;
 
+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;
@@ -16,17 +21,24 @@ import esieequest.model.map.Room;
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class Game {
+public class Game implements SerialisableObject {
 
-        private static final int DEFAULT_INVENTORY_LIMIT = 10;
-        private static final int DEFAULT_STEPS_LIMIT = 0;
-        private static final int CHALLENGE_STEPS_LIMIT = 50;
-        private static final Direction DEFAULT_DIRECTION = Direction.NORTH;
-        private static final Room DEFAULT_ROOM = Room.AMPHITHEATER_SEAT;
+        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";
         private 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.
          * 
@@ -35,7 +47,6 @@ public class Game {
          */
         public Game(final boolean challenge) {
                 this.challenge = challenge;
-                this.connectRooms();
         }
 
         /**
@@ -48,10 +59,16 @@ public class Game {
         /**
          * Initialises a new Game.
          */
-        public void newGame() {
-                this.player = new Player(Game.DEFAULT_ROOM, Game.DEFAULT_DIRECTION, Game.DEFAULT_INVENTORY_LIMIT, this.challenge ? Game.CHALLENGE_STEPS_LIMIT : Game.DEFAULT_STEPS_LIMIT);
-                this.addItems();
-                this.addCharacters();
+        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();
+                }
         }
 
         /**
@@ -62,9 +79,19 @@ public class Game {
         }
 
         /**
+         * Sets the player
+         * 
+         * @param player
+         *            the Player to set
+         */
+        public void setPlayer(final Player player) {
+                this.player = player;
+        }
+
+        /**
          * 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);
@@ -143,7 +170,7 @@ public class Game {
         /**
          * Adds Item-s in the map.
          */
-        private void addItems() {
+        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);
@@ -170,8 +197,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);
         }
 
         /**
@@ -188,4 +215,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));
+        }
+
 }