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

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
Evil Factory
2026-04-09 09:12:16 -03:00
parent ef66d27ffe a4607dffad
commit 790378d2a5
198 changed files with 5587 additions and 3462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
+1 -1
View File
@@ -1017,7 +1017,7 @@ namespace Barotrauma
UpdateStoreStock();
}
GameMain.GameSession.EndMissions();
GameMain.GameSession.EndMissions(TransitionType.None);
GameMain.GameSession.EventManager?.StoreEventDataAtRoundEnd(registerFinishedOnly: true);
}
Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MissionMode.cs
+2 -1
View File
@@ -53,6 +53,7 @@ namespace Barotrauma
{
foreach (MissionPrefab missionPrefab in missionPrefabs)
{
if (missionPrefab.CampaignOnly) { continue; }
if (!missionClasses.ContainsValue(missionPrefab.MissionClass))
{
throw new InvalidOperationException($"Cannot start gamemode with a {missionPrefab.MissionClass} mission.");
@@ -68,7 +69,7 @@ namespace Barotrauma
{
return missionTypes.Where(type =>
MissionPrefab.Prefabs.OrderBy(missionPrefab => missionPrefab.UintIdentifier)
.Any(missionPrefab => missionPrefab.Type == type && missionClasses.ContainsValue(missionPrefab.MissionClass)));
.Any(missionPrefab => missionPrefab.Type == type && !missionPrefab.CampaignOnly && missionClasses.ContainsValue(missionPrefab.MissionClass)));
}
}
}