Build 0.18.4.0

2022-05-31 23:13:05 +09:00
parent 077917fa5d
commit 64db1a6a44
175 changed files with 4916 additions and 2393 deletions
@@ -1,8 +1,11 @@
+using Barotrauma.Extensions;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
+using System.Collections.Immutable;
 using System.Linq;
+using System.Xml.Linq;

 namespace Barotrauma
 {
@@ -15,11 +18,11 @@ namespace Barotrauma
        protected GUITextBox saveNameBox, seedBox;

        protected GUIButton loadGameButton;
-        
+
        public Action<SubmarineInfo, string, string, CampaignSettings> StartNewGame;
        public Action<string> LoadGame;

-        protected enum CategoryFilter { All = 0, Vanilla = 1, Custom = 2 };            
+        protected enum CategoryFilter { All = 0, Vanilla = 1, Custom = 2 }
        protected CategoryFilter subFilter = CategoryFilter.All;

        public GUIButton StartButton
@@ -33,15 +36,11 @@ namespace Barotrauma
            get;
            protected set;
        }
-        
-        public GUITickBox EnableRadiationToggle { get; set; }
-        public GUILayoutGroup CampaignSettingsContent { get; set; }

+        public CampaignSettings CurrentSettings = new CampaignSettings(element: null);
        public GUIButton CampaignCustomizeButton { get; set; }
        public GUIMessageBox CampaignCustomizeSettings { get; set; }

-        public GUITextBlock MaxMissionCountText;
-
        public CampaignSetupUI(GUIComponent newGameContainer, GUIComponent loadGameContainer)
        {
            this.newGameContainer = newGameContainer;
@@ -102,5 +101,259 @@ namespace Barotrauma

            return saveFrame;
        }
