v1.0.20.1 (summer patch)

2023-06-15 16:46:54 +03:00
parent 6acac1d143
commit 83de72e3d2
209 changed files with 4497 additions and 2488 deletions
@@ -148,6 +148,9 @@ namespace Barotrauma
                    case "stats":
                        LoadStats(subElement);
                        break;
+                    case "eventmanager":
+                        GameMain.GameSession.EventManager.Load(subElement);
+                        break;
                }
            }

@@ -210,28 +213,14 @@ namespace Barotrauma
            {
                StartRound = () => { TryEndRound(); }
            };
-        }

-        private void CreateEndRoundButton()
-        {
-            int buttonHeight = (int)(GUI.Scale * 40);
-            int buttonWidth = GUI.IntScale(450);
-            endRoundButton = new GUIButton(HUDLayoutSettings.ToRectTransform(new Rectangle((GameMain.GraphicsWidth / 2) - (buttonWidth / 2), HUDLayoutSettings.ButtonAreaTop.Center.Y - (buttonHeight / 2), buttonWidth, buttonHeight), GUI.Canvas),
-                TextManager.Get("EndRound"), textAlignment: Alignment.Center, style: "EndRoundButton")
+            endRoundButton = CreateEndRoundButton();
+            endRoundButton.OnClicked = (btn, userdata) =>
            {
-                Pulse = true,
-                TextBlock =
-                {
-                    Shadow = true,
-                    AutoScaleHorizontal = true
-                },
-                OnClicked = (btn, userdata) =>
-                {
-                    TryEndRoundWithFuelCheck(
-                        onConfirm: () => TryEndRound(),
-                        onReturnToMapScreen: () => { ShowCampaignUI = true; CampaignUI.SelectTab(InteractionType.Map); });
-                    return true;
-                }
+                TryEndRoundWithFuelCheck(
+                    onConfirm: () => TryEndRound(),
+                    onReturnToMapScreen: () => { ShowCampaignUI = true; CampaignUI.SelectTab(InteractionType.Map); });
+                return true;
            };
        }

@@ -699,6 +688,11 @@ namespace Barotrauma
            modeElement.Add(Settings.Save());
            modeElement.Add(SaveStats());

+            if (GameMain.GameSession?.EventManager != null)
+            {
+                modeElement.Add(GameMain.GameSession?.EventManager.Save());
+            }
+
            //save and remove all items that are in someone's inventory so they don't get included in the sub file as well
            foreach (Character c in Character.CharacterList)
            {