OBT/1.2.0(Spring Update)

Sync with Upstream
2026-04-25 13:25:41 +08:00
parent 5207b381b7
commit 59bc21973a
421 changed files with 24090 additions and 11391 deletions
@@ -277,6 +277,14 @@ namespace Barotrauma
                        int selectedOption = (userdata as int?) ?? 0;
                        if (actionInstance != null)
                        {
+                            var option = actionInstance.Options[selectedOption];
+                            if (GameMain.Client == null && option.ForceSay)
+                            {
+                                Character.Controlled.ForceSay(
+                                    option.ForceSayText.IsNullOrEmpty() ? TextManager.Get(option.Text).Fallback(option.Text) : TextManager.Get(option.ForceSayText).Fallback(option.ForceSayText),
+                                    option.ForceSayInRadio,
+                                    option.ForceSayRemoveQuotes);
+                            }
                            actionInstance.selectedOption = selectedOption;
                            DisableButtons(optionButtons, btn);
                            btn.ExternalHighlight = true;
@@ -340,7 +348,8 @@ namespace Barotrauma
            if (speaker?.Info != null && drawChathead)
            {
                // chathead
-                new GUICustomComponent(new RectTransform(new Vector2(0.15f, 0.8f), content.RectTransform), onDraw: (sb, customComponent) =>
+                int chatHeadWidth = (int)(content.RectTransform.Rect.Width * 0.15f);
+                new GUICustomComponent(new RectTransform(new Point(chatHeadWidth, chatHeadWidth), content.RectTransform, isFixedSize: true), onDraw: (sb, customComponent) =>
                {
                    speaker.Info.DrawIcon(sb, customComponent.Rect.Center.ToVector2(), customComponent.Rect.Size.ToVector2());
                });
@@ -382,7 +391,7 @@ namespace Barotrauma
            }

            textContent.RectTransform.MinSize = new Point(0, textContent.Children.Sum(c => c.Rect.Height + textContent.AbsoluteSpacing) + GUI.IntScale(16));
-            content.RectTransform.MinSize = new Point(0, content.Children.Sum(c => c.Rect.Height));
+            content.RectTransform.MinSize = textContent.RectTransform.MinSize;

            // Recalculate the text size as it is scaled up and no longer matching the text height due to the textContent's minSize increasing
            textBlock.CalculateHeightFromText();
@@ -61,17 +61,9 @@ namespace Barotrauma
                {
                    Item.ReadSpawnData(msg);
                }
-                if (character.Submarine != null && character.AIController is EnemyAIController enemyAi)
+                if (character.AIController is EnemyAIController enemyAi && character.Submarine is Submarine ownSub)
                {
-                    enemyAi.UnattackableSubmarines.Add(character.Submarine);
-                    if (Submarine.MainSub != null)
-                    {
-                        enemyAi.UnattackableSubmarines.Add(Submarine.MainSub);
-                        foreach (Submarine sub in Submarine.MainSub.DockedTo)
-                        {
-                            enemyAi.UnattackableSubmarines.Add(sub);
-                        }
-                    }
+                    enemyAi.SetUnattackableSubmarines(ownSub);
                }
            }
            if (characters.Contains(null))
@@ -0,0 +1,8 @@
+#nullable enable
+namespace Barotrauma;
+
+internal sealed partial class CustomMission : Mission
+{
+    public override bool DisplayAsCompleted => State == SuccessState;
+    public override bool DisplayAsFailed => State == FailureState;
+}
@@ -14,7 +14,7 @@ namespace Barotrauma

        private void TryShowRetrievedMessage()
        {
-            if (DetermineCompleted())
+            if (DetermineCompleted(CampaignMode.TransitionType.None))
            {
                HandleMessage(ref allRetrievedMessage);
            }