Release 1.11.4.1 (Winter Update)

This commit is contained in:
Markus Isberg
2025-12-08 14:56:47 +00:00
parent 21e34e5cd8
commit 598966f200
121 changed files with 1614 additions and 819 deletions
@@ -93,7 +93,7 @@ namespace Barotrauma
public override void ShowStartMessage()
{
foreach (Mission mission in Missions.ToList())
foreach (Mission mission in Missions.OrderBy(m => m.Prefab.IsSideObjective).ToList())
{
if (!mission.Prefab.ShowStartMessage) { continue; }
new GUIMessageBox(
@@ -112,8 +112,16 @@ namespace Barotrauma
GUITextBlock.AutoScaleAndNormalize(newCampaignButton.TextBlock, loadCampaignButton.TextBlock);
GameMain.NetLobbyScreen.CampaignSetupUI.StartNewGame = GameMain.Client.SetupNewCampaign;
GameMain.NetLobbyScreen.CampaignSetupUI.LoadGame = GameMain.Client.SetupLoadCampaign;
GameMain.NetLobbyScreen.CampaignSetupUI.StartNewGame = (SubmarineInfo sub, string saveName, string mapSeed, CampaignSettings settings) =>
{
GameMain.NetLobbyScreen.SetAFKSelected(false);
GameMain.Client.SetupNewCampaign(sub, saveName, mapSeed, settings);
};
GameMain.NetLobbyScreen.CampaignSetupUI.LoadGame = (string filePath, Option<uint> backupIndex) =>
{
GameMain.NetLobbyScreen.SetAFKSelected(false);
GameMain.Client.SetupLoadCampaign(filePath, backupIndex);
};
}
partial void InitProjSpecific()
@@ -169,6 +177,7 @@ namespace Barotrauma
{
StartRound = () =>
{
GameMain.NetLobbyScreen.SetAFKSelected(false);
GameMain.Client.RequestStartRound();
}
};
@@ -1,9 +1,9 @@
using Microsoft.Xna.Framework;
using Barotrauma.Extensions;
using Barotrauma.Items.Components;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using Barotrauma.Extensions;
using Barotrauma.Items.Components;
namespace Barotrauma
{
@@ -22,6 +22,9 @@ namespace Barotrauma
private GUIButton createEventButton;
public LevelGenerationParams BackgroundParams { get; private set; }
public Vector2 WaterParticleOffset;
public override void Start()
{
base.Start();
@@ -68,6 +71,12 @@ namespace Barotrauma
}
};
}
if (Level.Loaded == null)
{
BackgroundParams ??= LevelGenerationParams.LevelParams.Where(lp => !lp.AllowedBiomeIdentifiers.Contains("endzone")).GetRandom(Rand.RandSync.Unsynced);
GameMain.LightManager.AmbientLight = BackgroundParams.AmbientLightColor;
}
}
public override void AddToGUIUpdateList()
@@ -93,6 +102,8 @@ namespace Barotrauma
sEvent.Update(deltaTime);
}
}
BackgroundParams?.UpdateWaterParticleOffset(ref WaterParticleOffset, BackgroundParams.WaterParticleVelocity, deltaTime);
}
private void GenerateOutpost(Submarine submarine)