Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jabak
2024-06-17 00:04:36 +03:00
20 changed files with 299 additions and 115 deletions

View File

@@ -64,7 +64,7 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
var offering = new OfferingWindowOption();
offering.Title = Loc.GetString($"salvage-expedition-type");
var difficultyId = "Moderate";
var difficultyId = missionParams.Difficulty;
var difficultyProto = _protoManager.Index<SalvageDifficultyPrototype>(difficultyId);
// TODO: Selectable difficulty soon.
var mission = salvage.GetMission(difficultyProto, missionParams.Seed);
@@ -80,7 +80,7 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
offering.AddContent(new Label
{
Text = Loc.GetString("salvage-expedition-difficulty-Moderate"),
Text = Loc.GetString($"salvage-expedition-difficulty-{difficultyId}"),
FontColorOverride = difficultyColor,
HorizontalAlignment = Control.HAlignment.Left,
Margin = new Thickness(0f, 0f, 0f, 5f),