Unstable 1.2.1.0

2023-11-10 17:45:19 +02:00
parent 2ea58c58a7
commit 8a2e2ea0ae
268 changed files with 4076 additions and 1843 deletions
@@ -14,12 +14,14 @@ namespace Barotrauma
        {
            if (TargetTag.IsEmpty)
            {
-                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckConditionalAction with no target tag! This will cause the check to automatically succeed.");
+                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckConditionalAction with no target tag! This will cause the check to automatically succeed.",
+                    contentPackage: parentEvent.Prefab.ContentPackage);
            }
            Conditional = PropertyConditional.FromXElement(element, IsNotTargetTagAttribute).FirstOrDefault();
            if (Conditional == null)
            {
-                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckConditionalAction with no valid PropertyConditional! This will cause the check to automatically succeed.");
+                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckConditionalAction with no valid PropertyConditional! This will cause the check to automatically succeed.",
+                    contentPackage: parentEvent.Prefab.ContentPackage);
            }

            static bool IsNotTargetTagAttribute(XAttribute attribute) => attribute.NameAsIdentifier() != "targettag";
@@ -46,7 +48,8 @@ namespace Barotrauma
            }
            if (target == null)
            {
-                DebugConsole.LogError($"{nameof(CheckConditionalAction)} error: {GetEventName()} uses a {nameof(CheckConditionalAction)} but no valid target was found for tag \"{TargetTag}\"! This will cause the check to automatically succeed.");
+                DebugConsole.LogError($"{nameof(CheckConditionalAction)} error: {GetEventName()} uses a {nameof(CheckConditionalAction)} but no valid target was found for tag \"{TargetTag}\"! This will cause the check to automatically succeed.",
+                    contentPackage: ParentEvent.Prefab.ContentPackage);
            }
            if (target == null || Conditional == null)
            {
@@ -30,7 +30,8 @@ namespace Barotrauma
                Condition = element.GetAttributeString("value", string.Empty)!;
                if (string.IsNullOrEmpty(Condition))
                {
-                    DebugConsole.ThrowError($"Error in scripted event \"{parentEvent.Prefab.Identifier}\". CheckDataAction with no condition set ({element}).");
+                    DebugConsole.ThrowError($"Error in scripted event \"{parentEvent.Prefab.Identifier}\". CheckDataAction with no condition set ({element}).",
+                        contentPackage: element?.ContentPackage);
                }
            }
        }
@@ -42,7 +43,8 @@ namespace Barotrauma
                Condition = element.GetAttributeString("value", string.Empty)!;
                if (string.IsNullOrEmpty(Condition))
                {
-                    DebugConsole.ThrowError($"Error in scripted event \"{parentDebugString}\". CheckDataAction with no condition set ({element}).");
+                    DebugConsole.ThrowError($"Error in scripted event \"{parentDebugString}\". CheckDataAction with no condition set ({element}).",
+                        contentPackage: element?.ContentPackage);
                }
            }
        }
@@ -59,7 +61,8 @@ namespace Barotrauma
            (Operator, string value) = PropertyConditional.ExtractComparisonOperatorFromConditionString(Condition);
            if (Operator == PropertyConditional.ComparisonOperatorType.None)
            {
-                DebugConsole.ThrowError($"{Condition} is invalid, it should start with an operator followed by a boolean or a floating point value.");
+                DebugConsole.ThrowError($"{Condition} is invalid, it should start with an operator followed by a boolean or a floating point value.", 
+                    contentPackage: ParentEvent?.Prefab?.ContentPackage);
                return false;
            }

@@ -77,7 +77,8 @@ namespace Barotrauma
                ItemIdentifiers.None() &&
                TargetTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {nameof(CheckItemAction)} does't define either tags or identifiers of the item to check.");
+                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {nameof(CheckItemAction)} does't define either tags or identifiers of the item to check.",
+                    contentPackage: element.ContentPackage);
            }
            checkPercentage = element.GetAttribute(nameof(RequiredConditionalMatchPercentage)) is not null;
            if (checkPercentage && conditionals.None())
