vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release 1.10.5.0 - Autumn Update 2025

Browse Source
This commit is contained in:
Regalis11
2025-09-17 13:44:21 +03:00
parent d13836ce87
commit caa0326cf8
120 changed files with 2584 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
+17 -7
View File
@@ -4291,6 +4291,11 @@ namespace Barotrauma
{
placeableWrecks.RemoveAt(i);
}
// Exclude wrecks that have mission tags, those can't show up randomly
else if (wreckInfo.MissionTags.Count != 0)
{
placeableWrecks.RemoveAt(i);
}
}
if (placeableWrecks.None())
{
@@ -4742,6 +4747,11 @@ namespace Barotrauma
{
beaconStationFiles.RemoveAt(i);
}
// Exclude beacons that have mission tags, those can't show up randomly
else if (beaconInfo.MissionTags.Count != 0)
{
beaconStationFiles.RemoveAt(i);
}
}
}
if (beaconStationFiles.None())
@@ -4926,17 +4936,17 @@ namespace Barotrauma
{
int corpseCount = Rand.Range(Loaded.GenerationParams.MinCorpseCount, Loaded.GenerationParams.MaxCorpseCount + 1);
var allSpawnPoints = WayPoint.WayPointList.FindAll(wp => wp.Submarine == wreck && wp.CurrentHull != null);
var pathPoints = allSpawnPoints.FindAll(wp => wp.SpawnType == SpawnType.Path);
var humanSpawnPoints = allSpawnPoints.FindAll(wp => wp.SpawnType == SpawnType.Human);
var corpsePoints = allSpawnPoints.FindAll(wp => wp.SpawnType == SpawnType.Corpse);
if (!corpsePoints.Any() && !pathPoints.Any()) { continue; }
pathPoints.Shuffle(Rand.RandSync.ServerAndClient);
if (corpsePoints.None() && humanSpawnPoints.None()) { continue; }
humanSpawnPoints.Shuffle(Rand.RandSync.ServerAndClient);
// Sort by job so that we first spawn those with a predefined job (might have special id cards)
corpsePoints = corpsePoints.OrderBy(p => p.AssignedJob == null).ThenBy(p => Rand.Value()).ToList();
var usedJobs = new HashSet<JobPrefab>();
int spawnCounter = 0;
for (int j = 0; j < corpseCount; j++)
{
WayPoint sp = corpsePoints.FirstOrDefault() ?? pathPoints.FirstOrDefault();
WayPoint sp = corpsePoints.FirstOrDefault() ?? humanSpawnPoints.FirstOrDefault();
JobPrefab job = sp?.AssignedJob;
CorpsePrefab selectedPrefab;
if (job == null)
@@ -4949,8 +4959,8 @@ namespace Barotrauma
if (selectedPrefab == null)
{
corpsePoints.Remove(sp);
pathPoints.Remove(sp);
sp = corpsePoints.FirstOrDefault(sp => sp.AssignedJob == null) ?? pathPoints.FirstOrDefault(sp => sp.AssignedJob == null);
humanSpawnPoints.Remove(sp);
sp = corpsePoints.FirstOrDefault(sp => sp.AssignedJob == null) ?? humanSpawnPoints.FirstOrDefault(sp => sp.AssignedJob == null);
// Deduce the job from the selected prefab
selectedPrefab = GetCorpsePrefab(usedJobs);
if (selectedPrefab != null)
@@ -4972,7 +4982,7 @@ namespace Barotrauma
{
worldPos = sp.WorldPosition;
corpsePoints.Remove(sp);
pathPoints.Remove(sp);
humanSpawnPoints.Remove(sp);
}
job ??= selectedPrefab.GetJobPrefab(predicate: p => !usedJobs.Contains(p));