+
+        public struct CampaignSettingElements
+        {
+            public SettingValue<bool> RadiationEnabled;
+            public SettingValue<int> MaxMissionCount;
+            public SettingValue<StartingBalanceAmount> StartingFunds;
+            public SettingValue<GameDifficulty> Difficulty;
+            public SettingValue<Identifier> StartItemSet;
+
+            public CampaignSettings CreateSettings()
+            {
+                return new CampaignSettings(element: null)
+                {
+                    RadiationEnabled = RadiationEnabled.GetValue(),
+                    MaxMissionCount = MaxMissionCount.GetValue(),
+                    StartingBalanceAmount = StartingFunds.GetValue(),
+                    Difficulty = Difficulty.GetValue(),
+                    StartItemSet = StartItemSet.GetValue()
+                };
+            }
+        }
+
+        public readonly struct SettingValue<T>
+        {
+            private readonly Func<T> getter;
+            private readonly Action<T> setter;
+
+            public T GetValue()
+            {
+                return getter.Invoke();
+            }
+
+            public void SetValue(T value)
+            {
+                setter.Invoke(value);
+            }
+
+            public SettingValue(Func<T> get, Action<T> set)
+            {
+                getter = get;
+                setter = set;
+            }
+        }
+
+        private readonly struct SettingCarouselElement<T>
+        {
+            public readonly LocalizedString Label;
+            public readonly T Value;
+            public readonly bool IsHidden;
+
+            public SettingCarouselElement(T value, string label, bool isHidden = false)
+            {
+                Value = value;
+                Label = TextManager.Get(label).Fallback(label);
+                IsHidden = isHidden;
+            }
+        }
+
+        protected static CampaignSettingElements CreateCampaignSettingList(GUIComponent parent, CampaignSettings prevSettings)
+        {
+            const float verticalSize = 0.14f;
+
+            GUILayoutGroup presetDropdownLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, verticalSize), parent.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft);
+            new GUITextBlock(new RectTransform(new Vector2(0.5f, 1f), presetDropdownLayout.RectTransform), TextManager.Get("campaignsettingpreset"));
+            GUIDropDown presetDropdown = new GUIDropDown(new RectTransform(new Vector2(0.5f, 1f), presetDropdownLayout.RectTransform), elementCount: CampaignModePresets.List.Length);
+
+            presetDropdownLayout.RectTransform.MinSize = new Point(0, presetDropdown.Rect.Height);
+
+            foreach (CampaignSettings settings in CampaignModePresets.List)
+            {
+                string name = settings.PresetName;
+                presetDropdown.AddItem(TextManager.Get($"preset.{name}").Fallback(name), settings);
+            }
+
+            GUIListBox settingsList = new GUIListBox(new RectTransform(new Vector2(1f, 1f - verticalSize), parent.RectTransform))
+            {
+                Spacing = GUI.IntScale(5)
+            };
+
+            SettingValue<bool> radiationEnabled = CreateTickbox(settingsList.Content, TextManager.Get("CampaignOption.EnableRadiation"), TextManager.Get("campaignoption.enableradiation.tooltip"), prevSettings.RadiationEnabled, verticalSize);
+
+            ImmutableArray<SettingCarouselElement<Identifier>> startingSetOptions = StartItemSet.Sets.OrderBy(s => s.Order).Select(set => new SettingCarouselElement<Identifier>(set.Identifier, $"startitemset.{set.Identifier}")).ToImmutableArray();
+            SettingCarouselElement<Identifier> prevStartingSet = startingSetOptions.FirstOrNull(element => element.Value == prevSettings.StartItemSet) ?? startingSetOptions[1];
+            SettingValue<Identifier> startingSetInput = CreateSelectionCarousel(settingsList.Content, TextManager.Get("startitemset"), TextManager.Get("startitemsettooltip"), prevStartingSet, verticalSize, startingSetOptions);
+
+            ImmutableArray<SettingCarouselElement<StartingBalanceAmount>> fundOptions = ImmutableArray.Create(
+                new SettingCarouselElement<StartingBalanceAmount>(StartingBalanceAmount.High, "startingfunds.high"),
+                new SettingCarouselElement<StartingBalanceAmount>(StartingBalanceAmount.Medium, "startingfunds.medium"),
+                new SettingCarouselElement<StartingBalanceAmount>(StartingBalanceAmount.Low, "startingfunds.low")
+            );
+
+            SettingCarouselElement<StartingBalanceAmount> prevStartingFund = fundOptions.FirstOrNull(element => element.Value == prevSettings.StartingBalanceAmount) ?? fundOptions[1];
+            SettingValue<StartingBalanceAmount> startingFundsInput = CreateSelectionCarousel(settingsList.Content, TextManager.Get("startingfundsdescription"), TextManager.Get("startingfundstooltip"), prevStartingFund, verticalSize, fundOptions);
+
+            ImmutableArray<SettingCarouselElement<GameDifficulty>> difficultyOptions = ImmutableArray.Create(
+                new SettingCarouselElement<GameDifficulty>(GameDifficulty.Easy, "difficulty.easy"),
+                new SettingCarouselElement<GameDifficulty>(GameDifficulty.Medium, "difficulty.medium"),
+                new SettingCarouselElement<GameDifficulty>(GameDifficulty.Hard, "difficulty.hard"),
+                new SettingCarouselElement<GameDifficulty>(GameDifficulty.Hellish, "difficulty.hellish", isHidden: true)
+            );
+
+            SettingCarouselElement<GameDifficulty> prevDifficulty = difficultyOptions.FirstOrNull(element => element.Value == prevSettings.Difficulty) ?? difficultyOptions[1];
+            SettingValue<GameDifficulty> difficultyInput = CreateSelectionCarousel(settingsList.Content, TextManager.Get("leveldifficulty"), TextManager.Get("leveldifficultyexplanation"), prevDifficulty, verticalSize, difficultyOptions);
+
+            SettingValue<int> maxMissionCountInput = CreateGUINumberInputCarousel(settingsList.Content, TextManager.Get("maxmissioncount"), TextManager.Get("maxmissioncounttooltip"), prevSettings.MaxMissionCount, valueStep: 1, verticalSize);
+
+            presetDropdown.OnSelected = (selected, o) =>
+            {
+                if (o is CampaignSettings settings)
+                {
+                    radiationEnabled.SetValue(settings.RadiationEnabled);
+                    maxMissionCountInput.SetValue(settings.MaxMissionCount);
+                    startingFundsInput.SetValue(settings.StartingBalanceAmount);
+                    difficultyInput.SetValue(settings.Difficulty);
+                    startingSetInput.SetValue(settings.StartItemSet);
+                    return true;
+                }
+                return false;
+            };
+
+            return new CampaignSettingElements
+            {
+                RadiationEnabled = radiationEnabled,
+                MaxMissionCount = maxMissionCountInput,
+                StartingFunds = startingFundsInput,
+                Difficulty = difficultyInput,
+                StartItemSet = startingSetInput
+            };
+
+            // Create a number input with plus and minus buttons because for some reason the default GUINumberInput buttons don't work when in a GUIMessageBox
+            static SettingValue<int> CreateGUINumberInputCarousel(GUIComponent parent, LocalizedString description, LocalizedString tooltip, int defaultValue, int valueStep, float verticalSize)
+            {
+                GUILayoutGroup inputContainer = CreateSettingBase(parent, description, tooltip, horizontalSize: 0.55f, verticalSize: verticalSize);
+
+                GUIButton minusButton = new GUIButton(new RectTransform(Vector2.One, inputContainer.RectTransform, scaleBasis: ScaleBasis.BothHeight), style: "GUIMinusButton", textAlignment: Alignment.Center)
+                {
+                    ClickSound = GUISoundType.Decrease,
+                    UserData = -valueStep
+                };
+                GUINumberInput numberInput = new GUINumberInput(new RectTransform(Vector2.One, inputContainer.RectTransform, Anchor.Center), NumberType.Int, textAlignment: Alignment.Center, style: "GUITextBox",
+                    hidePlusMinusButtons: true)
+                {
+                    IntValue = defaultValue
+                };
+                inputContainer.RectTransform.Parent.MinSize = new Point(0, numberInput.RectTransform.MinSize.Y);
+                GUIButton plusButton = new GUIButton(new RectTransform(Vector2.One, inputContainer.RectTransform, scaleBasis: ScaleBasis.BothHeight), style: "GUIPlusButton", textAlignment: Alignment.Center)
+                {
+                    ClickSound = GUISoundType.Increase,
+                    UserData = valueStep
+                };
+
+                minusButton.OnClicked = plusButton.OnClicked = ChangeValue;
+
+                bool ChangeValue(GUIButton btn, object userData)
+                {
+                    if (!(userData is int change)) { return false; }
+
+                    numberInput.IntValue += change;
+                    return true;
+                }
+
+                return new SettingValue<int>(() => numberInput.IntValue, i => numberInput.IntValue = i);
+            }
+
+            static SettingValue<T> CreateSelectionCarousel<T>(GUIComponent parent, LocalizedString description, LocalizedString tooltip, SettingCarouselElement<T> defaultValue, float verticalSize,
+                                                               ImmutableArray<SettingCarouselElement<T>> options)
+            {
+                GUILayoutGroup inputContainer = CreateSettingBase(parent, description, tooltip, horizontalSize: 0.55f, verticalSize: verticalSize);
+
+                GUIButton minusButton = new GUIButton(new RectTransform(Vector2.One, inputContainer.RectTransform, scaleBasis: ScaleBasis.BothHeight), style: "GUIMinusButton", textAlignment: Alignment.Center) { UserData = -1 };
+                GUIFrame inputFrame = new GUIFrame(new RectTransform(Vector2.One, inputContainer.RectTransform), style: null);
+                GUINumberInput numberInput = new GUINumberInput(new RectTransform(Vector2.One, inputFrame.RectTransform, Anchor.Center), NumberType.Int, textAlignment: Alignment.Center, style: "GUITextBox", hidePlusMinusButtons: true)
+                {
+                    IntValue = options.IndexOf(defaultValue),
+                    MinValueInt = 0,
+                    MaxValueInt = options.Length,
+                    Visible = false
+                };
+                inputContainer.RectTransform.Parent.MinSize = new Point(0, numberInput.RectTransform.MinSize.Y);
+                GUITextBox inputLabel = new GUITextBox(new RectTransform(Vector2.One, inputFrame.RectTransform, Anchor.Center), text: defaultValue.Label.Value, textAlignment: Alignment.Center, createPenIcon: false)
+                {
+                    CanBeFocused = false
+                };
+
+                GUIButton plusButton = new GUIButton(new RectTransform(Vector2.One, inputContainer.RectTransform, scaleBasis: ScaleBasis.BothHeight), style: "GUIPlusButton", textAlignment: Alignment.Center) { UserData = 1 };
+
+                minusButton.OnClicked = plusButton.OnClicked = ChangeValue;
+
+                bool ChangeValue(GUIButton btn, object userData)
+                {
+                    if (!(userData is int change)) { return false; }
+
+                    int hiddenOptions = 0;
+
+                    for (int i = options.Length - 1; i >= 0; i--)
+                    {
+                        if (options[i].IsHidden)
+                        {
+                            hiddenOptions++;
+                            continue;
+                        }
+                        break;
+                    }
+
+                    int limit = options.Length - hiddenOptions;
+
+                    if (PlayerInput.IsShiftDown())
+                    {
+                        limit = options.Length;
+                    }
+
+                    int newValue = MathUtils.PositiveModulo(Math.Clamp(numberInput.IntValue + change, min: -1, max: limit), limit);
+                    SetValue(newValue);
+                    return true;
+                }
+
+                void SetValue(int value)
+                {
+                    numberInput.IntValue = value;
+                    inputLabel.Text = options[value].Label.Value;
+                }
+
+                return new SettingValue<T>(() => options[numberInput.IntValue].Value, t => SetValue(options.IndexOf(e => Equals(e.Value, t))));
+            }
+
+            static SettingValue<bool> CreateTickbox(GUIComponent parent, LocalizedString description, LocalizedString tooltip, bool defaultValue, float verticalSize)
+            {
+                GUILayoutGroup inputContainer = CreateSettingBase(parent, description, tooltip, 0.7f, verticalSize);
+                GUILayoutGroup tickboxContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.3f, 1.0f), inputContainer.RectTransform), childAnchor: Anchor.Center);
+                GUITickBox tickBox = new GUITickBox(new RectTransform(Vector2.One, tickboxContainer.RectTransform), string.Empty)
+                {
+                    Selected = defaultValue,
+                    ToolTip = tooltip
+                };
+                tickBox.Box.IgnoreLayoutGroups = true;
+                tickBox.Box.RectTransform.SetPosition(Anchor.CenterRight);
+                inputContainer.RectTransform.Parent.MinSize = new Point(0, tickBox.RectTransform.MinSize.Y);
+                return new SettingValue<bool>(() => tickBox.Selected, b => tickBox.Selected = b);
+            }
+
+            static GUILayoutGroup CreateSettingBase(GUIComponent parent, LocalizedString description, LocalizedString tooltip, float horizontalSize, float verticalSize)
+            {
+                GUILayoutGroup settingHolder = new GUILayoutGroup(new RectTransform(new Vector2(1f, verticalSize), parent.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft);
+                GUITextBlock descriptionBlock = new GUITextBlock(new RectTransform(new Vector2(horizontalSize, 1f), settingHolder.RectTransform), description, font: parent.Rect.Width < 320 ? GUIStyle.SmallFont : GUIStyle.Font,  wrap: true) { ToolTip = tooltip };
+                GUILayoutGroup inputContainer = new GUILayoutGroup(new RectTransform(new Vector2(1f - horizontalSize, 0.8f), settingHolder.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft)
+                {
+                    RelativeSpacing = 0.05f,
+                    Stretch = true
+                };
+                inputContainer.RectTransform.IsFixedSize = true;
+                settingHolder.RectTransform.MinSize = new Point(0, (int)descriptionBlock.TextSize.Y);
+                return inputContainer;
+            }
+        }
    }
 }