@@ -86,7 +87,8 @@ namespace Barotrauma
            }
            if (Amount != 1 && checkPercentage)
            {
-                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". Cannot define both '{Amount}' and '{RequiredConditionalMatchPercentage}' in {nameof(CheckItemAction)}.");
+                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". Cannot define both '{Amount}' and '{RequiredConditionalMatchPercentage}' in {nameof(CheckItemAction)}.", 
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -32,7 +32,8 @@ namespace Barotrauma
            var targetCharacters = ParentEvent.GetTargets(TargetTag);
            if (targetCharacters.None())
            {
-                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckOrderAction but no valid target characters were found for tag \"{TargetTag}\"! This will cause the check to automatically fail.");
+                DebugConsole.LogError($"CheckConditionalAction error: {GetEventName()} uses a CheckOrderAction but no valid target characters were found for tag \"{TargetTag}\"! This will cause the check to automatically fail.",
+                    contentPackage: ParentEvent.Prefab.ContentPackage);
                return false;
            }
            foreach (var t in targetCharacters)
@@ -1,7 +1,5 @@
 #nullable enable
-using System;
 using System.Diagnostics;
-using System.Xml.Linq;

 namespace Barotrauma
 {
@@ -31,7 +29,8 @@ namespace Barotrauma
                }
                default:
                {
-                    DebugConsole.ThrowError("CheckReputationAction requires a \"TargetType\" but none were specified.");
+                    DebugConsole.ThrowError("CheckReputationAction requires a \"TargetType\" but none were specified.", 
+                        contentPackage: ParentEvent.Prefab.ContentPackage);
                    break;
                }
            }
@@ -41,7 +40,8 @@ namespace Barotrauma

        protected override bool GetBool(CampaignMode campaignMode)
        {
-            DebugConsole.ThrowError("Boolean comparison cannot be applied to reputations.");
+            DebugConsole.ThrowError("Boolean comparison cannot be applied to reputations.", 
+                contentPackage: ParentEvent.Prefab.ContentPackage);
            return false;
        }
        
@@ -87,13 +87,13 @@ namespace Barotrauma
 #if DEBUG
            void Error(string errorMsg)
            {
-                DebugConsole.ThrowError(errorMsg);
+                DebugConsole.ThrowError(errorMsg, contentPackage: ParentEvent.Prefab.ContentPackage);
            }
 #else

            void Error(string errorMsg)
            {
-                DebugConsole.LogError(errorMsg);
+                DebugConsole.LogError(errorMsg, contentPackage: ParentEvent.Prefab.ContentPackage);
            }
 #endif
        }
@@ -17,7 +17,8 @@ namespace Barotrauma
            }
            else
            {
-                DebugConsole.ThrowError($"Cannot use the action {nameof(CheckTraitorEventStateAction)} in the event \"{parentEvent.Prefab.Identifier}\" because it's not a traitor event.");
+                DebugConsole.ThrowError($"Cannot use the action {nameof(CheckTraitorEventStateAction)} in the event \"{parentEvent.Prefab.Identifier}\" because it's not a traitor event.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -16,7 +16,8 @@ namespace Barotrauma
        { 
            if (parentEvent is not TraitorEvent)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\" - {nameof(CheckTraitorVoteAction)} can only be used in traitor events.");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\" - {nameof(CheckTraitorVoteAction)} can only be used in traitor events.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -116,7 +116,8 @@ namespace Barotrauma
            {
                DebugConsole.ThrowError(
                    $"Error in {nameof(EventObjectiveAction)} in the event \"{parentEvent.Prefab.Identifier}\"" +
-                    $" - unrecognized child element \"Replace\".");
+                    $" - unrecognized child element \"Replace\".",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -61,14 +61,16 @@ namespace Barotrauma
                }
                if (MinAmount > MaxAmount && MaxAmount > -1)
                {
-                    DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {MinAmount} is larger than {MaxAmount} in {nameof(CountTargetsAction)}.");
+                    DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {MinAmount} is larger than {MaxAmount} in {nameof(CountTargetsAction)}.",
+                        contentPackage: element.ContentPackage);
                }
            }
            else
            {
                if (MinPercentageRelativeToTarget < 0.0f && MaxPercentageRelativeToTarget < 0.0f)
                {
-                    DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". Comparing to another target, but neither {nameof(MinPercentageRelativeToTarget)} or {nameof(MaxPercentageRelativeToTarget)} is set.");
+                    DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". Comparing to another target, but neither {nameof(MinPercentageRelativeToTarget)} or {nameof(MaxPercentageRelativeToTarget)} is set.",
+                        contentPackage: element.ContentPackage);
                }
            }
        }
