(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -16,6 +16,8 @@ namespace Barotrauma
            Container
        }

+        public bool IsOptional { get; set; }
+
        private string[] identifiers;

        private string[] excludedIdentifiers;
@@ -138,7 +140,8 @@ namespace Barotrauma
        {
            element.Add(
                new XAttribute("identifiers", JoinedIdentifiers),
-                new XAttribute("type", type.ToString()));
+                new XAttribute("type", type.ToString()),
+                new XAttribute("optional", IsOptional));

            if (excludedIdentifiers.Length > 0)
            {