Build 0.18.4.0

This commit is contained in:
Markus Isberg
2022-05-31 23:13:05 +09:00
parent 077917fa5d
commit 64db1a6a44
175 changed files with 4916 additions and 2393 deletions
@@ -260,9 +260,15 @@ namespace Barotrauma
throw new InvalidOperationException("Could not select EventManager settings (level not set).");
}
float extraDifficulty = 0;
if (GameMain.GameSession.Campaign?.Settings != null)
{
extraDifficulty = GameMain.GameSession.Campaign.Settings.ExtraEventManagerDifficulty;
}
float modifiedDifficulty = Math.Clamp(level.Difficulty + extraDifficulty, 0, 100);
var suitableSettings = EventManagerSettings.OrderedByDifficulty.Where(s =>
level.Difficulty >= s.MinLevelDifficulty &&
level.Difficulty <= s.MaxLevelDifficulty).ToArray();
modifiedDifficulty >= s.MinLevelDifficulty &&
modifiedDifficulty <= s.MaxLevelDifficulty).ToArray();
if (suitableSettings.Length == 0)
{