@@ -36,7 +36,8 @@ namespace Barotrauma
                {
                    if (e.Name.ToString().Equals("statuseffect", StringComparison.OrdinalIgnoreCase))
                    {
-                        DebugConsole.ThrowError($"Error in event prefab \"{scriptedEvent.Prefab.Identifier}\". Status effect configured as a sub action (text: \"{Text}\"). Please configure status effects as child elements of a StatusEffectAction.");
+                        DebugConsole.ThrowError($"Error in event prefab \"{scriptedEvent.Prefab.Identifier}\". Status effect configured as a sub action (text: \"{Text}\"). Please configure status effects as child elements of a StatusEffectAction.",
+                            contentPackage: elem.ContentPackage);
                        continue;
                    }
                    var action = Instantiate(scriptedEvent, e);
@@ -102,7 +103,7 @@ namespace Barotrauma

        public EventAction(ScriptedEvent parentEvent, ContentXElement element)
        {
-            ParentEvent = parentEvent;
+            ParentEvent = parentEvent ?? throw new ArgumentNullException(nameof(parentEvent));
            SerializableProperty.DeserializeProperties(this, element);
        }

@@ -147,7 +148,8 @@ namespace Barotrauma
            }
            catch
            {
-                DebugConsole.ThrowError($"Could not find an {nameof(EventAction)} class of the type \"{element.Name}\".");
+                DebugConsole.ThrowError($"Could not find an {nameof(EventAction)} class of the type \"{element.Name}\".",
+                    contentPackage: element.ContentPackage);
                return null;
            }

@@ -162,7 +164,8 @@ namespace Barotrauma
            }
            catch (Exception ex)
            {
-                DebugConsole.ThrowError(ex.InnerException != null ? ex.InnerException.ToString() : ex.ToString());
+                DebugConsole.ThrowError(ex.InnerException != null ? ex.InnerException.ToString() : ex.ToString(),
+                    contentPackage: element.ContentPackage);
                return null;
            }
        }
@@ -24,7 +24,8 @@ namespace Barotrauma
        {
            if (Id == Identifier.Empty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\". {nameof(EventLogAction)} with no id.");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\". {nameof(EventLogAction)} with no id.",
+                    contentPackage: element.ContentPackage);
            }
            //append the target tag so logs targeted to different players don't interfere with each other even if they use the same Id
            Id = (Id.ToString() + TargetTag).ToIdentifier();
