Save/Load room behaviors (#1605)

TeamPorcupine · Nov 8, 2016 · c4f9a68 · c4f9a68
1 parent 76e489c
commit c4f9a68
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/Assets/Scripts/Models/Area/Room.cs b/Assets/Scripts/Models/Area/Room.cs
@@ -330,7 +330,7 @@ public string[] GetGasNames()
             return atmosphericGasses.Keys.ToArray();
         }
 
-        public object ToJson()
+        public JObject ToJson()
         {
             JObject roomGasses = new JObject();
             foreach (string k in atmosphericGasses.Keys)

diff --git a/Assets/Scripts/Models/Area/RoomBehavior.cs b/Assets/Scripts/Models/Area/RoomBehavior.cs
@@ -6,12 +6,14 @@
 // file LICENSE, which is part of this source code package, for details.
 // ====================================================
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
 using MoonSharp.Interpreter;
 using MoonSharp.Interpreter.Interop;
+using Newtonsoft.Json.Linq;
 
 namespace ProjectPorcupine.Rooms
 {
@@ -402,6 +404,14 @@ public void Control(Room room)
             EventActions.Trigger("OnControl", this);
         }
 
+        public JObject ToJson()
+        {
+            JObject behaviorJson = new JObject();
+            behaviorJson.Add("Room", Room.ID);
+            behaviorJson.Add("Behavior", Type);
+            return behaviorJson;
+        }
+
         [MoonSharpVisible(true)]
         private void CallEventAction(string actionName, params object[] parameters)
         {

diff --git a/Assets/Scripts/Models/Area/RoomManager.cs b/Assets/Scripts/Models/Area/RoomManager.cs
@@ -6,9 +6,11 @@
 // file LICENSE, which is part of this source code package, for details.
 // ====================================================
 #endregion
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json.Linq;
 
 namespace ProjectPorcupine.Rooms
@@ -429,6 +431,28 @@ public void FromJson(JToken roomsToken)
             }
         }
 
+        public JToken BehaviorsToJson()
+        {
+            JArray behaviorsJson = new JArray();
+            foreach (RoomBehavior behavior in rooms.SelectMany(room => room.RoomBehaviors.Values))
+            {
+                behaviorsJson.Add(behavior.ToJson());
+            }
+
+            return behaviorsJson;
+        }
+
+        public void BehaviorsFromJson(JToken behaviorsToken)
+        {
+            foreach (JToken behaviorToken in behaviorsToken)
+            {
+                int roomId = (int)behaviorToken["Room"];
+                string type = (string)behaviorToken["Behavior"];
+                RoomBehavior behavior = PrototypeManager.RoomBehavior.Get(type);
+                this[roomId].DesignateRoomBehavior(behavior.Clone());
+            }
+        }
+
         protected Room ActualFloodFill(Tile sourceTile, Room oldRoom, int sizeOfOldRoom)
         {
             if (sourceTile == null)

diff --git a/Assets/Scripts/Models/Area/World.cs b/Assets/Scripts/Models/Area/World.cs
@@ -298,6 +298,7 @@ public JObject ToJson()
         worldJson.Add("Inventories", InventoryManager.ToJson());
         worldJson.Add("Furnitures", FurnitureManager.ToJson());
         worldJson.Add("Utilities", UtilityManager.ToJson());
+        worldJson.Add("RoomBehaviors", RoomManager.BehaviorsToJson());
         worldJson.Add("Characters", CharacterManager.ToJson());
         worldJson.Add("CameraData", CameraData.ToJson());
         worldJson.Add("Skybox", skybox.name);
@@ -321,6 +322,7 @@ public void ReadJson(string filename)
         InventoryManager.FromJson(worldJson["Inventories"]);
         FurnitureManager.FromJson(worldJson["Furnitures"]);
         UtilityManager.FromJson(worldJson["Utilities"]);
+        RoomManager.BehaviorsFromJson(worldJson["RoomBehaviors"]);
         CharacterManager.FromJson(worldJson["Characters"]);
         CameraData.FromJson(worldJson["CameraData"]);
         LoadSkybox((string)worldJson["Skybox"]);