Unstable 0.1500.7.0 (No edition)

2021-10-14 00:42:06 +09:00
parent c8943ef9c4
commit de917c5d74
105 changed files with 871 additions and 443 deletions
@@ -77,7 +77,7 @@ namespace Barotrauma

                locationType = location.GetLocationType();
            }
-            
+
            //load the infos of the outpost module files
            List<SubmarineInfo> outpostModules = new List<SubmarineInfo>();
            foreach (ContentFile outpostModuleFile in outpostModuleFiles)
@@ -85,15 +85,19 @@ namespace Barotrauma
                var subInfo = new SubmarineInfo(outpostModuleFile.Path);
                if (subInfo.OutpostModuleInfo != null)
                {
-                    if (generationParams is RuinGeneration.RuinGenerationParams) 
-                    { 
+                    if (generationParams is RuinGeneration.RuinGenerationParams)
+                    {
                        //if the module doesn't have the ruin flag or any other flag used in the generation params, don't use it in ruins
                        if (!subInfo.OutpostModuleInfo.ModuleFlags.Contains("ruin") &&
                            !generationParams.ModuleCounts.Any(m => subInfo.OutpostModuleInfo.ModuleFlags.Contains(m.Key)))
                        {
                            continue;
                        }
-                    }                  
+                    }
+                    else if (subInfo.OutpostModuleInfo.ModuleFlags.Contains("ruin"))
+                    {
+                        continue;
+                    }
                    outpostModules.Add(subInfo);
                }
            }