@@ -42,7 +43,8 @@ namespace Barotrauma
            {
                if (Text.IsNullOrEmpty())
                {
-                    DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\". {nameof(EventLogAction)} with no text set ({element}).");
+                    DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\". {nameof(EventLogAction)} with no text set ({element}).",
+                        contentPackage: element.ContentPackage);
                }
                else
                {
@@ -49,13 +49,15 @@ namespace Barotrauma
            {
                DebugConsole.ThrowError(
                    $"Error in {nameof(EventObjectiveAction)} in the event \"{parentEvent.Prefab.Identifier}\""+
-                    $" - {nameof(TextTag)} will do nothing unless the action triggers a message box or a video.");
+                    $" - {nameof(TextTag)} will do nothing unless the action triggers a message box or a video.",
+                    contentPackage: element.ContentPackage);
            }
            if (element.GetChildElement("Replace") != null)
            {
                DebugConsole.ThrowError(
                    $"Error in {nameof(EventObjectiveAction)} in the event \"{parentEvent.Prefab.Identifier}\"" +
-                    $" - unrecognized child element \"Replace\".");
+                    $" - unrecognized child element \"Replace\".",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -14,7 +14,8 @@ namespace Barotrauma
        {
            if (TargetTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(GiveExpAction)} without a target tag (the action needs to know whose skill to check).");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(GiveExpAction)} without a target tag (the action needs to know whose skill to check).",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -17,7 +17,8 @@ namespace Barotrauma
        {
            if (TargetTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(GiveSkillExpAction)} without a target tag (the action needs to know whose skill to check).");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(GiveSkillExpAction)} without a target tag (the action needs to know whose skill to check).",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -37,11 +37,13 @@ namespace Barotrauma
        {
            if (MissionIdentifier.IsEmpty && MissionTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": neither MissionIdentifier or MissionTag has been configured.");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": neither MissionIdentifier or MissionTag has been configured.",
+                    contentPackage: element.ContentPackage);
            }
            if (!MissionIdentifier.IsEmpty && !MissionTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": both MissionIdentifier or MissionTag have been configured. The tag will be ignored.");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": both MissionIdentifier or MissionTag have been configured. The tag will be ignored.",
+                    contentPackage: element.ContentPackage);
            }
            LocationTypes = element.GetAttributeIdentifierArray("locationtype", Array.Empty<Identifier>()).ToImmutableArray();
            random = new MTRandom(parentEvent.RandomSeed);
@@ -103,11 +105,13 @@ namespace Barotrauma
                {
                    if (!MissionIdentifier.IsEmpty)
                    {
-                        unlockedMission = unlockLocation.UnlockMissionByIdentifier(MissionIdentifier);
+                        unlockedMission = unlockLocation.UnlockMissionByIdentifier(MissionIdentifier, 
+                            invokingContentPackage: ParentEvent.Prefab.ContentPackage);
                    }
                    else if (!MissionTag.IsEmpty)
                    {
-                        unlockedMission = unlockLocation.UnlockMissionByTag(MissionTag, random);
+                        unlockedMission = unlockLocation.UnlockMissionByTag(MissionTag, random, 
+                            invokingContentPackage: ParentEvent.Prefab.ContentPackage);
                    }
                    if (campaign is MultiPlayerCampaign mpCampaign)
                    {
@@ -139,7 +143,8 @@ namespace Barotrauma
                }
                else
                {
-                    DebugConsole.AddWarning($"Failed to find a suitable location to unlock the mission \"{missionDebugId}\" (LocationType: {string.Join(", ", LocationTypes)}, MinLocationDistance: {MinLocationDistance}, UnlockFurtherOnMap: {UnlockFurtherOnMap})");
+                    DebugConsole.AddWarning($"Failed to find a suitable location to unlock the mission \"{missionDebugId}\" (LocationType: {string.Join(", ", LocationTypes)}, MinLocationDistance: {MinLocationDistance}, UnlockFurtherOnMap: {UnlockFurtherOnMap})",
+                        ParentEvent.Prefab.ContentPackage);
                }
            }
            isFinished = true;
