v1.2.6.0 (Winter Update)

Barotrauma/BarotraumaClient/ClientSource/Events/EventActions/ConversationAction.cs

@@ -374,13 +374,12 @@ namespace Barotrauma
                 btn.RectTransform.MinSize = new Point(0, (int)(btn.TextBlock.Rect.Height * 1.2f));
             }
 
-            textContent.RectTransform.MinSize = new Point(0, textContent.Children.Sum(c => c.Rect.Height) + GUI.IntScale(16));
+            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));
 
             // 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();
             textBlock.TextAlignment = Alignment.TopLeft;
-            //content.RectTransform.MinSize = new Point(0, textContent.Rect.Height);
 
             return buttons;
         }

Barotrauma/BarotraumaClient/ClientSource/Events/EventActions/EventObjectiveAction.cs

@@ -16,6 +16,11 @@ partial class EventObjectiveAction : EventAction
         int width = 450,
         int height = 80)
     {
+        if (Type == SegmentActionType.AddIfNotFound)
+        {
+            if (ObjectiveManager.IsSegmentActive(Identifier)) { return; }
+        }
+
         ObjectiveManager.Segment? segment = null;
         // Only need to create the segment when it's being triggered (otherwise the tutorial already has the segment instance)
         if (Type == SegmentActionType.Trigger)
@@ -24,7 +29,8 @@ partial class EventObjectiveAction : EventAction
                 new ObjectiveManager.Segment.Text(TextTag, width, height, Anchor.Center),
                 new ObjectiveManager.Segment.Video(videoFile, TextTag, width, height));
         }
-        else if (Type == SegmentActionType.Add)
+        else if (Type == SegmentActionType.Add ||
+                Type == SegmentActionType.AddIfNotFound)
         {
             segment = ObjectiveManager.Segment.CreateObjectiveSegment(Identifier, !ObjectiveTag.IsEmpty ? ObjectiveTag : Identifier);
         }
@@ -33,10 +39,12 @@ partial class EventObjectiveAction : EventAction
             segment.CanBeCompleted = CanBeCompleted;
             segment.ParentId = ParentObjectiveId;
         }
+
         switch (Type)
         {
             case SegmentActionType.Trigger:
             case SegmentActionType.Add:
+            case SegmentActionType.AddIfNotFound:
                 ObjectiveManager.TriggerSegment(segment);
                 break;
             case SegmentActionType.Complete:

Barotrauma/BarotraumaClient/ClientSource/Events/EventActions/HighlightAction.cs

@@ -1,22 +1,19 @@
+#nullable enable
 using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma;
 
-partial class TutorialHighlightAction : EventAction
+partial class HighlightAction : EventAction
 {
-    private static readonly Color highlightColor = Color.Orange;
-
-    partial void UpdateProjSpecific()
+    partial void SetHighlightProjSpecific(Entity entity, IEnumerable<Character>? targetCharacters)
     {
-        if (GameMain.GameSession?.GameMode is not TutorialMode) { return; }
-        foreach (var target in ParentEvent.GetTargets(TargetTag))
+        if (targetCharacters != null && !targetCharacters.Contains(Character.Controlled))
         {
-            SetHighlight(target);
+            return;
         }
-    }
 
-    private void SetHighlight(Entity entity)
-    {
         if (entity is Item i)
         {
             SetItemHighlight(i);