@@ -18,71 +18,35 @@ namespace Barotrauma
            var verticalLayout = new GUILayoutGroup(new RectTransform(Vector2.One, newGameContainer.RectTransform), isHorizontal: false)
            {
                Stretch = true,
-                RelativeSpacing = 0.0f
+                RelativeSpacing = 0.05f
+            };
+
+            GUILayoutGroup nameSeedLayout = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.3f), verticalLayout.RectTransform), isHorizontal: false)
+            {
+                Stretch = true
+            };
+
+            GUILayoutGroup campaignSettingLayout = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.6f), verticalLayout.RectTransform), isHorizontal: false)
+            {
+                Stretch = true,
+                RelativeSpacing = 0.05f
            };

            // New game
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.03f), verticalLayout.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("SaveName"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.BottomLeft);
-            saveNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.03f), verticalLayout.RectTransform) { MinSize = new Point(0, 20) }, string.Empty)
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.03f), nameSeedLayout.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("SaveName"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.BottomLeft);
+            saveNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.03f), nameSeedLayout.RectTransform) { MinSize = new Point(0, 20) }, string.Empty)
            {
-                textFilterFunction = (string str) => { return ToolBox.RemoveInvalidFileNameChars(str); }
+                textFilterFunction = ToolBox.RemoveInvalidFileNameChars
            };