@@ -24,7 +24,8 @@ namespace Barotrauma
            State = element.GetAttributeInt("value", State);
            if (MissionIdentifier.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": MissionIdentifier has not been configured.");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": MissionIdentifier has not been configured.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -43,7 +43,8 @@ namespace Barotrauma
                        var faction = campaign.Factions.Find(f => f.Prefab.Identifier == Faction);
                        if (faction == null)
                        {
-                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a faction with the identifier \"{Faction}\".");
+                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a faction with the identifier \"{Faction}\".",
+                                contentPackage: ParentEvent?.Prefab?.ContentPackage);
                        }
                        else
                        {
@@ -55,7 +56,8 @@ namespace Barotrauma
                        var secondaryFaction = campaign.Factions.Find(f => f.Prefab.Identifier == SecondaryFaction);
                        if (secondaryFaction == null)
                        {
-                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a faction with the identifier \"{SecondaryFaction}\".");
+                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a faction with the identifier \"{SecondaryFaction}\".",
+                                contentPackage: ParentEvent.Prefab.ContentPackage);
                        }
                        else
                        {
@@ -67,7 +69,8 @@ namespace Barotrauma
                        var locationType = LocationType.Prefabs.Find(lt => lt.Identifier == Type);
                        if (locationType == null)
                        {
-                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a location type with the identifier \"{Type}\".");
+                            DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a location type with the identifier \"{Type}\".",
+                                contentPackage: ParentEvent.Prefab.ContentPackage);
                        }
                        else if (!location.LocationTypeChangesBlocked)
                        {                           
@@ -30,7 +30,8 @@ namespace Barotrauma
            var enums = Enum.GetValues(typeof(CharacterTeamType)).Cast<CharacterTeamType>();
            if (!enums.Contains(TeamID))
            {
-                DebugConsole.ThrowError($"Error in {nameof(NPCChangeTeamAction)} in the event {ParentEvent.Prefab.Identifier}. \"{TeamID}\" is not a valid Team ID. Valid values are {string.Join(',', Enum.GetNames(typeof(CharacterTeamType)))}.");
+                DebugConsole.ThrowError($"Error in {nameof(NPCChangeTeamAction)} in the event {ParentEvent.Prefab.Identifier}. \"{TeamID}\" is not a valid Team ID. Valid values are {string.Join(',', Enum.GetNames(typeof(CharacterTeamType)))}.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -13,11 +13,13 @@ namespace Barotrauma
        { 
            if (Chance >= 1.0f)
            {
-                DebugConsole.ThrowError($"Incorrectly configured RNG Action in event \"{parentEvent.Prefab.Identifier}\". Probability is 1.0 (100%) or more, the action will always succeed.");
+                DebugConsole.ThrowError($"Incorrectly configured RNG Action in event \"{parentEvent.Prefab.Identifier}\". Probability is 1.0 (100%) or more, the action will always succeed.",
+                    contentPackage: element.ContentPackage);
            }
            else if (Chance <= 0.0f)
            {
-                DebugConsole.ThrowError($"Incorrectly configured RNG Action in event \"{parentEvent.Prefab.Identifier}\". Probability is 0 or less, the action will never succeed.");
+                DebugConsole.ThrowError($"Incorrectly configured RNG Action in event \"{parentEvent.Prefab.Identifier}\". Probability is 0 or less, the action will never succeed.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -54,7 +54,8 @@ namespace Barotrauma
                            }
                            else
                            {
-                                DebugConsole.ThrowError($"Faction with the identifier \"{Identifier}\" was not found.");
+                                DebugConsole.ThrowError($"Faction with the identifier \"{Identifier}\" was not found.",
+                                    contentPackage: ParentEvent.Prefab.ContentPackage);
                            }

                            break;
@@ -66,7 +67,8 @@ namespace Barotrauma
                        }
                    default:
                        {
-                            DebugConsole.ThrowError("ReputationAction requires a \"TargetType\" but none were specified.");
+                            DebugConsole.ThrowError("ReputationAction requires a \"TargetType\" but none were specified.",
+                                contentPackage: ParentEvent.Prefab.ContentPackage);
                            break;
                        }
                }
@@ -14,7 +14,8 @@ namespace Barotrauma
            }
            else
            {
-                DebugConsole.ThrowError($"Cannot use the action {nameof(SetTraitorEventStateAction)} in the event \"{parentEvent.Prefab.Identifier}\" because it's not a traitor event.");
+                DebugConsole.ThrowError($"Cannot use the action {nameof(SetTraitorEventStateAction)} in the event \"{parentEvent.Prefab.Identifier}\" because it's not a traitor event.",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -23,7 +23,8 @@ namespace Barotrauma
        { 
            if (TargetTag.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": SkillCheckAction without a target tag (the action needs to know whose skill to check).");
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": SkillCheckAction without a target tag (the action needs to know whose skill to check).",
+                    contentPackage: element.ContentPackage);
            }
        }

@@ -105,7 +105,8 @@ namespace Barotrauma
            {
                DebugConsole.ThrowError(
                    $"Error in even \"{(parentEvent.Prefab?.Identifier.ToString() ?? "unknown")}\". " +
-                    $"The attribute \"submarinetype\" is not valid in {nameof(SpawnAction)}. Did you mean {nameof(SpawnLocation)}?");
+                    $"The attribute \"submarinetype\" is not valid in {nameof(SpawnAction)}. Did you mean {nameof(SpawnLocation)}?",
+                    contentPackage: ParentEvent.Prefab.ContentPackage);
            }
        }

