OBT/1.2.0(Spring Update)
Sync with Upstream
This commit is contained in:
@@ -1017,7 +1017,7 @@ namespace Barotrauma
|
||||
UpdateStoreStock();
|
||||
}
|
||||
|
||||
GameMain.GameSession.EndMissions();
|
||||
GameMain.GameSession.EndMissions(TransitionType.None);
|
||||
GameMain.GameSession.EventManager?.StoreEventDataAtRoundEnd(registerFinishedOnly: true);
|
||||
}
|
||||
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user