Merge remote-tracking branch 'origin/master' into dev

# Conflicts: # Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs # Barotrauma/BarotraumaClient/ClientSource/Events/EventManager.cs # Barotrauma/BarotraumaClient/ClientSource/GUI/CrewManagement.cs # Barotrauma/BarotraumaClient/ClientSource/GUI/MedicalClinicUI.cs # Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs # Barotrauma/BarotraumaClient/ClientSource/GUI/SubmarineSelection.cs # Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/CampaignMode.cs # Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs # Barotrauma/BarotraumaClient/ClientSource/GameSession/RoundSummary.cs # Barotrauma/BarotraumaClient/ClientSource/Items/Components/Door.cs # Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs # Barotrauma/BarotraumaClient/ClientSource/Items/Components/Projectile.cs # Barotrauma/BarotraumaClient/ClientSource/Map/Lights/ConvexHull.cs # Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightManager.cs # Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightSource.cs # Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs # Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs # Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs # Barotrauma/BarotraumaClient/ClientSource/Networking/Voting.cs # Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs # Barotrauma/BarotraumaClient/LinuxClient.csproj # Barotrauma/BarotraumaClient/MacClient.csproj # Barotrauma/BarotraumaClient/WindowsClient.csproj # Barotrauma/BarotraumaServer/LinuxServer.csproj # Barotrauma/BarotraumaServer/MacServer.csproj # Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs # Barotrauma/BarotraumaServer/ServerSource/GameSession/MedicalClinic.cs # Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs # Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs # Barotrauma/BarotraumaServer/ServerSource/Utils/DoSProtection.cs # Barotrauma/BarotraumaServer/WindowsServer.csproj # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveContainItem.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveIdle.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/AI/ShipCommand/ShipIssueWorkerOperateWeapons.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs # Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackageManager.cs # Barotrauma/BarotraumaShared/SharedSource/Enums.cs # Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MissionAction.cs # Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCChangeTeamAction.cs # Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCFollowAction.cs # Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCWaitAction.cs # Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs # Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs # Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs # Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs # Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs # Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs # Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs # Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs # Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs # Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerator.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs # Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineBody.cs # Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs # Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs # Barotrauma/BarotraumaShared/SharedSource/StatusEffects/PropertyConditional.cs # Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs # Barotrauma/BarotraumaShared/changelog.txt
2023-06-15 16:55:39 +03:00
parent 9470edead3 f95be0511c
commit 94f5a93a0c
238 changed files with 5395 additions and 3045 deletions
@@ -49,7 +49,7 @@ namespace Barotrauma
                            var limb = character.AnimController.GetLimb(LimbType);
                            if (Strength > 0.0f)
                            {
-                                character.CharacterHealth.ApplyAffliction(limb, afflictionPrefab.Instantiate(Strength));
+                                character.CharacterHealth.ApplyAffliction(limb, afflictionPrefab.Instantiate(Strength), ignoreUnkillability: true);
                            }
                            else if (Strength < 0.0f)
                            {
@@ -60,7 +60,7 @@ namespace Barotrauma
                        {
                            if (Strength > 0.0f)
                            {
-                                character.CharacterHealth.ApplyAffliction(null, afflictionPrefab.Instantiate(Strength));
+                                character.CharacterHealth.ApplyAffliction(null, afflictionPrefab.Instantiate(Strength), ignoreUnkillability: true);
                            }
                            else if (Strength < 0.0f)
                            {
@@ -3,7 +3,7 @@ using System.Collections.Generic;

 namespace Barotrauma
 {
-    class CheckSelectedItemAction : BinaryOptionAction
+    class CheckSelectedAction : BinaryOptionAction
    {
        public enum SelectedItemType { Primary, Secondary, Any };

@@ -16,7 +16,7 @@ namespace Barotrauma
        [Serialize(SelectedItemType.Any, IsPropertySaveable.Yes)]
        public SelectedItemType ItemType { get; set; }

-        public CheckSelectedItemAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) { }
+        public CheckSelectedAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) { }

        protected override bool? DetermineSuccess()
        {
@@ -34,7 +34,7 @@ namespace Barotrauma
            }
            if (character == null)
            {
-                DebugConsole.LogError($"CheckSelectedItemAction error: {GetEventName()} uses a CheckSelectedItemAction but no valid character was found for tag \"{CharacterTag}\"! This will cause the check to automatically fail.");
+                Error($"{nameof(CheckSelectedAction)} error: {GetEventName()} uses a {nameof(CheckSelectedAction)} but no valid character was found for tag \"{CharacterTag}\"! This will cause the check to automatically fail.");
                return false;
            }
            if (!TargetTag.IsEmpty)
@@ -42,11 +42,16 @@ namespace Barotrauma
                IEnumerable<Entity> targets = ParentEvent.GetTargets(TargetTag);
                if (targets.None())
                {
-                    DebugConsole.LogError($"CheckSelectedItemAction error: {GetEventName()} uses a CheckSelectedItemAction but no valid targets were found for tag \"{TargetTag}\"! This will cause the check to automatically fail.");
+                    Error($"{nameof(CheckSelectedAction)} error: {GetEventName()} uses a {nameof(CheckSelectedAction)} but no valid targets were found for tag \"{TargetTag}\"! This will cause the check to automatically fail.");
                    return false;
                }
                foreach (var target in targets)
                {
+                    if (target is Character targetCharacter)
+                    {
+                        if (ItemType == SelectedItemType.Any && character.SelectedCharacter == targetCharacter) { return true; }
+                        continue;
+                    }
                    if (target is not Item targetItem)
                    {
                        continue;
@@ -79,6 +84,18 @@ namespace Barotrauma
                    _ => false
                };
            }
+#if DEBUG
+            void Error(string errorMsg)
+            {
+                DebugConsole.ThrowError(errorMsg);
+            }
+#else
+
+            void Error(string errorMsg)
+            {
+                DebugConsole.LogError(errorMsg);
+            }
+#endif
        }

        private string GetEventName()
@@ -1,94 +0,0 @@
-using Barotrauma.Extensions;
-using System.Collections.Generic;
-
-namespace Barotrauma
-{
-    class CheckSelectedAction : BinaryOptionAction
-    {
-        public enum SelectedItemType { Primary, Secondary, Any };
-
-        [Serialize("", IsPropertySaveable.Yes)]
-        public Identifier CharacterTag { get; set; }
-
-        [Serialize("", IsPropertySaveable.Yes)]
-        public Identifier TargetTag { get; set; }
-
-        [Serialize(SelectedItemType.Any, IsPropertySaveable.Yes)]
-        public SelectedItemType ItemType { get; set; }
-
-        public CheckSelectedAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) { }
-
-        protected override bool? DetermineSuccess()
-        {
-            Character character = null;
-            if (!CharacterTag.IsEmpty)
-            {
-                foreach (var t in ParentEvent.GetTargets(CharacterTag))
-                {
-                    if (t is Character c)
-                    {
-                        character = c;
-                        break;
-                    }
-                }
-            }
-            if (character == null)
-            {
-                DebugConsole.LogError($"CheckSelectedItemAction error: {GetEventName()} uses a CheckSelectedItemAction but no valid character was found for tag \"{CharacterTag}\"! This will cause the check to automatically fail.");
-                return false;
-            }
-            if (!TargetTag.IsEmpty)
-            {
-                IEnumerable<Entity> targets = ParentEvent.GetTargets(TargetTag);
-                if (targets.None())
-                {
-                    DebugConsole.LogError($"CheckSelectedItemAction error: {GetEventName()} uses a CheckSelectedItemAction but no valid targets were found for tag \"{TargetTag}\"! This will cause the check to automatically fail.");
-                    return false;
-                }
-                foreach (var target in targets)
-                {
-                    if (target is Character targetCharacter)
-                    {
-                        if (ItemType == SelectedItemType.Any && character.SelectedCharacter == targetCharacter) { return true; }
-                        continue;
-                    }
-                    if (target is not Item targetItem)
-                    {
-                        continue;
-                    }
-                    if (IsSelected(targetItem))
-                    {
-                        return true;
-                    }
-                }
-                return false;
-
-                bool IsSelected(Item item)
-                {
-                    return ItemType switch
-                    {
-                        SelectedItemType.Any => character.IsAnySelectedItem(item),
-                        SelectedItemType.Primary => character.SelectedItem == item,
-                        SelectedItemType.Secondary => character.SelectedSecondaryItem == item,
-                        _ => false
-                    };
-                }
-            }
-            else
-            {
-                return ItemType switch
-                {
-                    SelectedItemType.Any => !character.HasSelectedAnyItem,
-                    SelectedItemType.Primary => character.SelectedItem == null,
-                    SelectedItemType.Secondary => character.SelectedSecondaryItem == null,
-                    _ => false
-                };
-            }
-        }
-
-        private string GetEventName()
-        {
-            return ParentEvent?.Prefab?.Identifier is { IsEmpty: false } identifier ? $"the event \"{identifier}\"" : "an unknown event";
-        }
-    }
-}
@@ -60,18 +60,42 @@ namespace Barotrauma
        {
            if (isFinished) { return; }

+            Identifier missionDebugId = (MissionIdentifier.IsEmpty ? MissionTag : MissionIdentifier);
+
            if (GameMain.GameSession.GameMode is CampaignMode campaign)
            {
                Mission unlockedMission = null;
-                var unlockLocation = FindUnlockLocation(MinLocationDistance, UnlockFurtherOnMap, LocationTypes);
+                var unlockLocation = FindUnlockLocation(MinLocationDistance, UnlockFurtherOnMap, LocationTypes, mustAllowLocationTypeChanges: false);
+
+                if (unlockLocation == null && UnlockFurtherOnMap)
+                {
+                    DebugConsole.NewMessage($"Failed to find a suitable location to unlock the mission \"{missionDebugId}\" further on the map. Attempting to find a location earlier on the map...");
+                    unlockLocation = FindUnlockLocation(MinLocationDistance, unlockFurtherOnMap: false, LocationTypes, mustAllowLocationTypeChanges: false);
+                }
+
                if (unlockLocation == null && CreateLocationIfNotFound)
                {
+                    DebugConsole.NewMessage($"Failed to find a suitable location to unlock the mission \"{missionDebugId}\". Attempting to change the type of an empty location to create a suitable location...");
                    //find an empty location at least 3 steps away, further on the map
-                    var emptyLocation = FindUnlockLocation(Math.Max(MinLocationDistance, 3), unlockFurtherOnMap: true, "none".ToIdentifier().ToEnumerable());
+                    var emptyLocation = FindUnlockLocation(Math.Max(MinLocationDistance, 3), unlockFurtherOnMap: true, "none".ToIdentifier().ToEnumerable(), 
+                        mustAllowLocationTypeChanges: true,
+                        requireCorrectFaction: false);
+                    if (emptyLocation == null)
+                    {
+                        DebugConsole.NewMessage($"Failed to find a suitable empty location further on the map. Attempting to find a location earlier on the map...");
+                        emptyLocation = FindUnlockLocation(Math.Max(MinLocationDistance, 3), unlockFurtherOnMap: false, "none".ToIdentifier().ToEnumerable(), 
+                            mustAllowLocationTypeChanges: true,
+                            requireCorrectFaction: false);
+                    }
                    if (emptyLocation != null)
                    {
+                        System.Diagnostics.Debug.Assert(!emptyLocation.LocationTypeChangesBlocked);
                        emptyLocation.ChangeType(campaign, LocationType.Prefabs[LocationTypes[0]]);
                        unlockLocation = emptyLocation;
+                        if (!RequiredFaction.IsEmpty)
+                        {
+                            emptyLocation.Faction = campaign.Factions.Find(f => f.Prefab.Identifier == RequiredFaction);
+                        }
                    }
                }

@@ -115,13 +139,13 @@ namespace Barotrauma
                }
                else
                {
-                    DebugConsole.AddWarning($"Failed to find a suitable location to unlock a mission in (LocationType: {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})");
                }
            }
            isFinished = true;
        }