@@ -233,7 +234,8 @@ namespace Barotrauma
            {
                if (MapEntityPrefab.FindByIdentifier(ItemIdentifier) is not ItemPrefab itemPrefab)
                {
-                    DebugConsole.ThrowError("Error in SpawnAction (item prefab \"" + ItemIdentifier + "\" not found)");
+                    DebugConsole.ThrowError("Error in SpawnAction (item prefab \"" + ItemIdentifier + "\" not found)",
+                        contentPackage: ParentEvent.Prefab.ContentPackage);
                }
                else
                {
@@ -256,7 +258,8 @@ namespace Barotrauma

                        if (spawnInventory == null)
                        {
-                            DebugConsole.ThrowError($"Could not spawn \"{ItemIdentifier}\" in target inventory \"{TargetInventory}\" - matching target not found.");
+                            DebugConsole.ThrowError($"Could not spawn \"{ItemIdentifier}\" in target inventory \"{TargetInventory}\" - matching target not found.",
+                                contentPackage: ParentEvent.Prefab.ContentPackage);
                        }
                    }

@@ -36,7 +36,19 @@ namespace Barotrauma

        private bool isFinished = false;

-        private bool targetNotFound = false;
+        /// <summary>
+        /// If the action tags some entities directly (not trying to find targets on the fly), 
+        /// we may be able to determine that targets can not be found even if we'd recheck
+        /// </summary>
+        private bool cantFindTargets = false;
+
+        /// <summary>
+        /// If the TagAction adds a target predicate (a criteria that keeps finding targets on the fly),
+        /// we must keep checking if targets have been found to determine if the action can continue or not
+        /// </summary>
+        private bool mustRecheckTargets = false;
+
+        private bool taggingDone = false;

        public TagAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element)
        {
@@ -198,6 +210,7 @@ namespace Barotrauma
            else
            {
                ParentEvent.AddTargetPredicate(tag, predicate);
+                mustRecheckTargets = true;
            }
        }