-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.03f), verticalLayout.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("MapSeed"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.BottomLeft);
-            seedBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.03f), verticalLayout.RectTransform) { MinSize = new Point(0, 20) }, ToolBox.RandomSeed(8));
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.03f), nameSeedLayout.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("MapSeed"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.BottomLeft);
+            seedBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.03f), nameSeedLayout.RectTransform) { MinSize = new Point(0, 20) }, ToolBox.RandomSeed(8));

-            GUIFrame radiationBoxContainer
-                = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), verticalLayout.RectTransform), style: null);
-            GUITickBox radiationEnabledTickBox = null;
-            if (MapGenerationParams.Instance.RadiationParams != null)
-            {
-                radiationEnabledTickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.5f), radiationBoxContainer.RectTransform, Anchor.Center), TextManager.Get("CampaignOption.EnableRadiation"), font: GUIStyle.Font)
-                {
-                    Selected = true,
-                    OnSelected = box => true
-                };
-            }
+            nameSeedLayout.RectTransform.MinSize = new Point(0, nameSeedLayout.Children.Sum(c => c.RectTransform.MinSize.Y));

-            var maxMissionCountSettingHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), verticalLayout.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) { Stretch = true };
-            var maxMissionCountDescription = new GUITextBlock(new RectTransform(new Vector2(0.7f, 0.0f), maxMissionCountSettingHolder.RectTransform), TextManager.Get("maxmissioncount", "missions"), wrap: true)
-                {
-                ToolTip = TextManager.Get("maxmissioncounttooltip")
-            };
-            int maxMissionCount = GameMain.NetworkMember.ServerSettings.MaxMissionCount;
-            var maxMissionCountContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.5f, 1.0f), maxMissionCountSettingHolder.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) { RelativeSpacing = 0.05f, Stretch = true };
-            var maxMissionCountButtons = new GUIButton[2];
-            maxMissionCountButtons[0]
-                = new GUIButton(new RectTransform(new Vector2(0.15f, 1.0f), maxMissionCountContainer.RectTransform),
-                    style: "GUIButtonToggleLeft");
-            var maxMissionCountText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1.0f), maxMissionCountContainer.RectTransform), "0", textAlignment: Alignment.Center, style: "GUITextBox");
+            CampaignSettingElements elements = CreateCampaignSettingList(campaignSettingLayout, CampaignSettings.Empty);