-        private Location FindUnlockLocation(int minDistance, bool unlockFurtherOnMap, IEnumerable<Identifier> locationTypes)
+        private Location FindUnlockLocation(int minDistance, bool unlockFurtherOnMap, IEnumerable<Identifier> locationTypes, bool mustAllowLocationTypeChanges, bool requireCorrectFaction = true)
        {
            var campaign = GameMain.GameSession.GameMode as CampaignMode;
            if (LocationTypes.Length == 0 && minDistance <= 1)
@@ -140,7 +164,7 @@ namespace Barotrauma
                foreach (var location in currentLocations)
                {
                    checkedLocations.Add(location);
-                    if (IsLocationValid(currentLocation, location, unlockFurtherOnMap, distance, minDistance, locationTypes)) 
+                    if (IsLocationValid(currentLocation, location, unlockFurtherOnMap, distance, minDistance, locationTypes, mustAllowLocationTypeChanges, requireCorrectFaction)) 
                    {
                        return location;
                    }
@@ -160,9 +184,13 @@ namespace Barotrauma
            return null;
        }

-        private bool IsLocationValid(Location currLocation, Location location, bool unlockFurtherOnMap, int distance, int minDistance, IEnumerable<Identifier> locationTypes)
+        private bool IsLocationValid(Location currLocation, Location location, bool unlockFurtherOnMap, int distance, int minDistance, IEnumerable<Identifier> locationTypes, bool mustAllowLocationTypeChanges, bool requireCorrectFaction)
        {
-            if (!RequiredFaction.IsEmpty)
+            if (mustAllowLocationTypeChanges && location.LocationTypeChangesBlocked)
+            {
+                return false;
+            }
+            if (requireCorrectFaction && !RequiredFaction.IsEmpty)
            {
                if (location.Faction?.Prefab.Identifier != RequiredFaction &&
                    location.SecondaryFaction?.Prefab.Identifier != RequiredFaction)
@@ -15,6 +15,8 @@ namespace Barotrauma
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool AddToCrew { get; set; }

+
+
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool RemoveFromCrew { get; set; }

@@ -38,6 +40,8 @@ namespace Barotrauma
        {
            if (isFinished) { return; }

+            bool isPlayerTeam = TeamID == CharacterTeamType.Team1 || TeamID == CharacterTeamType.Team2;
+
            affectedNpcs = ParentEvent.GetTargets(NPCTag).Where(c => c is Character).Select(c => c as Character).ToList();
            foreach (var npc in affectedNpcs)
            {
@@ -49,9 +53,13 @@ namespace Barotrauma
                    if (idCard != null)
                    {
                        idCard.TeamID = TeamID;
+                        if (isPlayerTeam)
+                        {
+                            idCard.SubmarineSpecificID = 0;
+                        }
                    }
                }
-                if (AddToCrew && (TeamID == CharacterTeamType.Team1 || TeamID == CharacterTeamType.Team2))
+                if (AddToCrew && isPlayerTeam)
                {
                    npc.Info.StartItemsGiven = true;
                    GameMain.GameSession.CrewManager.AddCharacter(npc);
@@ -46,7 +46,7 @@ namespace Barotrauma
                    var newObjective = new AIObjectiveGoTo(target, npc, humanAiController.ObjectiveManager, repeat: true)
                    {
                        OverridePriority = 100.0f,
-                        IsFollowOrderObjective = true
+                        IsFollowOrder = true
                    };
                    humanAiController.ObjectiveManager.AddObjective(newObjective);
                    humanAiController.ObjectiveManager.WaitTimer = 0.0f;
@@ -35,7 +35,9 @@ namespace Barotrauma
                        AIObjectiveGoTo.GetTargetHull(npc) as ISpatialEntity ?? npc, npc, humanAiController.ObjectiveManager, repeat: true)
                    {
                        OverridePriority = 100.0f,
-                        SourceEventAction = this
+                        SourceEventAction = this,
+                        IsWaitOrder = true,
+                        CloseEnough = 100
                    };
                    humanAiController.ObjectiveManager.AddObjective(gotoObjective);
                    humanAiController.ObjectiveManager.WaitTimer = 0.0f;
@@ -225,7 +225,7 @@ namespace Barotrauma
                }                
            }

-            while (QueuedEventsForNextRound.Count > 0 && QueuedEventsForNextRound.Dequeue() is Identifier id)
+            while (QueuedEventsForNextRound.TryDequeue(out var id))
            {
                var eventPrefab = EventSet.GetEventPrefab(id);
                if (eventPrefab == null)
@@ -879,9 +879,9 @@ namespace Barotrauma
            monsterStrength = 0;
            foreach (Character character in Character.CharacterList)
            {
-                if (character.IsIncapacitated || !character.Enabled || character.IsPet) { continue; }
+                if (character.IsIncapacitated || character.IsArrested || !character.Enabled || character.IsPet) { continue; }

-                if (character.AIController is EnemyAIController enemyAI) 
+                if (character.AIController is EnemyAIController enemyAI)
                {
                    if (!enemyAI.AIParams.StayInAbyss)
                    {
@@ -889,7 +889,7 @@ namespace Barotrauma
                        monsterStrength += enemyAI.CombatStrength;
                    }

-                    if (character.CurrentHull?.Submarine?.Info != null && 
+                    if (character.CurrentHull?.Submarine?.Info != null &&
                        (character.CurrentHull.Submarine == Submarine.MainSub || Submarine.MainSub.DockedTo.Contains(character.CurrentHull.Submarine)) &&
                        character.CurrentHull.Submarine.Info.Type == SubmarineType.Player)
                    {
@@ -902,10 +902,11 @@ namespace Barotrauma
                        // -> One Crawler adds 0.02, a Mudraptor 0.042, a Hammerhead 0.1, and a Moloch 0.25.
                        enemyDanger += enemyAI.CombatStrength / 5000.0f;
                    }
-                }     
+                }
                else if (character.AIController is HumanAIController humanAi && !character.IsOnFriendlyTeam(CharacterTeamType.Team1))
                {
-                    if (character.Submarine != null && 
+                    if (character.Submarine != null &&
+                        character.Submarine.PhysicsBody is { BodyType: BodyType.Dynamic } &&
                        Vector2.DistanceSquared(character.Submarine.WorldPosition, Submarine.MainSub.WorldPosition) < Sonar.DefaultSonarRange * Sonar.DefaultSonarRange)
                    {
                        //we have no easy way to define the strength of a human enemy (depends more on the sub and it's state than the character),
@@ -91,7 +91,7 @@ namespace Barotrauma
            if (IsClient) { return; }
            if (!swarmSpawned && level.CheckBeaconActive())
            {
-                List<Submarine> connectedSubs = level.BeaconStation.GetConnectedSubs();
+                IEnumerable<Submarine> connectedSubs = level.BeaconStation.GetConnectedSubs();
                foreach (Item item in Item.ItemList)
                {
                    if (!connectedSubs.Contains(item.Submarine) || item.Submarine?.Info is { IsPlayer: true  }) { continue; }
@@ -320,7 +320,7 @@ namespace Barotrauma
        private static bool IsItemDelivered(Item item)
        {
            if (item.Removed || item.Condition <= 0.0f || Submarine.MainSub == null) { return false; }
-            var submarine = item.Submarine ?? item.GetRootContainer()?.Submarine;
+            var submarine = item.Submarine ?? item.RootContainer?.Submarine;
            return submarine == Submarine.MainSub || Submarine.MainSub.GetConnectedSubs().Contains(submarine);
        }
    }
@@ -1,3 +1,4 @@
+using Barotrauma.Extensions;
 using System.Collections.Generic;

 namespace Barotrauma
@@ -401,7 +401,7 @@ namespace Barotrauma
            int reward = GetReward(sub);
            IEnumerable<Character> crewCharacters = GameSession.GetSessionCrewCharacters(CharacterType.Both);
            var missionMoneyGainMultiplier = new AbilityMissionMoneyGainMultiplier(this, 1f);
-            crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnGainMissionMoney, missionMoneyGainMultiplier));
+            CharacterTalent.CheckTalentsForCrew(crewCharacters, AbilityEffectType.OnGainMissionMoney, missionMoneyGainMultiplier);
            crewCharacters.ForEach(c => missionMoneyGainMultiplier.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
            finalReward = (int)(reward * missionMoneyGainMultiplier.Value);
        }
@@ -19,6 +19,8 @@ namespace Barotrauma
        private float missionDifficulty;
        private int alternateReward;

+        private Identifier factionIdentifier;
+
        private Submarine enemySub;
        private readonly List<Character> characters = new List<Character>();
        private readonly Dictionary<Character, List<Item>> characterItems = new Dictionary<Character, List<Item>>();
@@ -140,8 +142,8 @@ namespace Barotrauma
            missionDifficulty = level?.Difficulty ?? 0;

            XElement submarineConfig = GetRandomDifficultyModifiedElement(submarineTypeConfig, missionDifficulty, ShipRandomnessModifier);
-
            alternateReward = submarineConfig.GetAttributeInt("alternatereward", Reward);
+            factionIdentifier = submarineConfig.GetAttributeIdentifier("faction", Identifier.Empty);

            string rewardText = $"‖color:gui.orange‖{string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0:N0}", alternateReward)}‖end‖";
            if (descriptionWithoutReward != null) { description = descriptionWithoutReward.Replace("[reward]", rewardText); }
@@ -170,11 +172,11 @@ namespace Barotrauma
            submarineInfo = new SubmarineInfo(contentFile.Path.Value);
        }

-        private float GetDifficultyModifiedValue(float preferredDifficulty, float levelDifficulty, float randomnessModifier, Random rand)
+        private static float GetDifficultyModifiedValue(float preferredDifficulty, float levelDifficulty, float randomnessModifier, Random rand)
        {
            return Math.Abs(levelDifficulty - preferredDifficulty + MathHelper.Lerp(-randomnessModifier, randomnessModifier, (float)rand.NextDouble()));
        }
-        private int GetDifficultyModifiedAmount(int minAmount, int maxAmount, float levelDifficulty, Random rand)
+        private static int GetDifficultyModifiedAmount(int minAmount, int maxAmount, float levelDifficulty, Random rand)
        {
            return Math.Max((int)Math.Round(minAmount + (maxAmount - minAmount) * (levelDifficulty + MathHelper.Lerp(-RandomnessModifier, RandomnessModifier, (float)rand.NextDouble())) / MaxDifficulty), minAmount);
        }
@@ -254,6 +256,7 @@ namespace Barotrauma
                }
            }
            enemySub.ImmuneToBallastFlora = true;
+            enemySub.EnableFactionSpecificEntities(factionIdentifier);
        }

        private void InitPirates()