@@ -205,7 +218,7 @@ namespace Barotrauma
        {
            if (entities.None())
            {
-                targetNotFound = true;
+                cantFindTargets = true;
                return;
            }
            if (ChoosePercentage > 0.0f)
@@ -230,7 +243,7 @@ namespace Barotrauma
        {
            if (entities.None())
            {
-                targetNotFound = true;
+                cantFindTargets = true;
                return;
            }

@@ -250,7 +263,7 @@ namespace Barotrauma
        {
            if (entities.None()) 
            {
-                targetNotFound = true;
+                cantFindTargets = true;
                return; 
            }
            ParentEvent.AddTarget(tag, entities.GetRandomUnsynced());
@@ -260,26 +273,30 @@ namespace Barotrauma
        
        public override void Update(float deltaTime)
        {
-            if (isFinished || targetNotFound) { return; }
+            if (isFinished || cantFindTargets) { return; }

-            string[] criteriaSplit = Criteria.Split(';');
-
-            targetNotFound = false;
-            foreach (string entry in criteriaSplit)
+            if (!taggingDone)
            {
-                string[] kvp = entry.Split(':');
-                Identifier key = kvp[0].Trim().ToIdentifier();
-                Identifier value = kvp.Length > 1 ? kvp[1].Trim().ToIdentifier() : Identifier.Empty;
-                if (Taggers.TryGetValue(key, out Action<Identifier> tagger))
+                cantFindTargets = false;
+                string[] criteriaSplit = Criteria.Split(';');
+                foreach (string entry in criteriaSplit)
                {
-                    tagger(value);
-                }
-                else
-                {
-                    string errorMessage = $"Error in TagAction (event \"{ParentEvent.Prefab.Identifier}\") - unrecognized target criteria \"{key}\".";
-                    DebugConsole.ThrowError(errorMessage);
-                    GameAnalyticsManager.AddErrorEventOnce($"TagAction.Update:InvalidCriteria_{ParentEvent.Prefab.Identifier}_{key}", GameAnalyticsManager.ErrorSeverity.Error, errorMessage);
+                    string[] kvp = entry.Split(':');
+                    Identifier key = kvp[0].Trim().ToIdentifier();
+                    Identifier value = kvp.Length > 1 ? kvp[1].Trim().ToIdentifier() : Identifier.Empty;
+                    if (Taggers.TryGetValue(key, out Action<Identifier> tagger))
+                    {
+                        tagger(value);
+                    }
+                    else
+                    {
+                        string errorMessage = $"Error in TagAction (event \"{ParentEvent.Prefab.Identifier}\") - unrecognized target criteria \"{key}\".";
+                        DebugConsole.ThrowError(errorMessage, 
+                            contentPackage: ParentEvent.Prefab?.ContentPackage);
+                        GameAnalyticsManager.AddErrorEventOnce($"TagAction.Update:InvalidCriteria_{ParentEvent.Prefab.Identifier}_{key}", GameAnalyticsManager.ErrorSeverity.Error, errorMessage);
+                    }
                }
+                taggingDone = true;
            }

            if (ContinueIfNoTargetsFound)
@@ -288,7 +305,14 @@ namespace Barotrauma
            }
            else
            {
-                isFinished = !targetNotFound;
+                if (mustRecheckTargets)
+                {
+                    isFinished = ParentEvent.GetTargets(Tag).Any();
+                }
+                else
+                {
+                    isFinished = !cantFindTargets;
+                }
            }
        }

@@ -36,7 +36,8 @@
                    var eventPrefab = EventSet.GetEventPrefab(Identifier);
                    if (eventPrefab == null)
                    {
-                        DebugConsole.ThrowError($"Error in TriggerEventAction - could not find an event with the identifier {Identifier}.");
+                        DebugConsole.ThrowError($"Error in TriggerEventAction - could not find an event with the identifier {Identifier}.",
+                            contentPackage: ParentEvent.Prefab.ContentPackage);
                    }
                    else
                    {
@@ -14,7 +14,8 @@ partial class TutorialHighlightAction : EventAction
    {
        if (GameMain.NetworkMember != null)
        {
-            DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(TutorialHighlightAction)} is not supported in multiplayer.");
+            DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\": {nameof(TutorialHighlightAction)} is not supported in multiplayer.",
+                contentPackage: element.ContentPackage);
        }
    }

@@ -28,7 +28,8 @@ namespace Barotrauma
        { 
            if (ItemTag.IsEmpty && ItemIdentifier.IsEmpty)
            {
-                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {nameof(WaitForItemFabricatedAction)} does't define either a tag or an identifier of the item to check.");
+                DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\". {nameof(WaitForItemFabricatedAction)} does't define either a tag or an identifier of the item to check.", 
+                    contentPackage: element.ContentPackage);
            }
            foreach (var item in Item.ItemList)
            {