-            void updateMissionCountText()
-            {
-                maxMissionCount = MathHelper.Clamp(maxMissionCount,
-                    CampaignSettings.MinMissionCountLimit,
-                    CampaignSettings.MaxMissionCountLimit);
-
-                maxMissionCountText.Text = maxMissionCount.ToString(CultureInfo.InvariantCulture);
-            }
-            maxMissionCountButtons[1]
-                = new GUIButton(new RectTransform(new Vector2(0.15f, 1.0f), maxMissionCountContainer.RectTransform),
-                    style: "GUIButtonToggleRight");
-            maxMissionCountButtons[0].OnClicked = (button, o) =>
-            {
-                maxMissionCount--;
-                updateMissionCountText();
-                return false;
-            };
-            maxMissionCountButtons[1].OnClicked = (button, o) =>
-            {
-                maxMissionCount++;
-                updateMissionCountText();
-                return false;
-            };
-            updateMissionCountText();
-            maxMissionCountSettingHolder.Children.ForEach(c => c.ToolTip = maxMissionCountSettingHolder.ToolTip);
-
-            var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.04f),
+            var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.1f),
                verticalLayout.RectTransform) { MaxSize = new Point(int.MaxValue, 60) }, childAnchor: Anchor.BottomRight, isHorizontal: true);

            StartButton = new GUIButton(new RectTransform(new Vector2(0.4f, 1f), buttonContainer.RectTransform, Anchor.BottomRight), TextManager.Get("StartCampaignButton"))
@@ -99,7 +63,7 @@ namespace Barotrauma

                    if (GameMain.NetLobbyScreen.SelectedSub == null) { return false; }
                    selectedSub = GameMain.NetLobbyScreen.SelectedSub;
-                    
+
                    if (selectedSub.SubmarineClass == SubmarineClass.Undefined)
                    {
                        new GUIMessageBox(TextManager.Get("error"), TextManager.Get("undefinedsubmarineselected"));
@@ -115,11 +79,7 @@ namespace Barotrauma
                    string savePath = SaveUtil.CreateSavePath(SaveUtil.SaveType.Multiplayer, saveNameBox.Text);
                    bool hasRequiredContentPackages = selectedSub.RequiredContentPackagesInstalled;

-                    CampaignSettings settings = new CampaignSettings
-                    {
-                        RadiationEnabled = radiationEnabledTickBox?.Selected ?? GameMain.NetworkMember.ServerSettings.RadiationEnabled,
-                        MaxMissionCount = maxMissionCount
-                    };
+                    CampaignSettings settings = elements.CreateSettings();

                    if (selectedSub.HasTag(SubmarineTag.Shuttle) || !hasRequiredContentPackages)
                    {
@@ -172,12 +132,16 @@ namespace Barotrauma
            };
            StartButton.RectTransform.MaxSize = RectTransform.MaxPoint;
            StartButton.Children.ForEach(c => c.RectTransform.MaxSize = RectTransform.MaxPoint);
-            
+
            InitialMoneyText = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1f), buttonContainer.RectTransform), "", font: GUIStyle.SmallFont, textColor: GUIStyle.Green)
            {
                TextGetter = () =>
                {
-                    int initialMoney = CampaignMode.InitialMoney;
+                    int initialMoney = 8000;
+                    if (CampaignModePresets.Definitions.TryGetValue(nameof(StartingBalanceAmount).ToIdentifier(), out var definition))
+                    {
+                        initialMoney = definition.GetInt(elements.StartingFunds.GetValue().ToIdentifier());
+                    }
                    if (GameMain.NetLobbyScreen.SelectedSub != null)
                    {
                        initialMoney -= GameMain.NetLobbyScreen.SelectedSub.Price;
@@ -238,6 +202,7 @@ namespace Barotrauma

            saveList = new GUIListBox(new RectTransform(Vector2.One, leftColumn.RectTransform))
            {
+                PlaySoundOnSelect = true,
                OnSelected = SelectSaveFile
            };

@@ -257,7 +222,7 @@ namespace Barotrauma
                    file1WriteTime = File.GetLastWriteTime(file1);
                }
                catch
-                { 
+                {
                    //do nothing - DateTime.MinValue will be used and the element will get sorted at the bottom of the list 
                };
                try
@@ -1,12 +1,11 @@
-using Barotrauma.Tutorials;
+using Barotrauma.Extensions;
+using Barotrauma.IO;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using Barotrauma.IO;
+using System.Globalization;
 using System.Linq;
 using System.Xml.Linq;
-using System.Globalization;
-using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -142,7 +141,7 @@ namespace Barotrauma

            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.02f), leftColumn.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("MapSeed"), font: GUIStyle.SubHeadingFont);
            seedBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform) { MinSize = new Point(0, 20) }, ToolBox.RandomSeed(8));
