Moved MapEntity saving methods to the shared project (the server needs to be able to save subs in the campaign mode)

Barotrauma/BarotraumaShared/Source/Map/Gap.cs

@@ -685,12 +685,24 @@ namespace Barotrauma
             g.ID = (ushort)int.Parse(element.Attribute("ID").Value);
             
             g.linkedToID = new List<ushort>();
-            //int i = 0;
-            //while (element.Attribute("linkedto" + i) != null)
-            //{
-            //    g.linkedToID.Add(int.Parse(element.Attribute("linkedto" + i).Value));
-            //    i += 1;
-            //}
+        }
+
+        public override XElement Save(XElement parentElement)
+        {
+            XElement element = new XElement("Gap");
+
+            element.Add(
+                new XAttribute("ID", ID),
+                new XAttribute("horizontal", isHorizontal ? "true" : "false"));
+
+            element.Add(new XAttribute("rect",
+                    (int)(rect.X - Submarine.HiddenSubPosition.X) + "," +
+                    (int)(rect.Y - Submarine.HiddenSubPosition.Y) + "," +
+                    rect.Width + "," + rect.Height));
+
+            parentElement.Add(element);
+
+            return element;
         }
     }
 }

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -735,6 +735,25 @@ namespace Barotrauma
 
             h.ID = (ushort)int.Parse(element.Attribute("ID").Value);
         }
-        
+
+        public override XElement Save(XElement parentElement)
+        {
+            XElement element = new XElement("Hull");
+
+            element.Add
+            (
+                new XAttribute("ID", ID),
+                new XAttribute("rect",
+                    (int)(rect.X - Submarine.HiddenSubPosition.X) + "," +
+                    (int)(rect.Y - Submarine.HiddenSubPosition.Y) + "," +
+                    rect.Width + "," + rect.Height),
+                new XAttribute("water", volume)
+            );
+
+            parentElement.Add(element);
+
+            return element;
+        }
+
     }
 }

Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs

@@ -237,5 +237,86 @@ namespace Barotrauma
             sub.SetPosition(sub.WorldPosition - Submarine.WorldPosition);
             sub.Submarine = Submarine;
         }
+
+        public override XElement Save(XElement parentElement)
+        {
+            XElement saveElement = null;
+
+            if (sub == null)
+            {
+                if (this.saveElement == null)
+                {
+                    var doc = Submarine.OpenFile(filePath);
+                    saveElement = doc.Root;
+
+                    saveElement.Name = "LinkedSubmarine";
+
+                    saveElement.Add(new XAttribute("filepath", filePath));
+                }
+                else
+                {
+                    saveElement = this.saveElement;
+                }
+
+                if (saveElement.Attribute("pos") != null) saveElement.Attribute("pos").Remove();
+                saveElement.Add(new XAttribute("pos", ToolBox.Vector2ToString(Position - Submarine.HiddenSubPosition)));
+
+
+
+                var linkedPort = linkedTo.FirstOrDefault(lt => (lt is Item) && ((Item)lt).GetComponent<DockingPort>() != null);
+                if (linkedPort != null)
+                {
+                    if (saveElement.Attribute("linkedto") != null) saveElement.Attribute("linkedto").Remove();
+
+                    saveElement.Add(new XAttribute("linkedto", linkedPort.ID));
+                }
+            }
+            else
+            {
+
+                saveElement = new XElement("LinkedSubmarine");
+
+
+                sub.SaveToXElement(saveElement);
+            }
+
+            if (sub != null)
+            {
+                bool leaveBehind = false;
+                if (!sub.DockedTo.Contains(Submarine.MainSub))
+                {
+                    System.Diagnostics.Debug.Assert(Submarine.MainSub.AtEndPosition || Submarine.MainSub.AtStartPosition);
+                    if (Submarine.MainSub.AtEndPosition)
+                    {
+                        leaveBehind = sub.AtEndPosition != Submarine.MainSub.AtEndPosition;
+                    }
+                    else
+                    {
+                        leaveBehind = sub.AtStartPosition != Submarine.MainSub.AtStartPosition;
+                    }
+                }
+
+
+                if (leaveBehind)
+                {
+                    saveElement.SetAttributeValue("location", Level.Loaded.Seed);
+                    saveElement.SetAttributeValue("worldpos", ToolBox.Vector2ToString(sub.SubBody.Position));
+
+                }
+                else
+                {
+                    if (saveElement.Attribute("location") != null) saveElement.Attribute("location").Remove();
+                    if (saveElement.Attribute("worldpos") != null) saveElement.Attribute("worldpos").Remove();
+                }
+
+                saveElement.SetAttributeValue("pos", ToolBox.Vector2ToString(Position - Submarine.HiddenSubPosition));
+            }
+
+
+
+            parentElement.Add(saveElement);
+
+            return saveElement;
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs

@@ -3,10 +3,10 @@ using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-//using Microsoft.Xna.Framework.Graphics;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
@@ -89,6 +89,15 @@ namespace Barotrauma
             get { return false; }
         }
 
