Build 0.18.0.0

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "ballastflorabehavior";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "ballastflorabehaviors";
-        protected override PrefabCollection<BallastFloraPrefab> prefabs => BallastFloraPrefab.Prefabs;
+        protected override PrefabCollection<BallastFloraPrefab> Prefabs => BallastFloraPrefab.Prefabs;
 
         protected override BallastFloraPrefab CreatePrefab(ContentXElement element)
         {

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "cave";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "cavegenerationparameters";
-        protected override PrefabCollection<CaveGenerationParams> prefabs => CaveGenerationParams.CaveParams;
+        protected override PrefabCollection<CaveGenerationParams> Prefabs => CaveGenerationParams.CaveParams;
         protected override CaveGenerationParams CreatePrefab(ContentXElement element)
         {
             return new CaveGenerationParams(element, this);

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

@@ -77,7 +77,7 @@ namespace Barotrauma
             {
                 HashSet<string> texturePaths = new HashSet<string>
                 {
-                    ragdollParams.Texture
+                    ContentPath.FromRaw(CharacterPrefab.Prefabs[speciesName].ContentPackage, ragdollParams.Texture).Value
                 };
                 foreach (RagdollParams.LimbParams limb in ragdollParams.Limbs)
                 {

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "corpse";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "corpses";
-        protected override PrefabCollection<CorpsePrefab> prefabs => CorpsePrefab.Prefabs;
+        protected override PrefabCollection<CorpsePrefab> Prefabs => CorpsePrefab.Prefabs;
         protected override CorpsePrefab CreatePrefab(ContentXElement element)
         {
             return new CorpsePrefab(element, this);

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

@@ -8,7 +8,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "EventManagerSettings";
-        protected override PrefabCollection<EventManagerSettings> prefabs => EventManagerSettings.Prefabs;
+        protected override PrefabCollection<EventManagerSettings> Prefabs => EventManagerSettings.Prefabs;
         protected override EventManagerSettings CreatePrefab(ContentXElement element)
         {
             return new EventManagerSettings(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "faction";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "factions";
-        protected override PrefabCollection<FactionPrefab> prefabs => FactionPrefab.Prefabs;
+        protected override PrefabCollection<FactionPrefab> Prefabs => FactionPrefab.Prefabs;
         protected override FactionPrefab CreatePrefab(ContentXElement element)
         {
             return new FactionPrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected abstract bool MatchesSingular(Identifier identifier);
         protected abstract bool MatchesPlural(Identifier identifier);
-        protected abstract PrefabCollection<T> prefabs { get; }
+        protected abstract PrefabCollection<T> Prefabs { get; }
         protected abstract T CreatePrefab(ContentXElement element);
         
         private void LoadFromXElement(ContentXElement parentElement, bool overriding)
@@ -29,14 +29,14 @@ namespace Barotrauma
             }
             else if (elemName == "clear")
             {
-                prefabs.AddOverrideFile(this);
+                Prefabs.AddOverrideFile(this);
             }
             else if (MatchesSingular(elemName))
             {
                 T prefab = CreatePrefab(parentElement);
                 try
                 {
-                    prefabs.Add(prefab, overriding);
+                    Prefabs.Add(prefab, overriding);
                 }
                 catch
                 {
@@ -53,7 +53,7 @@ namespace Barotrauma
             }
             else
             {
-                DebugConsole.ThrowError($"Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
+                DebugConsole.ThrowError($"GenericPrefabFile: Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
             }
         }
 
@@ -68,12 +68,12 @@ namespace Barotrauma
 
         public override sealed void UnloadFile()
         {
-            prefabs.RemoveByFile(this);
+            Prefabs.RemoveByFile(this);
         }
 
         public sealed override void Sort()
         {
-            prefabs.SortAll();
+            Prefabs.SortAll();
         }
     }
 }

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "itemassembly";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "itemassemblies";
-        protected override PrefabCollection<ItemAssemblyPrefab> prefabs => ItemAssemblyPrefab.Prefabs;
+        protected override PrefabCollection<ItemAssemblyPrefab> Prefabs => ItemAssemblyPrefab.Prefabs;
         protected override ItemAssemblyPrefab CreatePrefab(ContentXElement element)
         {
             return new ItemAssemblyPrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "items";
-        protected override PrefabCollection<ItemPrefab> prefabs => ItemPrefab.Prefabs;
+        protected override PrefabCollection<ItemPrefab> Prefabs => ItemPrefab.Prefabs;
         protected override ItemPrefab CreatePrefab(ContentXElement element)
         {
             return new ItemPrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "levelobjects";
-        protected override PrefabCollection<LevelObjectPrefab> prefabs => LevelObjectPrefab.Prefabs;
+        protected override PrefabCollection<LevelObjectPrefab> Prefabs => LevelObjectPrefab.Prefabs;
         protected override LevelObjectPrefab CreatePrefab(ContentXElement element)
         {
             return new LevelObjectPrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "locationtypes";
-        protected override PrefabCollection<LocationType> prefabs => LocationType.Prefabs;
+        protected override PrefabCollection<LocationType> Prefabs => LocationType.Prefabs;
         protected override LocationType CreatePrefab(ContentXElement element)
         {
             return new LocationType(element, this);

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

@@ -23,7 +23,7 @@ namespace Barotrauma
         /*missionTypes.Any(t => identifier == t.Name)
             || identifier == "OutpostDestroyMission" || identifier == "OutpostRescueMission";*/
         protected override bool MatchesPlural(Identifier identifier) => identifier == "missions";
-        protected override PrefabCollection<MissionPrefab> prefabs => MissionPrefab.Prefabs;
+        protected override PrefabCollection<MissionPrefab> Prefabs => MissionPrefab.Prefabs;
         protected override MissionPrefab CreatePrefab(ContentXElement element)
         {
             return new MissionPrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "npcset";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "npcsets";
-        protected override PrefabCollection<NPCSet> prefabs => NPCSet.Sets;
+        protected override PrefabCollection<NPCSet> Prefabs => NPCSet.Sets;
         protected override NPCSet CreatePrefab(ContentXElement element)
         {
             return new NPCSet(element, this);

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

@@ -42,7 +42,7 @@ namespace Barotrauma
             }
             else
             {
-                DebugConsole.ThrowError($"Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
+                DebugConsole.ThrowError($"OrdersFile: Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
             }
         }
 

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "OutpostConfig";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "OutpostGenerationParameters";
-        protected override PrefabCollection<OutpostGenerationParams> prefabs => OutpostGenerationParams.OutpostParams;
+        protected override PrefabCollection<OutpostGenerationParams> Prefabs => OutpostGenerationParams.OutpostParams;
         protected override OutpostGenerationParams CreatePrefab(ContentXElement element)
         {
             return new OutpostGenerationParams(element, this);

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

@@ -14,7 +14,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "prefabs" || identifier == "particles";
-        protected override PrefabCollection<ParticlePrefab> prefabs => ParticlePrefab.Prefabs;
+        protected override PrefabCollection<ParticlePrefab> Prefabs => ParticlePrefab.Prefabs;
         protected override ParticlePrefab CreatePrefab(ContentXElement element)
         {
             return new ParticlePrefab(element, this);

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

@@ -57,7 +57,7 @@ namespace Barotrauma
             }
             else
             {
-                DebugConsole.ThrowError($"Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
+                DebugConsole.ThrowError($"RandomEventsFile: Invalid {GetType().Name} element: {parentElement.Name} in {Path}");
             }
         }
 

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

@@ -10,7 +10,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "RuinConfig";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "RuinGenerationParameters";
-        protected override PrefabCollection<RuinGenerationParams> prefabs => RuinGenerationParams.RuinParams;
+        protected override PrefabCollection<RuinGenerationParams> Prefabs => RuinGenerationParams.RuinParams;
         protected override RuinGenerationParams CreatePrefab(ContentXElement element)
         {
             return new RuinGenerationParams(element, this);

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

@@ -11,7 +11,7 @@ namespace Barotrauma
     {
         public SoundsFile(ContentPackage contentPackage, ContentPath path) : base(contentPackage, path) { }
 
-        protected override PrefabCollection<SoundPrefab> prefabs => SoundPrefab.Prefabs;
+        protected override PrefabCollection<SoundPrefab> Prefabs => SoundPrefab.Prefabs;
 
         protected override SoundPrefab CreatePrefab(ContentXElement element)
         {

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

@@ -0,0 +1,12 @@
+namespace Barotrauma
+{
+    sealed class StartItemsFile : GenericPrefabFile<StartItemSet>
+    {
+        public StartItemsFile(ContentPackage contentPackage, ContentPath path) : base(contentPackage, path) { }
+
+        protected override bool MatchesSingular(Identifier identifier) => identifier == "itemset";
+        protected override bool MatchesPlural(Identifier identifier) => identifier == "startitems";
+        protected override PrefabCollection<StartItemSet> Prefabs => StartItemSet.Sets;
+        protected override StartItemSet CreatePrefab(ContentXElement element) => new StartItemSet(element, this);
+    }
+}

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => !MatchesPlural(identifier);
         protected override bool MatchesPlural(Identifier identifier) => identifier == "prefabs" || identifier == "structures";
-        protected override PrefabCollection<StructurePrefab> prefabs => StructurePrefab.Prefabs;
+        protected override PrefabCollection<StructurePrefab> Prefabs => StructurePrefab.Prefabs;
         protected override StructurePrefab CreatePrefab(ContentXElement element)
         {
             return new StructurePrefab(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "talenttree";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "talenttrees";
-        protected override PrefabCollection<TalentTree> prefabs => TalentTree.JobTalentTrees;
+        protected override PrefabCollection<TalentTree> Prefabs => TalentTree.JobTalentTrees;
         protected override TalentTree CreatePrefab(ContentXElement element)
         {
             return new TalentTree(element, this);

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "talent";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "talents";
-        protected override PrefabCollection<TalentPrefab> prefabs => TalentPrefab.TalentPrefabs;
+        protected override PrefabCollection<TalentPrefab> Prefabs => TalentPrefab.TalentPrefabs;
         protected override TalentPrefab CreatePrefab(ContentXElement element)
         {
             return new TalentPrefab(element, this);

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

@@ -17,7 +17,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "TraitorMission";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "TraitorMissions";
-        protected override PrefabCollection<PrefabType> prefabs => PrefabType.Prefabs;
+        protected override PrefabCollection<PrefabType> Prefabs => PrefabType.Prefabs;
         protected override PrefabType CreatePrefab(ContentXElement element)
         {
             return new PrefabType(element, this);

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

@@ -14,7 +14,7 @@ namespace Barotrauma
         protected override bool MatchesPlural(Identifier identifier) =>
             identifier == "upgrademodules";
 
-        protected override PrefabCollection<UpgradeContentPrefab> prefabs => UpgradeContentPrefab.PrefabsAndCategories;
+        protected override PrefabCollection<UpgradeContentPrefab> Prefabs => UpgradeContentPrefab.PrefabsAndCategories;
         protected override UpgradeContentPrefab CreatePrefab(ContentXElement element)
         {
             Identifier elemName = element.NameAsIdentifier();

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

@@ -9,7 +9,7 @@ namespace Barotrauma
 
         protected override bool MatchesSingular(Identifier identifier) => identifier == "wreckaiconfig";
         protected override bool MatchesPlural(Identifier identifier) => identifier == "wreckaiconfigs";
-        protected override PrefabCollection<WreckAIConfig> prefabs => WreckAIConfig.Prefabs;
+        protected override PrefabCollection<WreckAIConfig> Prefabs => WreckAIConfig.Prefabs;
         protected override WreckAIConfig CreatePrefab(ContentXElement element)
         {
             return new WreckAIConfig(element, this);