-            
+
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.02f), leftColumn.RectTransform) { MinSize = new Point(0, 20) }, TextManager.Get("SelectedSub"), font: GUIStyle.SubHeadingFont);

            var moddedDropdown = new GUIDropDown(new RectTransform(new Vector2(1f, 0.02f), leftColumn.RectTransform), "", 3);
@@ -155,8 +154,12 @@ namespace Barotrauma
            {
                Stretch = true
            };
-            
-            subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform)) { ScrollBarVisible = true };
+
+            subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform))
+            {
+                PlaySoundOnSelect = true,
+                ScrollBarVisible = true
+            };

            var searchTitle = new GUITextBlock(new RectTransform(new Vector2(0.001f, 1.0f), filterContainer.RectTransform), TextManager.Get("serverlog.filter"), textAlignment: Alignment.CenterLeft, font: GUIStyle.Font);
            var searchBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 1.0f), filterContainer.RectTransform, Anchor.CenterRight), font: GUIStyle.Font, createClearButton: true);
@@ -191,7 +194,7 @@ namespace Barotrauma
            {
                TextGetter = () =>
                {
-                    int initialMoney = CampaignMode.InitialMoney;
+                    int initialMoney = CurrentSettings.InitialMoney;
                    if (subList.SelectedData is SubmarineInfo subInfo)
                    {
                        initialMoney -= subInfo.Price;
@@ -200,12 +203,16 @@ namespace Barotrauma
                    return TextManager.GetWithVariable("campaignstartingmoney", "[money]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", initialMoney));
                }
            };
-            
+
            CampaignCustomizeButton = new GUIButton(new RectTransform(new Vector2(0.25f, 1f), firstPageButtonContainer.RectTransform, Anchor.CenterLeft), TextManager.Get("SettingsButton"))
            {
                OnClicked = (tb, userdata) =>
                {
-                    CreateCustomizeWindow();
+                    CreateCustomizeWindow(CurrentSettings, settings =>
+                    {
+                        CurrentSettings = settings;
+                        UpdateSubList(SubmarineInfo.SavedSubmarines);
+                    });
                    return true;
                }
            };
@@ -218,7 +225,7 @@ namespace Barotrauma
                    return false;
                }
            };
-            
+
            var disclaimerBtn = new GUIButton(new RectTransform(new Vector2(1.0f, 0.8f), rightColumn.RectTransform, Anchor.TopRight) { AbsoluteOffset = new Point(5) }, style: "GUINotificationButton")
            {
                IgnoreLayoutGroups = true,
@@ -353,54 +360,21 @@ namespace Barotrauma
                StealRandomizeButton(CharacterMenus[i], jobTextContainer);
            }
        }
-        
-        private void CreateCustomizeWindow()
+
+        private void CreateCustomizeWindow(CampaignSettings prevSettings, Action<CampaignSettings> onClosed = null)
        {
-            CampaignCustomizeSettings = new GUIMessageBox("", "", new LocalizedString[] { TextManager.Get("OK") }, new Vector2(0.2f, 0.2f));
-            CampaignCustomizeSettings.Buttons[0].OnClicked += CampaignCustomizeSettings.Close;
+            CampaignCustomizeSettings = new GUIMessageBox("", "", new[] { TextManager.Get("OK") }, new Vector2(0.25f, 0.3f), minSize: new Point(450, 350));

-            CampaignSettingsContent = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.9f), CampaignCustomizeSettings.Content.RectTransform, Anchor.TopCenter))
-            {
-                RelativeSpacing = 0.1f
-            };
+            GUILayoutGroup campaignSettingContent = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.8f), CampaignCustomizeSettings.Content.RectTransform, Anchor.TopCenter));

