Faction Test 100.4.0.0

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/SlideshowsFile.cs

@@ -0,0 +1,15 @@
+namespace Barotrauma
+{
+    sealed class SlideshowsFile : GenericPrefabFile<SlideshowPrefab>
+    {
+        protected override PrefabCollection<SlideshowPrefab> Prefabs => SlideshowPrefab.Prefabs;
+
+        public SlideshowsFile(ContentPackage contentPackage, ContentPath path) : base(contentPackage, path) { }
+
+        protected override bool MatchesSingular(Identifier identifier) => identifier == "Slideshow";
+
+        protected override bool MatchesPlural(Identifier identifier) => identifier == "Slideshows";
+
+        protected override SlideshowPrefab CreatePrefab(ContentXElement element) => new SlideshowPrefab(this, element);
+    }
+}

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackage/ContentPackage.cs

@@ -18,7 +18,7 @@ namespace Barotrauma
         
         public const string LocalModsDir = "LocalMods";
         public static readonly string WorkshopModsDir = Barotrauma.IO.Path.Combine(
-            SaveUtil.SaveFolder,
+            SaveUtil.DefaultSaveFolder,
             "WorkshopMods",
             "Installed");
 

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentXElement.cs

@@ -1,6 +1,8 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection.Metadata.Ecma335;
 using System.Xml.Linq;
@@ -63,6 +65,8 @@ namespace Barotrauma
         public Identifier GetAttributeIdentifier(string key, string def) => Element.GetAttributeIdentifier(key, def);
         public Identifier GetAttributeIdentifier(string key, Identifier def) => Element.GetAttributeIdentifier(key, def);
         public Identifier[]? GetAttributeIdentifierArray(string key, Identifier[] def, bool trim = true) => Element.GetAttributeIdentifierArray(key, def, trim);
+        [return:NotNullIfNotNull("def")]
+        public ImmutableHashSet<Identifier>? GetAttributeIdentifierImmutableHashSet(string key, ImmutableHashSet<Identifier>? def, bool trim = true) => Element.GetAttributeIdentifierImmutableHashSet(key, def, trim);
         public string? GetAttributeString(string key, string? def) => Element.GetAttributeString(key, def);
         public string GetAttributeStringUnrestricted(string key, string def) => Element.GetAttributeStringUnrestricted(key, def);
         public string[]? GetAttributeStringArray(string key, string[]? def, bool convertToLowerInvariant = false) => Element.GetAttributeStringArray(key, def, convertToLowerInvariant);

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/Identifier.cs

@@ -121,6 +121,11 @@ namespace Barotrauma
 
         public static bool operator !=(string str, in Identifier? identifier) =>
             !(identifier == str);
+
+        internal int IndexOf(char c) => Value.IndexOf(c);
+
+        internal Identifier this[Range range] => Value[range].ToIdentifier();
+        internal Char this[int i] => Value[i];
     }
 
     public static class IdentifierExtensions