Hotfix 1.1.18.1

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs

@@ -140,7 +140,11 @@ namespace Barotrauma
                 Identifier typeName = element.Name.ToString().ToIdentifier();
                 if (typeName == "TutorialSegmentAction")
                 {
-                    typeName = "EventObjectiveAction".ToIdentifier();
+                    typeName = nameof(EventObjectiveAction).ToIdentifier();
+                }
+                else if (typeName == "TutorialHighlightAction")
+                {
+                    typeName = nameof(HighlightAction).ToIdentifier();
                 }
                 actionType = Type.GetType("Barotrauma." + typeName, throwOnError: true, ignoreCase: true);
                 if (actionType == null) { throw new NullReferenceException(); }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/HighlightAction.cs

@@ -0,0 +1,43 @@
+#nullable enable
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Barotrauma;
+
+partial class HighlightAction : EventAction
+{
+    private static readonly Color highlightColor = Color.Orange;
+
+    [Serialize("", IsPropertySaveable.Yes)]
+    public Identifier TargetTag { get; set; }
+
+    [Serialize("", IsPropertySaveable.Yes, description: "Only the player controlling this character will see the highlight. If empty, all players will see it.")]
+    public Identifier TargetCharacter { get; set; }
+
+    [Serialize(true, IsPropertySaveable.Yes)]
+    public bool State { get; set; }
+
+    private bool isFinished;
+
+    public HighlightAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) 
+    {
+    }
+
+    public override void Update(float deltaTime)
+    {
+        if (isFinished) { return; }
+        var targetCharacters = TargetCharacter.IsEmpty ? null : ParentEvent.GetTargets(TargetCharacter).OfType<Character>();
+        foreach (var target in ParentEvent.GetTargets(TargetTag))
+        {
+            SetHighlightProjSpecific(target, targetCharacters);
+        }
+        isFinished = true;
+    }
+
+    partial void SetHighlightProjSpecific(Entity entity, IEnumerable<Character>? targetCharacters);
+
+    public override bool IsFinished(ref string goToLabel) => isFinished;
+
+    public override void Reset() => isFinished = false;
+}

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TutorialHighlightAction.cs

@@ -1,33 +0,0 @@
-namespace Barotrauma;
-
-partial class TutorialHighlightAction : EventAction
-{
-    [Serialize("", IsPropertySaveable.Yes)]
-    public Identifier TargetTag { get; set; }
-
-    [Serialize(true, IsPropertySaveable.Yes)]
-    public bool State { get; set; }
-
-    private bool isFinished;
-
-    public TutorialHighlightAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) 
-    {
-        if (GameMain.NetworkMember != null)
-        {
-            DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(TutorialHighlightAction)} is not supported in multiplayer.");
-        }
-    }
-
-    public override void Update(float deltaTime)
-    {
-        if (isFinished) { return; }
-        UpdateProjSpecific();
-        isFinished = true;
-    }
-
-    partial void UpdateProjSpecific();
-
-    public override bool IsFinished(ref string goToLabel) => isFinished;
-
-    public override void Reset() => isFinished = false;
-}

Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs

@@ -294,6 +294,11 @@ namespace Barotrauma.Extensions
                 .Where(nullable => nullable.HasValue)
                 .Select(nullable => nullable.Value);
 
+        public static IEnumerable<T> NotNull<T>(this IEnumerable<T> source) where T : class
+            => source
+                .Where(nullable => nullable != null)
+                .Select(nullable => nullable!);
+
         public static IEnumerable<T> NotNone<T>(this IEnumerable<Option<T>> source)
         {
             foreach (var o in source)

Barotrauma/BarotraumaShared/SharedSource/Items/ItemEventData.cs

@@ -23,9 +23,10 @@ namespace Barotrauma
             Upgrade = 8,
             ItemStat = 9,
             DroppedStack = 10,
+            SetHighlight = 11,
 
             MinValue = 0,
-            MaxValue = 10
+            MaxValue = 11
         }
 
         public interface IEventData : NetEntityEvent.IData

Barotrauma/BarotraumaShared/SharedSource/Utils/SaveUtil.cs

@@ -238,7 +238,7 @@ namespace Barotrauma
             return folder;
         }
 
-        public static IReadOnlyList<CampaignMode.SaveInfo> GetSaveFiles(SaveType saveType, bool includeInCompatible = true)
+        public static IReadOnlyList<CampaignMode.SaveInfo> GetSaveFiles(SaveType saveType, bool includeInCompatible = true, bool logLoadErrors = true)
         {
             string defaultFolder = saveType == SaveType.Singleplayer ? DefaultSaveFolder : DefaultMultiplayerSaveFolder;
             if (!Directory.Exists(defaultFolder))
@@ -273,7 +273,7 @@ namespace Barotrauma
             List<CampaignMode.SaveInfo> saveInfos = new List<CampaignMode.SaveInfo>();   
             foreach (string file in files)
             {
-                var docRoot = ExtractGameSessionRootElementFromSaveFile(file);
+                var docRoot = ExtractGameSessionRootElementFromSaveFile(file, logLoadErrors);
                 if (!includeInCompatible && !IsSaveFileCompatible(docRoot))
                 {
                     continue;
@@ -561,7 +561,7 @@ namespace Barotrauma
         /// Extract *only* the root element of the gamesession.xml file in the given save.
         /// For performance reasons, none of its child elements are returned.
         /// </summary>
-        public static XElement? ExtractGameSessionRootElementFromSaveFile(string savePath)
+        public static XElement? ExtractGameSessionRootElementFromSaveFile(string savePath, bool logLoadErrors = true)
         {
             const int maxRetries = 4;
             for (int i = 0; i <= maxRetries; i++)
@@ -617,12 +617,19 @@ namespace Barotrauma
                     if (i >= maxRetries || !File.Exists(savePath)) { throw; }
 
                     DebugConsole.NewMessage(
-                        $"Failed to decompress file \"{savePath}\" for root extraction {{{e.Message}}}, retrying in 250 ms...",
+                        $"Failed to decompress file \"{savePath}\" for root extraction ({e.Message}), retrying in 250 ms...",
                         Color.Red);
                     Thread.Sleep(250);
                 }
+                catch (System.IO.InvalidDataException e)
+                {
+                    if (logLoadErrors)
+                    {
+                        DebugConsole.ThrowError($"Failed to decompress file \"{savePath}\" for root extraction.", e);
+                    }
+                    return null;
+                }
             }
-
             return null;
         }