-            if (MapGenerationParams.Instance.RadiationParams != null)
-            {
-                bool prevRadiationToggleEnabled = EnableRadiationToggle?.Selected ?? true;
-                EnableRadiationToggle = new GUITickBox(new RectTransform(new Vector2(0.3f, 0.3f), CampaignSettingsContent.RectTransform), TextManager.Get("CampaignOption.EnableRadiation"), font: GUIStyle.Font)
-                {
-                    Selected = prevRadiationToggleEnabled,
-                    ToolTip = TextManager.Get("campaignoption.enableradiation.tooltip")
-                };
-            }
-            var maxMissionCountSettingHolder = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.3f), CampaignSettingsContent.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) 
-            { 
-                Stretch = true,
-                ToolTip = TextManager.Get("maxmissioncounttooltip")
-            };
-            var maxMissionCountDescription = new GUITextBlock(new RectTransform(new Vector2(0.7f, 0.0f), maxMissionCountSettingHolder.RectTransform), TextManager.Get("maxmissioncount", "missions"), wrap: true);
-            var maxMissionCountContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.5f, 1.0f), maxMissionCountSettingHolder.RectTransform), isHorizontal: true, childAnchor: Anchor.CenterLeft) { RelativeSpacing = 0.05f, Stretch = true };
-            var maxMissionCountButtons = new GUIButton[2];
-            maxMissionCountButtons[0] = new GUIButton(new RectTransform(new Vector2(0.15f, 0.8f), maxMissionCountContainer.RectTransform), style: "GUIButtonToggleLeft")
-            {
-                OnClicked = (button, obj) =>
-                {
-                    MaxMissionCountText.Text = Math.Clamp(Int32.Parse(MaxMissionCountText.Text.SanitizedValue) - 1, CampaignSettings.MinMissionCountLimit, CampaignSettings.MaxMissionCountLimit).ToString();
-                    return true;
-                }
-            };

-            RichString prevMaxMissionCountText = MaxMissionCountText?.Text ?? CampaignSettings.DefaultMaxMissionCount.ToString();
-            MaxMissionCountText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1.0f), maxMissionCountContainer.RectTransform), prevMaxMissionCountText, textAlignment: Alignment.Center, style: "GUITextBox");
-            maxMissionCountButtons[1] = new GUIButton(new RectTransform(new Vector2(0.15f, 0.8f), maxMissionCountContainer.RectTransform), style: "GUIButtonToggleRight")
+            CampaignSettingElements elements = CreateCampaignSettingList(campaignSettingContent, prevSettings);
+            CampaignCustomizeSettings.Buttons[0].OnClicked += (button, o) =>
            {
-                OnClicked = (button, obj) =>
-                {
-                    MaxMissionCountText.Text = Math.Clamp(Int32.Parse(MaxMissionCountText.Text.SanitizedValue) + 1, CampaignSettings.MinMissionCountLimit, CampaignSettings.MaxMissionCountLimit).ToString();
-                    return true;
-                }
+
+                onClosed?.Invoke(elements.CreateSettings());
+                return CampaignCustomizeSettings.Close(button, o);
            };
-            maxMissionCountContainer.Children.ForEach(c => c.ToolTip = maxMissionCountSettingHolder.ToolTip);
        }

        private static void StealRandomizeButton(CharacterInfo.AppearanceCustomizationMenu menu, GUIComponent parent)
@@ -412,7 +386,7 @@ namespace Barotrauma
            randomizeButton.RectTransform.Parent = parent.RectTransform;
            randomizeButton.RectTransform.RelativeSize = Vector2.One * 1.3f;
        }
-        
+
        private bool FinishSetup(GUIButton btn, object userdata)
        {
            if (string.IsNullOrWhiteSpace(saveNameBox.Text))
@@ -420,7 +394,7 @@ namespace Barotrauma
                saveNameBox.Flash(GUIStyle.Red);
                return false;
            }
-            
+
            SubmarineInfo selectedSub = null;

            if (!(subList.SelectedData is SubmarineInfo)) { return false; }
@@ -443,16 +417,7 @@ namespace Barotrauma
            string savePath = SaveUtil.CreateSavePath(SaveUtil.SaveType.Singleplayer, saveNameBox.Text);
            bool hasRequiredContentPackages = selectedSub.RequiredContentPackagesInstalled;

-            CampaignSettings settings = new CampaignSettings();
-            settings.RadiationEnabled = EnableRadiationToggle?.Selected ?? false;
-            if (MaxMissionCountText != null && Int32.TryParse(MaxMissionCountText.Text.SanitizedValue, out int missionCount))
-            {
-                settings.MaxMissionCount = missionCount;
-            }
-            else
-            {
-                settings.MaxMissionCount = CampaignSettings.DefaultMaxMissionCount;
-            }
+            CampaignSettings settings = CurrentSettings;

            if (selectedSub.HasTag(SubmarineTag.Shuttle) || !hasRequiredContentPackages)
            {
@@ -499,7 +464,7 @@ namespace Barotrauma

            return true;
        }