+        protected bool ResizeHorizontal
+        {
+            get { return prefab != null && prefab.ResizeHorizontal; }
+        }
+        protected bool ResizeVertical
+        {
+            get { return prefab != null && prefab.ResizeVertical; }
+        }
+
         public virtual bool SelectableInEditor
         {
             get { return true; }
@@ -374,10 +383,14 @@ namespace Barotrauma
                 linkedSub.OnMapLoaded();
             }
         }
-
-
-        public virtual void OnMapLoaded() { }
         
+        public virtual void OnMapLoaded() { }
+
+        public virtual XElement Save(XElement parentElement)
+        {
+            DebugConsole.ThrowError("Saving entity " + GetType() + " failed.");
+            return null;
+        }
 
         public void RemoveLinked(MapEntity e)
         {

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -856,6 +856,39 @@ namespace Barotrauma
             }
         }
 
+        public override XElement Save(XElement parentElement)
+        {
+            XElement element = new XElement("Structure");
+
+            element.Add(new XAttribute("name", prefab.Name),
+                new XAttribute("ID", ID),
+                new XAttribute("rect",
+                    (int)(rect.X - Submarine.HiddenSubPosition.X) + "," +
+                    (int)(rect.Y - Submarine.HiddenSubPosition.Y) + "," +
+                    rect.Width + "," + rect.Height));
+
+            for (int i = 0; i < sections.Length; i++)
+            {
+                if (sections[i].damage == 0.0f) continue;
+
+                var sectionElement =
+                    new XElement("section",
+                        new XAttribute("i", i),
+                        new XAttribute("damage", sections[i].damage));
+
+                if (sections[i].gap != null)
+                {
+                    sectionElement.Add(new XAttribute("gap", sections[i].gap.ID));
+                }
+
+                element.Add(sectionElement);
+            }
+
+            parentElement.Add(element);
+
+            return element;
+        }
+
         public override void OnMapLoaded()
         {
             foreach (WallSection s in sections)

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -1105,6 +1105,50 @@ namespace Barotrauma
             return sub;            
         }
 
+
+        public bool Save()
+        {
+            return SaveAs(filePath);
+        }
+
+        public bool SaveAs(string filePath)
+        {
+            name = System.IO.Path.GetFileNameWithoutExtension(filePath);
+
+            XDocument doc = new XDocument(new XElement("Submarine"));
+            SaveToXElement(doc.Root);
+
+            hash = new Md5Hash(doc);
+            doc.Root.Add(new XAttribute("md5hash", hash.Hash));
+
+            try
+            {
+                SaveUtil.CompressStringToFile(filePath, doc.ToString());
+            }
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("Saving submarine \"" + filePath + "\" failed!", e);
+                return false;
+            }
+
+            return true;
+        }
+
+        public void SaveToXElement(XElement element)
+        {
+            element.Add(new XAttribute("name", name));
+            element.Add(new XAttribute("description", Description == null ? "" : Description));
+
+            element.Add(new XAttribute("tags", tags.ToString()));
+
+            foreach (MapEntity e in MapEntity.mapEntityList)
+            {
+                if (e.MoveWithLevel || e.Submarine != this) continue;
+                e.Save(element);
+            }
+        }
+
+
         public static bool Unloading
         {
             get;

Barotrauma/BarotraumaShared/Source/Map/WayPoint.cs

@@ -594,6 +594,42 @@ namespace Barotrauma
             }
         }
 
+        public override XElement Save(XElement parentElement)
+        {
+            if (MoveWithLevel) return null;
+            XElement element = new XElement("WayPoint");
+
+            element.Add(new XAttribute("ID", ID),
+                new XAttribute("x", (int)(rect.X - Submarine.HiddenSubPosition.X)),
+                new XAttribute("y", (int)(rect.Y - Submarine.HiddenSubPosition.Y)),
+                new XAttribute("spawn", spawnType));
+
+            if (idCardTags.Length > 0)
+            {
+                element.Add(new XAttribute("idcardtags", string.Join(",", idCardTags)));
+            }
+
+            if (assignedJob != null) element.Add(new XAttribute("job", assignedJob.Name));
+
+
+            if (ConnectedGap != null) element.Add(new XAttribute("gap", ConnectedGap.ID));
+            if (Ladders != null) element.Add(new XAttribute("ladders", Ladders.Item.ID));
+
+            parentElement.Add(element);
+
+            if (linkedTo != null)
+            {
+                int i = 0;
+                foreach (MapEntity e in linkedTo)
+                {
+                    element.Add(new XAttribute("linkedto" + i, e.ID));
+                    i += 1;
+                }
+            }
+
+            return element;
+        }
+
         public override void ShallowRemove()
         {
             base.ShallowRemove();