Unstable 0.17.6.0

2022-04-04 16:46:08 +09:00
parent 44ded0225a
commit 95764d1fa8
78 changed files with 1265 additions and 703 deletions
@@ -2,6 +2,7 @@ using System.Xml.Linq;

 namespace Barotrauma
 {
+    [NotSyncedInMultiplayer]
    sealed class ItemAssemblyFile : GenericPrefabFile<ItemAssemblyPrefab>
    {
        public ItemAssemblyFile(ContentPackage contentPackage, ContentPath path) : base(contentPackage, path) { }
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Xml.Linq;
@@ -156,6 +156,19 @@ namespace Barotrauma
                return -1;
            }

+            public static void DisableMods(IReadOnlyCollection<ContentPackage> mods)
+            {
+                if (Core != null && mods.Contains(Core))
+                {
+                    var newCore = ContentPackageManager.CorePackages.FirstOrDefault(p => !mods.Contains(p));
+                    if (newCore != null)
+                    {
+                        SetCore(newCore);
+                    }
+                }
+                SetRegular(Regular.Where(p => !mods.Contains(p)).ToArray());
+            }
+            
            public static void DisableRemovedMods()
            {
                if (Core != null && !ContentPackageManager.CorePackages.Contains(Core))