-        
+
        public void RandomizeSeed()
        {
            seedBox.Text = ToolBox.RandomSeed(8);
@@ -509,7 +474,7 @@ namespace Barotrauma
        {
            foreach (GUIComponent child in subList.Content.Children)
            {
-                var sub = child.UserData as SubmarineInfo;
+                SubmarineInfo sub = child.UserData as SubmarineInfo;
                if (sub == null) { return; }
                child.Visible = string.IsNullOrEmpty(filter) || sub.DisplayName.Contains(filter.ToLower(), StringComparison.OrdinalIgnoreCase);
            }
@@ -523,7 +488,7 @@ namespace Barotrauma

            if (!(obj is SubmarineInfo sub)) { return true; }
 #if !DEBUG
-            if (sub.Price > CampaignMode.InitialMoney && !GameMain.DebugDraw) 
+            if (sub.Price > CurrentSettings.InitialMoney && !GameMain.DebugDraw)
            {
                SetPage(0);
                nextButton.Enabled = false;
@@ -556,8 +521,8 @@ namespace Barotrauma

            subsToShow.Sort((s1, s2) => 
            {
-                int p1 = s1.Price > CampaignMode.InitialMoney ? 10 : 0;
-                int p2 = s2.Price > CampaignMode.InitialMoney ? 10 : 0;
+                int p1 = s1.Price > CurrentSettings.InitialMoney ? 10 : 0;
+                int p2 = s2.Price > CurrentSettings.InitialMoney ? 10 : 0;
                return p1.CompareTo(p2) * 100 + s1.Name.CompareTo(s2.Name); 
            });

@@ -582,13 +547,13 @@ namespace Barotrauma
                var priceText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), textBlock.RectTransform, Anchor.CenterRight),
                    TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", sub.Price)), textAlignment: Alignment.CenterRight, font: GUIStyle.SmallFont)
                {
-                    TextColor = sub.Price > CampaignMode.InitialMoney ? GUIStyle.Red : textBlock.TextColor * 0.8f,
+                    TextColor = sub.Price > CurrentSettings.InitialMoney ? GUIStyle.Red : textBlock.TextColor * 0.8f,
                    ToolTip = textBlock.ToolTip
                };
 #if !DEBUG
                if (!GameMain.DebugDraw)
                {
-                    if (sub.Price > CampaignMode.InitialMoney || !sub.IsCampaignCompatible)
+                    if (sub.Price > CurrentSettings.InitialMoney || !sub.IsCampaignCompatible)
                    {
                        textBlock.CanBeFocused = false;
                        textBlock.TextColor *= 0.5f;
@@ -598,7 +563,7 @@ namespace Barotrauma
            }
            if (SubmarineInfo.SavedSubmarines.Any())
            {
-                var validSubs = subsToShow.Where(s => s.IsCampaignCompatible && s.Price <= CampaignMode.InitialMoney).ToList();
+                var validSubs = subsToShow.Where(s => s.IsCampaignCompatible && s.Price <= CurrentSettings.InitialMoney).ToList();
                if (validSubs.Count > 0)
                {
                    subList.Select(validSubs[Rand.Int(validSubs.Count)]);
@@ -625,6 +590,7 @@ namespace Barotrauma

            saveList = new GUIListBox(new RectTransform(Vector2.One, leftColumn.RectTransform))
            {
+                PlaySoundOnSelect = true,
                OnSelected = SelectSaveFile
            };

@@ -650,8 +616,9 @@ namespace Barotrauma
            {
                var saveFrame = CreateSaveElement(saveInfo);
                if (saveFrame == null) { continue; }
-                                
+
                XDocument doc = SaveUtil.LoadGameSessionDoc(saveInfo.FilePath);
+
                if (doc?.Root == null)
                {
                    DebugConsole.ThrowError("Error loading save file \"" + saveInfo.FilePath + "\". The file may be corrupted.");
@@ -725,9 +692,10 @@ namespace Barotrauma

            string subName = doc.Root.GetAttributeString("submarine", "");
            string saveTime = doc.Root.GetAttributeString("savetime", "unknown");
+            DateTime? time = null;
            if (long.TryParse(saveTime, out long unixTime))
            {
-                DateTime time = ToolBox.Epoch.ToDateTime(unixTime);
+                time = ToolBox.Epoch.ToDateTime(unixTime);
                saveTime = time.ToString();
            }