Build 0.18.9.0

2022-06-14 04:14:47 +09:00
parent 4f5a3bf8b9
commit 856f894203
39 changed files with 459 additions and 377 deletions
@@ -526,7 +526,7 @@ namespace Barotrauma
                        tickBox.OnSelected += (GUITickBox tb) =>
                        {
                            if (!Campaign.AllowedToManageCampaign(Networking.ClientPermissions.ManageMap)) { return false; }
-                            
+
                            if (tb.Selected)
                            {
                                Campaign.Map.CurrentLocation.SelectMission(mission);
@@ -549,7 +549,7 @@ namespace Barotrauma
                            {
                                GameMain.Client?.SendCampaignState();
                            }
-                            return true;                            
+                            return true;
                        };
                        missionTickBoxes.Add(tickBox);

@@ -731,6 +731,14 @@ namespace Barotrauma
                    if (submarineSelection == null) submarineSelection = new SubmarineSelection(false, () => Campaign.ShowCampaignUI = false, tabs[(int)CampaignMode.InteractionType.PurchaseSub].RectTransform);
                    submarineSelection.RefreshSubmarineDisplay(true, setTransferOptionToTrue: true);
                    break;
+                case CampaignMode.InteractionType.Map:
+                    //refresh mission rewards (may have been changed by e.g. a pending submarine switch)
+                    foreach (GUITextBlock rewardText in missionRewardTexts)
+                    {
+                        Mission mission = (Mission)rewardText.UserData;
+                        rewardText.Text = mission.GetMissionRewardText(Submarine.MainSub);
+                    }
+                    break;
            }
        }

@@ -74,6 +74,7 @@ namespace Barotrauma
            {
                CreateHostServerFields();
                CreateCampaignSetupUI();
+                SettingsMenu.Create(menuTabs[Tab.Settings].RectTransform);
                if (remoteContentDoc?.Root != null)
                {
                    remoteContentContainer.ClearChildren();
@@ -1549,10 +1549,7 @@ namespace Barotrauma
            MapEntity.DeselectAll();
            ClearUndoBuffer();

-            GameMain.DebugDraw = false;
-            GameMain.LightManager.LightingEnabled = true;
-            Hull.EditWater = false;
-            Hull.EditFire = false;
+            DebugConsole.DeactivateCheats();

            SetMode(Mode.Default);