@@ -444,7 +447,7 @@ namespace Barotrauma

        private bool CheckWinState() => !IsClient && characters.All(m => DeadOrCaptured(m));

-        private bool DeadOrCaptured(Character character)
+        private static bool DeadOrCaptured(Character character)
        {
            return character == null || character.Removed || character.Submarine == null || (character.LockHands && character.Submarine == Submarine.MainSub) || character.IsIncapacitated;
        }
@@ -16,8 +16,8 @@ namespace Barotrauma
            public Item Item;

            /// <summary>
-            /// Note that the integer values matter here: the state of the target can't go back to a smaller value,
-            /// and a larger or equal value than the <see href="RequiredRetrievalState">RequiredRetrievalState</see> means the item counts as retrieved
+            /// Note that the integer values matter here:
+            /// a larger or equal value than the <see href="RequiredRetrievalState">RequiredRetrievalState</see> means the item counts as retrieved
            /// (if the item needs to be picked up to be considered retrieved, it's also considered retrieved if it's in the sub)
            /// </summary>
            public enum RetrievalState
@@ -167,6 +167,8 @@ namespace Barotrauma

        private readonly List<Target> targets = new List<Target>();

+        public bool AnyTargetNeedsToBeRetrievedToSub => targets.Any(t => t.RequiredRetrievalState == Target.RetrievalState.RetrievedToSub && !t.Retrieved);
+
        public override IEnumerable<(LocalizedString Label, Vector2 Position)> SonarLabels
        {
            get
@@ -361,7 +363,7 @@ namespace Barotrauma
            //make body dynamic when picked up
            foreach (var target in targets)
            {
-                var root = target.Item?.GetRootContainer() ?? target.Item;
+                var root = target.Item?.RootContainer ?? target.Item;
                if (root == null) { continue; }
                if (target.Item.ParentInventory != null && target.Item.body != null) { target.Item.body.FarseerBody.BodyType = BodyType.Dynamic; }
            }
@@ -382,23 +384,46 @@ namespace Barotrauma
                switch (target.State)
                {
                    case Target.RetrievalState.None:
-                        if (target.Interacted)
                        {
-                            TrySetRetrievalState(Target.RetrievalState.Interact);
-                        }
-                        var root = target.Item?.GetRootContainer() ?? target.Item;
-                        if (root.ParentInventory?.Owner is Character character && character.TeamID == CharacterTeamType.Team1)
-                        {
-                            TrySetRetrievalState(Target.RetrievalState.PickedUp);
+                            if (target.Interacted)
+                            {
+                                TrySetRetrievalState(Target.RetrievalState.Interact);
+                            }
+                            var root = target.Item?.RootContainer ?? target.Item;
+                            if (root.ParentInventory?.Owner is Character character && character.TeamID == CharacterTeamType.Team1)
+                            {
+                                TrySetRetrievalState(Target.RetrievalState.PickedUp);
+                            }
                        }
+
                        break;
                    case Target.RetrievalState.PickedUp:
-                        Submarine parentSub = target.Item.CurrentHull?.Submarine ?? target.Item.GetRootInventoryOwner()?.Submarine;
-                        if (parentSub != null)
+                    case Target.RetrievalState.RetrievedToSub:
                        {
-                            if (parentSub.Info.Type == SubmarineType.Player || Level.IsLoadedFriendlyOutpost)
+                            Entity rootInventoryOwner = target.Item.GetRootInventoryOwner();
+                            Submarine parentSub = target.Item.CurrentHull?.Submarine ?? rootInventoryOwner?.Submarine;
+
+                            bool inPlayerSub = parentSub != null && parentSub.Info.Type == SubmarineType.Player;
+                            bool inPlayerInventory = false;
+                            bool playerInFriendlySub = false;
+                            if (rootInventoryOwner is Character character && character.TeamID == CharacterTeamType.Team1)
                            {
-                                TrySetRetrievalState(Target.RetrievalState.RetrievedToSub);
+                                inPlayerInventory = true;
+                                if (character.Submarine != null)
+                                {
+                                    playerInFriendlySub =
+                                        character.IsInFriendlySub ||
+                                        (character.Submarine == Level.Loaded?.StartOutpost && Level.IsLoadedFriendlyOutpost && GameMain.GameSession?.Campaign.CurrentLocation is not { IsFactionHostile: true });
+                                }
+                            }
+
+                            if (inPlayerSub || (inPlayerInventory && playerInFriendlySub))
+                            {
+                                TrySetRetrievalState(Target.RetrievalState.RetrievedToSub);                            
+                            }
+                            else
+                            {
+                                target.State = Target.RetrievalState.PickedUp;
                            }
                        }
                        break;
@@ -406,8 +431,8 @@ namespace Barotrauma

                void TrySetRetrievalState(Target.RetrievalState retrievalState)
                {
-                    if (retrievalState < target.State) { return; }
-                    bool wasRetrieved = false;
+                    if (retrievalState < target.State || target.State == retrievalState) { return; }
+                    bool wasRetrieved = target.Retrieved;
                    target.State = retrievalState;
                    //increment the mission state if the target became retrieved
                    if (!wasRetrieved && target.Retrieved) { State = i + 1; }