Faction Test v1.0.1.0

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AIController.cs

@@ -352,21 +352,6 @@ namespace Barotrauma
             }
         }
 
-        public static bool IsOnFriendlyTeam(CharacterTeamType myTeam, CharacterTeamType otherTeam)
-        {
-            if (myTeam == otherTeam) { return true; }
-            return myTeam switch
-            {
-                // NPCs are friendly to the same team and the friendly NPCs
-                CharacterTeamType.None or CharacterTeamType.Team1 or CharacterTeamType.Team2 => otherTeam == CharacterTeamType.FriendlyNPC,
-                // Friendly NPCs are friendly to both player teams
-                CharacterTeamType.FriendlyNPC => otherTeam == CharacterTeamType.Team1 || otherTeam == CharacterTeamType.Team2,
-                _ => true
-            };
-        }
-
-        public static bool IsOnFriendlyTeam(Character me, Character other) => IsOnFriendlyTeam(me.TeamID, other.TeamID);
-
         public void ReequipUnequipped()
         {
             foreach (var item in unequippedItems)
@@ -460,7 +445,7 @@ namespace Barotrauma
             if (EscapeTarget != null)
             {
                 var door = EscapeTarget.ConnectedDoor;
-                bool isClosedDoor = door != null && !door.IsOpen;
+                bool isClosedDoor = door != null && door.IsClosed;
                 Vector2 diff = EscapeTarget.WorldPosition - Character.WorldPosition;
                 float sqrDist = diff.LengthSquared();
                 bool isClose = sqrDist < MathUtils.Pow2(100);

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs

@@ -206,13 +206,19 @@ namespace Barotrauma
             private set;
         } = new HashSet<Submarine>();
 
-        public bool IsTargetingPlayerTeam => IsTargetInPlayerTeam(SelectedAiTarget);
         public static bool IsTargetBeingChasedBy(Character target, Character character)
             => character?.AIController is EnemyAIController enemyAI && enemyAI.SelectedAiTarget?.Entity == target && (enemyAI.State == AIState.Attack || enemyAI.State == AIState.Aggressive);
         public bool IsBeingChasedBy(Character c) => IsTargetBeingChasedBy(Character, c);
         private bool IsBeingChased => IsBeingChasedBy(SelectedAiTarget?.Entity as Character);
 
-        private bool IsTargetInPlayerTeam(AITarget target) => target?.Entity?.Submarine != null && target.Entity.Submarine.Info.IsPlayer || target?.Entity is Character targetCharacter && targetCharacter.IsOnPlayerTeam;
+        private static bool IsTargetInPlayerTeam(AITarget target) => target?.Entity?.Submarine != null && target.Entity.Submarine.Info.IsPlayer || target?.Entity is Character targetCharacter && targetCharacter.IsOnPlayerTeam;
+
+        private bool IsAttackingOwner(Character other) =>
+            PetBehavior != null && PetBehavior.Owner != null &&
+            !other.IsUnconscious && !other.IsArrested &&
+            other.AIController is HumanAIController humanAI &&
+            humanAI.ObjectiveManager.CurrentObjective is AIObjectiveCombat combat &&
+            combat.Enemy != null && combat.Enemy == PetBehavior.Owner;
 
         private bool reverse;
         public bool Reverse 
@@ -308,11 +314,10 @@ namespace Barotrauma
             insideSteering = new IndoorsSteeringManager(this, Character.Params.AI.CanOpenDoors, canAttackDoors);
             steeringManager = outsideSteering;
             State = AIState.Idle;
-
             requiredHoleCount = (int)Math.Ceiling(ConvertUnits.ToDisplayUnits(colliderWidth) / Structure.WallSectionSize);
-
             myBodies = Character.AnimController.Limbs.Select(l => l.body.FarseerBody).ToList();
             myBodies.Add(Character.AnimController.Collider.FarseerBody);
+            CreatureMetrics.UnlockInEditor(Character.SpeciesName);
         }
 
         private CharacterParams.AIParams _aiParams;
@@ -354,7 +359,7 @@ namespace Barotrauma
                 { 
                     targetingTag = "owner";
                 }
-                else if (targetCharacter.AIController is HumanAIController && !IsOnFriendlyTeam(Character, targetCharacter))
+                else if (PetBehavior != null && (!Character.IsOnFriendlyTeam(targetCharacter) || IsAttackingOwner(targetCharacter)))
                 {
                     targetingTag = "hostile";
                 }
@@ -683,19 +688,22 @@ namespace Barotrauma
                     {
                         if (SelectedAiTarget.Entity is Character targetCharacter)
                         {
-                            bool IsValid(Character.Attacker a)
+                            bool ShouldRetaliate(Character.Attacker a)
                             {
                                 Character c = a.Character;
-                                if (c.IsDead || c.Removed) { return false; }
-                                if (!Character.IsFriendly(c)) { return true; }
-                                if (!c.IsPlayer) { return false; }
-                                // Only apply the threshold to players
-                                return a.Damage >= selectedTargetingParams.Threshold;
+                                if (c == null || c.IsUnconscious || c.Removed) { return false; }
+                                // Can't target characters of same species/group because that would make us hostile to all friendly characters in the same species/group.
+                                if (Character.IsSameSpeciesOrGroup(c)) { return false; }
+                                if (targetCharacter.IsSameSpeciesOrGroup(c)) { return false; }
+                                if (c.IsPlayer || Character.IsOnFriendlyTeam(c))
+                                {
+                                    return a.Damage >= selectedTargetingParams.Threshold;
+                                }
+                                return true;
                             }
-                            Character attacker = targetCharacter.LastAttackers.LastOrDefault(IsValid)?.Character;
-                            if (attacker?.AiTarget != null && !Character.IsSameSpeciesOrGroup(attacker) && !targetCharacter.IsSameSpeciesOrGroup(attacker))
+                            Character attacker = targetCharacter.LastAttackers.LastOrDefault(ShouldRetaliate)?.Character;
+                            if (attacker?.AiTarget != null)
                             {
-                                // Can't retaliate on characters of same species or group because that would make us hostile to all friendly characters in the same group.
                                 ChangeTargetState(attacker, AIState.Attack, selectedTargetingParams.Priority * 2);
                                 SelectTarget(attacker.AiTarget);
                                 State = AIState.Attack;
@@ -869,7 +877,7 @@ namespace Barotrauma
             var pathSteering = SteeringManager as IndoorsSteeringManager;
             if (pathSteering == null)
             {
-                if (SimPosition.Y < ConvertUnits.ToSimUnits(Character.CharacterHealth.CrushDepth * 0.75f))
+                if (Level.Loaded != null && Level.Loaded.GetRealWorldDepth(WorldPosition.Y) > Character.CharacterHealth.CrushDepth * 0.75f)
                 {
                     // Steer straight up if very deep
                     SteeringManager.SteeringManual(deltaTime, Vector2.UnitY);
@@ -1503,7 +1511,7 @@ namespace Barotrauma
                                     {
                                         hitTarget = limb.character;
                                     }
-                                    if (hitTarget != null && !hitTarget.IsDead && Character.IsFriendly(hitTarget))
+                                    if (hitTarget != null && !hitTarget.IsDead && Character.IsFriendly(hitTarget) && !IsAttackingOwner(hitTarget))
                                     {
                                         return true;
                                     }
@@ -2413,7 +2421,7 @@ namespace Barotrauma
                     {
                         t = limb.character;
                     }
-                    if (t != null && (t == target || !Character.IsFriendly(t)))
+                    if (t != null && (t == target || (!Character.IsFriendly(t) || IsAttackingOwner(t))))
                     {
                         return true;
                     }
@@ -3062,7 +3070,8 @@ namespace Barotrauma
                             // In the attack state allow going into non-allowed zone only when chasing a target.
                             if (State == targetParams.State && SelectedAiTarget == aiTarget) { break; }
                         }
-                        if (!IsPositionInsideAllowedZone(aiTarget.WorldPosition, out _))
+                        bool insideSameSub = aiTarget?.Entity?.Submarine != null && aiTarget.Entity.Submarine == Character.Submarine;
+                        if (!insideSameSub && !IsPositionInsideAllowedZone(aiTarget.WorldPosition, out _))
                         {
                             // If we have recently been damaged by the target (or another player/bot in the same team) allow targeting it even when we are in the idle state.
                             bool isTargetInPlayerTeam = IsTargetInPlayerTeam(aiTarget);

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs

@@ -310,7 +310,7 @@ namespace Barotrauma
                 UseIndoorSteeringOutside = false;
             }
             
-            if (Character.Submarine == null || Character.IsOnPlayerTeam && !Character.IsEscorted && !IsOnFriendlyTeam(Character.TeamID, Character.Submarine.TeamID))
+            if (Character.Submarine == null || Character.IsOnPlayerTeam && !Character.IsEscorted && !Character.IsOnFriendlyTeam(Character.Submarine.TeamID))
             {
                 // Spot enemies while staying outside or inside an enemy ship.
                 // does not apply for escorted characters, such as prisoners or terrorists who have their own behavior
@@ -444,7 +444,7 @@ namespace Barotrauma
             if (objectiveManager.CurrentObjective == null) { return; }
 
             objectiveManager.DoCurrentObjective(deltaTime);
-            bool run = objectiveManager.CurrentObjective.ForceRun || !objectiveManager.CurrentObjective.ForceWalk && objectiveManager.GetCurrentPriority() > AIObjectiveManager.RunPriority;
+            bool run = (objectiveManager.CurrentObjective.ForceRun && !objectiveManager.CurrentObjective.ForceWalk) || (!objectiveManager.CurrentObjective.ForceWalk && objectiveManager.GetCurrentPriority() > AIObjectiveManager.RunPriority);
             if (ObjectiveManager.CurrentObjective is AIObjectiveGoTo goTo && goTo.Target != null)
             {
                 if (Character.CurrentHull == null)
@@ -541,12 +541,12 @@ namespace Barotrauma
             if (Character.LockHands) { return; }
             if (ObjectiveManager.CurrentObjective == null) { return; }
             if (Character.CurrentHull == null) { return; }
-            bool oxygenLow = !Character.AnimController.HeadInWater && Character.OxygenAvailable < CharacterHealth.LowOxygenThreshold && Character.NeedsOxygen;
+            bool shouldActOnSuffocation = Character.IsLowInOxygen && !Character.AnimController.HeadInWater && HasDivingSuit(Character, requireOxygenTank: false) && !HasItem(Character, AIObjectiveFindDivingGear.OXYGEN_SOURCE, out _, conditionPercentage: 1);
             bool isCarrying = ObjectiveManager.HasActiveObjective<AIObjectiveContainItem>() || ObjectiveManager.HasActiveObjective<AIObjectiveDecontainItem>();
 
             bool NeedsDivingGearOnPath(AIObjectiveGoTo gotoObjective)
             {
-                if (!Character.NeedsAir) { return false; }
+                if (Character.IsImmuneToPressure) { return false; }
                 bool insideSteering = SteeringManager == PathSteering && PathSteering.CurrentPath != null && !PathSteering.IsPathDirty;
                 Hull targetHull = gotoObjective.GetTargetHull();
                 return gotoObjective.Target != null && targetHull == null ||
@@ -566,17 +566,17 @@ namespace Barotrauma
                         gotoObjective.Abandon = true;
                     }
                 }
-                if (!oxygenLow)
+                if (!shouldActOnSuffocation)
                 {
                     return;
                 }
             }
 
             // Diving gear
-            if (oxygenLow || findItemState != FindItemState.OtherItem)
+            if (shouldActOnSuffocation || findItemState != FindItemState.OtherItem)
             {
                 bool needsGear = NeedsDivingGear(Character.CurrentHull, out _);
-                if (!needsGear || oxygenLow)
+                if (!needsGear || shouldActOnSuffocation)
                 {
                     bool isCurrentObjectiveFindSafety = ObjectiveManager.IsCurrentObjective<AIObjectiveFindSafety>();
                     bool shouldKeepTheGearOn =
@@ -584,21 +584,21 @@ namespace Barotrauma
                         Character.AnimController.InWater ||
                         Character.AnimController.HeadInWater ||
                         Character.Submarine == null ||
-                        (Character.Submarine.TeamID != Character.TeamID && !Character.IsEscorted) ||
+                        (!Character.IsOnFriendlyTeam(Character.TeamID, Character.Submarine.TeamID) && !Character.IsEscorted) ||
                         ObjectiveManager.CurrentOrders.Any(o => o.Objective.KeepDivingGearOnAlsoWhenInactive) ||
                         ObjectiveManager.CurrentObjective.GetSubObjectivesRecursive(true).Any(o => o.KeepDivingGearOn) ||
                         Character.CurrentHull.OxygenPercentage < HULL_LOW_OXYGEN_PERCENTAGE + 10 ||
                         Character.CurrentHull.IsWetRoom;
                     bool IsOrderedToWait() => Character.IsOnPlayerTeam && ObjectiveManager.CurrentOrder is AIObjectiveGoTo goTo && goTo.Target == Character;
                     bool removeDivingSuit = !shouldKeepTheGearOn && !IsOrderedToWait();
-                    if (oxygenLow && Character.CurrentHull.Oxygen > 0 && (!isCurrentObjectiveFindSafety || Character.OxygenAvailable < 1))
+                    if (shouldActOnSuffocation && Character.CurrentHull.Oxygen > 0 && (!isCurrentObjectiveFindSafety || Character.OxygenAvailable < 1))
                     {
                         shouldKeepTheGearOn = false;
                         // Remove the suit before we pass out
                         removeDivingSuit = true;
                     }
                     bool takeMaskOff = !shouldKeepTheGearOn;
-                    if (!shouldKeepTheGearOn && !oxygenLow)
+                    if (!shouldKeepTheGearOn && !shouldActOnSuffocation)
                     {
                         if (ObjectiveManager.IsCurrentObjective<AIObjectiveIdle>())
                         {
@@ -621,9 +621,10 @@ namespace Barotrauma
                                     }
                                     else if (gotoObjective.Mimic)
                                     {
+                                        bool targetHasDivingGear = HasDivingGear(gotoObjective.Target as Character, requireOxygenTank: false);
                                         if (!removeSuit)
                                         {
-                                            removeDivingSuit = !HasDivingSuit(gotoObjective.Target as Character);
+                                            removeDivingSuit = !targetHasDivingGear;
                                             if (removeDivingSuit)
                                             {
                                                 removeSuit = true;
@@ -631,7 +632,7 @@ namespace Barotrauma
                                         }
                                         if (!removeMask)
                                         {
-                                            takeMaskOff = !HasDivingMask(gotoObjective.Target as Character);
+                                            takeMaskOff = !targetHasDivingGear;
                                             if (takeMaskOff)
                                             {
                                                 removeMask = true;
@@ -647,7 +648,7 @@ namespace Barotrauma
                         var divingSuit = Character.Inventory.FindItemByTag(AIObjectiveFindDivingGear.HEAVY_DIVING_GEAR);
                         if (divingSuit != null && !divingSuit.HasTag(AIObjectiveFindDivingGear.DIVING_GEAR_WEARABLE_INDOORS))
                         {
-                            if (oxygenLow || Character.Submarine?.TeamID != Character.TeamID || ObjectiveManager.GetCurrentPriority() >= AIObjectiveManager.RunPriority)
+                            if (shouldActOnSuffocation || Character.Submarine?.TeamID != Character.TeamID || ObjectiveManager.GetCurrentPriority() >= AIObjectiveManager.RunPriority)
                             {
                                 divingSuit.Drop(Character);
                                 HandleRelocation(divingSuit);
@@ -783,20 +784,23 @@ namespace Barotrauma
 
         private void HandleRelocation(Item item)
         {
-            if (item.Submarine?.TeamID == CharacterTeamType.FriendlyNPC)
+            if (item.SpawnedInCurrentOutpost) { return; }
+            if (item.Submarine == null) { return; }
+            // Only affects bots in the player team
+            if (!Character.IsOnPlayerTeam) { return; }
+            // Don't relocate if the item is on a sub of the same team
+            if (item.Submarine.TeamID == Character.TeamID) { return; }
+            if (itemsToRelocate.Contains(item)) { return; }
+            itemsToRelocate.Add(item);
+            if (item.Submarine.ConnectedDockingPorts.TryGetValue(Submarine.MainSub, out DockingPort myPort))
             {
-                if (itemsToRelocate.Contains(item)) { return; }
-                itemsToRelocate.Add(item);
-                if (item.Submarine.ConnectedDockingPorts.TryGetValue(Submarine.MainSub, out DockingPort myPort))
-                {
-                    myPort.OnUnDocked += Relocate;
-                }
-                var campaign = GameMain.GameSession.Campaign;
-                if (campaign != null)
-                {
-                    // In the campaign mode, undocking happens after leaving the outpost, so we can't use that.
-                    campaign.BeforeLevelLoading += Relocate;
-                }
+                myPort.OnUnDocked += Relocate;
+            }
+            var campaign = GameMain.GameSession.Campaign;
+            if (campaign != null)
+            {
+                // In the campaign mode, undocking happens after leaving the outpost, so we can't use that.
+                campaign.BeforeLevelLoading += Relocate;
             }
 
             void Relocate()
@@ -982,15 +986,15 @@ namespace Barotrauma
                                 if (target.CurrentHull != hull) { continue; }
                                 if (AIObjectiveRescueAll.IsValidTarget(target, Character))
                                 {
-                                    if (AddTargets<AIObjectiveRescueAll, Character>(Character, target) && newOrder == null && !ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
+                                    if (AddTargets<AIObjectiveRescueAll, Character>(Character, target) && newOrder == null && (!Character.IsMedic || Character == target) && !ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
                                     {
                                         var orderPrefab = OrderPrefab.Prefabs["requestfirstaid"];
                                         newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
                                         targetHull = hull;
                                     }
                                 }
-                            }
-                            foreach (Item item in Item.ItemList)
+                            }                            
+                            foreach (Item item in Item.RepairableItems)
                             {
                                 if (item.CurrentHull != hull) { continue; }
                                 if (AIObjectiveRepairItems.IsValidTarget(item, Character))
@@ -1161,7 +1165,7 @@ namespace Barotrauma
                     freezeAI = true;
                 }
             }
-            if (attacker == null || attacker.IsDead || attacker.Removed)
+            if (attacker == null || attacker.IsUnconscious || attacker.Removed)
             {
                 // Don't react to the damage if there's no attacker.
                 // We might consider launching the retreat combat objective in some cases, so that the bot does not just stand somewhere getting damaged and dying.
@@ -1199,7 +1203,7 @@ namespace Barotrauma
                     return;
                 }
                 float cumulativeDamage = realDamage + Character.GetDamageDoneByAttacker(attacker);
-                bool isAccidental = attacker.IsBot && !IsMentallyUnstable && !attacker.AIController.IsMentallyUnstable && Character.CombatAction == null;
+                bool isAccidental = attacker.IsBot && !IsMentallyUnstable && !attacker.AIController.IsMentallyUnstable && attacker.CombatAction == null;
                 if (isAccidental)
                 {
                     if (!Character.IsSecurity && cumulativeDamage > minorDamageThreshold)
@@ -1209,7 +1213,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    isAttackerInfected = attacker.CharacterHealth.GetAfflictionStrength("alieninfection") > 0;
+                    isAttackerInfected = attacker.CharacterHealth.GetAfflictionStrength(AfflictionPrefab.AlienInfectedType) > 0;
                     // Inform other NPCs
                     if (isAttackerInfected || cumulativeDamage > minorDamageThreshold || totalDamage > minorDamageThreshold)
                     {
@@ -1279,7 +1283,7 @@ namespace Barotrauma
                     if (otherCharacter.Submarine != attacker.Submarine) { continue; }
                     if (otherCharacter.Info?.Job == null || otherCharacter.IsInstigator) { continue; }
                     if (otherCharacter.IsPlayer) { continue; }
-                    if (!(otherCharacter.AIController is HumanAIController otherHumanAI)) { continue; }
+                    if (otherCharacter.AIController is not HumanAIController otherHumanAI) { continue; }
                     if (!otherHumanAI.IsFriendly(Character)) { continue; }
                     bool isWitnessing = otherHumanAI.VisibleHulls.Contains(Character.CurrentHull) || otherHumanAI.VisibleHulls.Contains(attacker.CurrentHull);
                     if (!isWitnessing) 
@@ -1299,7 +1303,7 @@ namespace Barotrauma
 
             AIObjectiveCombat.CombatMode DetermineCombatMode(Character c, float cumulativeDamage = 0, bool isWitnessing = false)
             {
-                if (!(c.AIController is HumanAIController humanAI)) { return AIObjectiveCombat.CombatMode.None; }
+                if (c.AIController is not HumanAIController humanAI) { return AIObjectiveCombat.CombatMode.None; }
                 if (!IsFriendly(attacker))
                 {
                     if (c.Submarine == null)
@@ -1327,7 +1331,7 @@ namespace Barotrauma
                     }
                     if (attacker.IsPlayer && c.TeamID == attacker.TeamID)
                     {
-                        if (GameMain.IsSingleplayer || Character.TeamID != attacker.TeamID)
+                        if (GameMain.IsSingleplayer || c.TeamID != attacker.TeamID)
                         {
                             // Bots in the player team never act aggressively in single player when attacked by the player
                             // In multiplayer, they react only to players attacking them or other crew members
@@ -1345,11 +1349,11 @@ namespace Barotrauma
                         isAttackerFightingEnemy = true;
                         return AIObjectiveCombat.CombatMode.None;
                     }
-                    if (isWitnessing && Character.CombatAction != null && !c.IsSecurity)
+                    if (isWitnessing && c.CombatAction != null && !c.IsSecurity)
                     {
-                        return Character.CombatAction.WitnessReaction;
+                        return c.CombatAction.WitnessReaction;
                     }
-                    if (attacker.IsPlayer && FindInstigator() is Character instigator)
+                    if (!attacker.IsInstigator && c.IsOnFriendlyTeam(attacker) && FindInstigator() is Character instigator)
                     {
                         // The guards don't react to player's aggressions when there's an instigator around
                         isAttackerFightingEnemy = true;
@@ -1359,11 +1363,11 @@ namespace Barotrauma
                     {
                         if (c.IsSecurity)
                         {
-                            return Character.CombatAction != null ? Character.CombatAction.GuardReaction : AIObjectiveCombat.CombatMode.None;
+                            return attacker.CombatAction != null ? attacker.CombatAction.GuardReaction : AIObjectiveCombat.CombatMode.Offensive;
                         }
                         else
                         {
-                            return Character.CombatAction != null ? Character.CombatAction.WitnessReaction : AIObjectiveCombat.CombatMode.None;
+                            return attacker.CombatAction != null ? attacker.CombatAction.WitnessReaction : AIObjectiveCombat.CombatMode.Retreat;
                         }
                     }
                     else
@@ -1546,7 +1550,7 @@ namespace Barotrauma
 
         public bool NeedsDivingGear(Hull hull, out bool needsSuit)
         {
-            if (!Character.NeedsAir) 
+            if (Character.IsImmuneToPressure) 
             {
                 needsSuit = false;
                 return false; 
@@ -1557,30 +1561,30 @@ namespace Barotrauma
                 hull.LethalPressure > 0 || 
                 hull.ConnectedGaps.Any(gap => !gap.IsRoomToRoom && gap.Open > 0.9f))
             {
-                needsSuit = !Character.HasAbilityFlag(AbilityFlags.ImmuneToPressure);
+                needsSuit = true;
                 return true;
             }
-            if (hull.WaterPercentage > 60 || hull.OxygenPercentage < HULL_LOW_OXYGEN_PERCENTAGE + 1)
+            if (Character.CharacterHealth.OxygenLowResistance < 1 && (hull.WaterPercentage > 60 || hull.OxygenPercentage < HULL_LOW_OXYGEN_PERCENTAGE + 1))
             {
                 return true;
             }
             return false;
         }
 
-        public static bool HasDivingGear(Character character, float conditionPercentage = 0) => HasDivingSuit(character, conditionPercentage) || HasDivingMask(character, conditionPercentage);
+        public static bool HasDivingGear(Character character, float conditionPercentage = 0, bool requireOxygenTank = true) => HasDivingSuit(character, conditionPercentage, requireOxygenTank) || HasDivingMask(character, conditionPercentage, requireOxygenTank);
 
         /// <summary>
         /// Check whether the character has a diving suit in usable condition plus some oxygen.
         /// </summary>
-        public static bool HasDivingSuit(Character character, float conditionPercentage = 0) 
-            => HasItem(character, AIObjectiveFindDivingGear.HEAVY_DIVING_GEAR, out _, AIObjectiveFindDivingGear.OXYGEN_SOURCE, conditionPercentage, requireEquipped: true,
+        public static bool HasDivingSuit(Character character, float conditionPercentage = 0, bool requireOxygenTank = true) 
+            => HasItem(character, AIObjectiveFindDivingGear.HEAVY_DIVING_GEAR, out _, requireOxygenTank ? AIObjectiveFindDivingGear.OXYGEN_SOURCE : Identifier.Empty, conditionPercentage, requireEquipped: true,
                 predicate: (Item item) => character.HasEquippedItem(item, InvSlotType.OuterClothes));
 
         /// <summary>
         /// Check whether the character has a diving mask in usable condition plus some oxygen.
         /// </summary>
-        public static bool HasDivingMask(Character character, float conditionPercentage = 0) 
-            => HasItem(character, AIObjectiveFindDivingGear.LIGHT_DIVING_GEAR, out _, AIObjectiveFindDivingGear.OXYGEN_SOURCE, conditionPercentage, requireEquipped: true);
+        public static bool HasDivingMask(Character character, float conditionPercentage = 0, bool requireOxygenTank = true) 
+            => HasItem(character, AIObjectiveFindDivingGear.LIGHT_DIVING_GEAR, out _, requireOxygenTank ? AIObjectiveFindDivingGear.OXYGEN_SOURCE : Identifier.Empty, conditionPercentage, requireEquipped: true);
 
         private static List<Item> matchingItems = new List<Item>();
 
@@ -1745,7 +1749,9 @@ namespace Barotrauma
                     }
                     if (!someoneSpoke)
                     {
-                        if (!item.StolenDuringRound && GameMain.GameSession?.Campaign?.Map?.CurrentLocation != null)
+                        if (!item.StolenDuringRound && 
+                            Level.Loaded?.Type == LevelData.LevelType.Outpost && 
+                            GameMain.GameSession?.Campaign?.Map?.CurrentLocation != null)
                         {
                             var reputationLoss = MathHelper.Clamp(
                                 (item.Prefab.GetMinPrice() ?? 0) * Reputation.ReputationLossPerStolenItemPrice, 
@@ -1843,7 +1849,7 @@ namespace Barotrauma
                     }
                     break;
                 case "reportbrokendevices":
-                    foreach (var item in Item.ItemList)
+                    foreach (var item in Item.RepairableItems)
                     {
                         if (item.CurrentHull != hull) { continue; }
                         if (AIObjectiveRepairItems.IsValidTarget(item, character))
@@ -1924,11 +1930,12 @@ namespace Barotrauma
             bool isCurrentHull = character == Character && character.CurrentHull == hull;
             if (hull == null)
             {
+                float hullSafety = character.IsProtectedFromPressure ? 0 : 100;
                 if (isCurrentHull)
                 {
-                    CurrentHullSafety = character.NeedsAir ? 0 : 100;
+                    CurrentHullSafety = hullSafety;
                 }
-                return CurrentHullSafety;
+                return hullSafety;
             }
             if (isCurrentHull && visibleHulls == null)
             {
@@ -1936,10 +1943,9 @@ namespace Barotrauma
                 visibleHulls = VisibleHulls;
             }
             bool ignoreFire = objectiveManager.CurrentOrder is AIObjectiveExtinguishFires extinguishOrder && extinguishOrder.Priority > 0 || objectiveManager.HasActiveObjective<AIObjectiveExtinguishFire>();
-            bool ignoreWater = character.IsProtectedFromPressure();
-            bool ignoreOxygen = HasDivingGear(character);
+            bool ignoreOxygen = character.IsProtectedFromPressure || HasDivingGear(character);
             bool ignoreEnemies = ObjectiveManager.IsCurrentOrder<AIObjectiveFightIntruders>() || ObjectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>();
-            float safety = CalculateHullSafety(hull, visibleHulls, character, ignoreWater, ignoreOxygen, ignoreFire, ignoreEnemies);
+            float safety = CalculateHullSafety(hull, visibleHulls, character, ignoreWater: false, ignoreOxygen, ignoreFire, ignoreEnemies);
             if (isCurrentHull)
             {
                 CurrentHullSafety = safety;
@@ -1949,15 +1955,33 @@ namespace Barotrauma
 
         private static float CalculateHullSafety(Hull hull, IEnumerable<Hull> visibleHulls, Character character, bool ignoreWater = false, bool ignoreOxygen = false, bool ignoreFire = false, bool ignoreEnemies = false)
         {
-            if (hull == null) { return character.NeedsAir ? 0 : 100; }
-            if (hull.LethalPressure > 0 && character.PressureProtection <= 0 && !character.HasAbilityFlag(AbilityFlags.ImmuneToPressure)) { return 0; }
+            bool isProtectedFromPressure = character.IsProtectedFromPressure;
+            if (hull == null) { return isProtectedFromPressure ? 100 : 0; }
+            if (hull.LethalPressure > 0 && !isProtectedFromPressure) { return 0; }
             // Oxygen factor should be 1 with 70% oxygen or more and 0.1 when the oxygen level is 30% or lower.
             // With insufficient oxygen, the safety of the hull should be 39, all the other factors aside. So, just below the HULL_SAFETY_THRESHOLD.
             float oxygenFactor = ignoreOxygen ? 1 : MathHelper.Lerp((HULL_SAFETY_THRESHOLD - 1) / 100, 1, MathUtils.InverseLerp(HULL_LOW_OXYGEN_PERCENTAGE, 100 - HULL_LOW_OXYGEN_PERCENTAGE, hull.OxygenPercentage));
-            float waterFactor = ignoreWater ? 1 : MathHelper.Lerp(1, HULL_SAFETY_THRESHOLD / 2 / 100, hull.WaterPercentage / 100);
-            if (!character.NeedsAir)
+            float waterFactor = 1;
+            if (!ignoreWater)
+            {
+                if (visibleHulls != null)
+                {
+                    // Take the visible hulls into account too, because otherwise multi-hull rooms on several floors (with platforms) will yield unexpected results.
+                    float relativeWaterVolume = visibleHulls.Sum(s => s.WaterVolume) / visibleHulls.Sum(s => s.Volume);
+                    waterFactor = MathHelper.Lerp(1, HULL_SAFETY_THRESHOLD / 2 / 100, relativeWaterVolume);
+                }
+                else
+                {
+                    float relativeWaterVolume = hull.WaterVolume / hull.Volume;
+                    waterFactor = MathHelper.Lerp(1, HULL_SAFETY_THRESHOLD / 2 / 100, relativeWaterVolume);
+                }
+            }
+            if (character.CharacterHealth.OxygenLowResistance >= 1)
             {
                 oxygenFactor = 1;
+            }
+            if (isProtectedFromPressure)
+            {
                 waterFactor = 1;
             }
             float fireFactor = 1;
@@ -2045,21 +2069,39 @@ namespace Barotrauma
         public static bool IsFriendly(Character me, Character other, bool onlySameTeam = false)
         {
             bool sameTeam = me.TeamID == other.TeamID;
-            bool teamGood = sameTeam || !onlySameTeam && IsOnFriendlyTeam(me, other);
+            bool teamGood = sameTeam || !onlySameTeam && me.IsOnFriendlyTeam(other);
             if (!teamGood) { return false; }
-            if (!me.IsSameSpeciesOrGroup(other)) { return false; }
-            if (me.TeamID == CharacterTeamType.FriendlyNPC && other.TeamID == CharacterTeamType.Team1 && GameMain.GameSession?.GameMode is CampaignMode campaign)
-            {
-                var reputation = campaign.Map?.CurrentLocation?.Reputation;
-                if (reputation != null && reputation.NormalizedValue < Reputation.HostileThreshold)
-                {
-                    return false;
-                }
-            }
-            if (!sameTeam && me.TeamID == CharacterTeamType.None && other.IsPet)
+            if (other.IsPet)
             {
                 // Hostile NPCs are hostile to all pets, unless they are in the same team.
-                return false;
+                if (!sameTeam && me.TeamID == CharacterTeamType.None) { return false; }
+            }
+            else
+            {
+                if (!me.IsSameSpeciesOrGroup(other)) { return false; }
+            }
+            if (GameMain.GameSession?.GameMode is CampaignMode campaign)
+            {
+                if ((me.TeamID == CharacterTeamType.FriendlyNPC && other.TeamID == CharacterTeamType.Team1) || 
+                    (me.TeamID == CharacterTeamType.Team1 && other.TeamID == CharacterTeamType.FriendlyNPC))
+                {
+                    Character npc = me.TeamID == CharacterTeamType.FriendlyNPC ? me : other;
+                    Identifier npcFaction = npc.Faction;
+                    Identifier currentLocationFaction = campaign.Map?.CurrentLocation?.Faction?.Prefab.Identifier ?? Identifier.Empty;
+                    if (npcFaction.IsEmpty)
+                    {
+                        //if faction identifier is not specified, assume the NPC is a member of the faction that owns the outpost
+                        npcFaction = currentLocationFaction;
+                    }
+                    if (!currentLocationFaction.IsEmpty && npcFaction == currentLocationFaction)
+                    {
+                        var reputation = campaign.Map?.CurrentLocation?.Reputation;
+                        if (reputation != null && reputation.NormalizedValue < Reputation.HostileThreshold)
+                        {
+                            return false;
+                        }
+                    }
+                }
             }
             return true;
         }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs

@@ -96,7 +96,7 @@ namespace Barotrauma
             base.Update(speed);
             float step = 1.0f / 60.0f;
             checkDoorsTimer -= step;
-            if (lastDoor.door == null || !lastDoor.shouldBeOpen || lastDoor.door.IsOpen)
+            if (lastDoor.door == null || !lastDoor.shouldBeOpen || lastDoor.door.IsFullyOpen)
             {
                 buttonPressTimer = 0;
             }
@@ -211,7 +211,7 @@ namespace Barotrauma
                     currentTarget = target;
                     Vector2 currentPos = host.SimPosition;
                     pathFinder.InsideSubmarine = character.Submarine != null && !character.Submarine.Info.IsRuin;
-                    pathFinder.ApplyPenaltyToOutsideNodes = character.Submarine != null && character.PressureProtection <= 0;
+                    pathFinder.ApplyPenaltyToOutsideNodes = character.Submarine != null && !character.IsProtectedFromPressure;
                     var newPath = pathFinder.FindPath(currentPos, target, character.Submarine, "(Character: " + character.Name + ")", minGapSize, startNodeFilter, endNodeFilter, nodeFilter, checkVisibility: checkVisibility);
                     bool useNewPath = needsNewPath || currentPath == null || currentPath.CurrentNode == null || character.Submarine != null && findPathTimer < -1 && Math.Abs(character.AnimController.TargetMovement.Combine()) <= 0;
                     if (!useNewPath && currentPath?.CurrentNode != null && newPath.Nodes.Any() && !newPath.Unreachable)
@@ -342,7 +342,7 @@ namespace Barotrauma
                 CheckDoorsInPath();
                 doorsChecked = true;
             }
-            if (buttonPressTimer > 0 && lastDoor.door != null && lastDoor.shouldBeOpen && !lastDoor.door.IsOpen)
+            if (buttonPressTimer > 0 && lastDoor.door != null && lastDoor.shouldBeOpen && lastDoor.door.IsOpening)
             {
                 // We have pressed the button and are waiting for the door to open -> Hold still until we can press the button again.
                 Reset();
@@ -510,7 +510,7 @@ namespace Barotrauma
         private bool CanAccessDoor(Door door, Func<Controller, bool> buttonFilter = null)
         {
             if (door.IsBroken) { return true; }
-            if (!door.IsOpen)
+            if (door.IsClosed)
             {
                 if (!door.Item.IsInteractable(character)) { return false; }
                 if (!ShouldBreakDoor(door))
@@ -536,7 +536,7 @@ namespace Barotrauma
                 }
                 foreach (var linked in door.Item.linkedTo)
                 {
-                    if (!(linked is Item linkedItem)) { continue; }
+                    if (linked is not Item linkedItem) { continue; }
                     var button = linkedItem.GetComponent<Controller>();
                     if (button == null) { continue; }
                     if (button.HasAccess(character) && (buttonFilter == null || buttonFilter(button)))
@@ -785,7 +785,7 @@ namespace Barotrauma
                 {
                     if (hull.WaterVolume / hull.Rect.Width > 100.0f)
                     {
-                        if (!HumanAIController.HasDivingSuit(character))
+                        if (!HumanAIController.HasDivingSuit(character) && character.CharacterHealth.OxygenLowResistance < 1)
                         {
                             penalty += 500.0f;
                         }
@@ -808,7 +808,7 @@ namespace Barotrauma
 
         private float? GetSingleNodePenalty(PathNode node)
         {
-            if (node.Waypoint.isObstructed) { return null; }
+            if (!node.Waypoint.IsTraversable) { return null; }
             if (node.IsBlocked()) { return null; }
             float penalty = 0.0f;
             if (node.Waypoint.ConnectedGap != null && node.Waypoint.ConnectedGap.Open < 0.9f)

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCombat.cs

@@ -352,7 +352,7 @@ namespace Barotrauma
                         Weapon = null;
                         continue;
                     }
-                    if (WeaponComponent.IsLoaded(character))
+                    if (WeaponComponent.IsNotEmpty(character))
                     {
                         // All good, the weapon is loaded
                         break;
@@ -470,7 +470,7 @@ namespace Barotrauma
                     // Not in the inventory anymore or cannot find the weapon component
                     return false;
                 }
-                if (!WeaponComponent.IsLoaded(character))
+                if (!WeaponComponent.IsNotEmpty(character))
                 {
                     // Try reloading (and seek ammo)
                     if (!Reload(seekAmmo))
@@ -541,7 +541,7 @@ namespace Barotrauma
                         priority /= 2;
                     }
                 }
-                if (!weapon.IsLoaded(character))
+                if (!weapon.IsNotEmpty(character))
                 {
                     if (weapon is RangedWeapon && !isAllowedToSeekWeapons)
                     {
@@ -554,7 +554,15 @@ namespace Barotrauma
                         priority /= 2;
                     }
                 }
-                if (Enemy.IsKnockedDown)
+
+                if (Enemy.Params.Health.StunImmunity)
+                {
+                    if (weapon.Item.HasTag("stunner"))
+                    {
+                        priority /= 2;
+                    }
+                }
+                else if (Enemy.IsKnockedDown)
                 {
                     // Enemy is stunned, reduce the priority of stunner weapons.
                     Attack attack = GetAttackDefinition(weapon);
@@ -640,11 +648,11 @@ namespace Barotrauma
                 {
                     statusEffects = statusEffects.Concat(hitEffects);
                 }
-                float afflictionsStun = attack.Afflictions.Keys.Sum(a => a.Identifier == "stun" ? a.Strength : 0);
+                float afflictionsStun = attack.Afflictions.Keys.Sum(a => a.Identifier == AfflictionPrefab.StunType ? a.Strength : 0);
                 float effectsStun = statusEffects.None() ? 0 : statusEffects.Max(se =>
                 {
                     float stunAmount = 0;
-                    var stunAffliction = se.Afflictions.Find(a => a.Identifier == "stun");
+                    var stunAffliction = se.Afflictions.Find(a => a.Identifier == AfflictionPrefab.StunType);
                     if (stunAffliction != null)
                     {
                         stunAmount = stunAffliction.Strength;
@@ -1168,30 +1176,31 @@ namespace Barotrauma
                     if (sqrDistance > repairTool.Range * repairTool.Range) { return; }
                 }
                 float aimFactor = MathHelper.PiOver2 * (1 - AimAccuracy);
-                if (VectorExtensions.Angle(VectorExtensions.Forward(Weapon.body.TransformedRotation), Enemy.Position - Weapon.Position) < MathHelper.PiOver4 + aimFactor)
+                if (VectorExtensions.Angle(VectorExtensions.Forward(Weapon.body.TransformedRotation), Enemy.WorldPosition - Weapon.WorldPosition) < MathHelper.PiOver4 + aimFactor)
                 {
                     if (myBodies == null)
                     {
                         myBodies = character.AnimController.Limbs.Select(l => l.body.FarseerBody);
                     }
-                    var collisionCategories = Physics.CollisionCharacter | Physics.CollisionWall | Physics.CollisionLevel;
-                    var pickedBody = Submarine.PickBody(Weapon.SimPosition, Enemy.SimPosition, myBodies, collisionCategories, allowInsideFixture: true);
-                    if (pickedBody != null)
+                    // Check that we don't hit friendlies. No need to check the walls, because there's a separate check for that at 1096 (which intentionally has a small delay)
+                    var pickedBodies = Submarine.PickBodies(Weapon.SimPosition, Character.GetRelativeSimPosition(from: Weapon, to: Enemy), myBodies, Physics.CollisionCharacter);
+                    foreach (var body in pickedBodies)
                     {
                         Character target = null;
-                        if (pickedBody.UserData is Character c)
+                        if (body.UserData is Character c)
                         {
                             target = c;
                         }
-                        else if (pickedBody.UserData is Limb limb)
+                        else if (body.UserData is Limb limb)
                         {
                             target = limb.character;
                         }
-                        if (target != null && (target == Enemy || !HumanAIController.IsFriendly(target)))
+                        if (target != null && (target != Enemy || HumanAIController.IsFriendly(target)))
                         {
-                            UseWeapon(deltaTime);
+                            return;
                         }
                     }
+                    UseWeapon(deltaTime);
                 }
             }
         }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveContainItem.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
@@ -200,7 +201,8 @@ namespace Barotrauma
                             (container.Item.GetRootContainer()?.OwnInventory?.Locked ?? false) ||
                             ItemToContain == null || ItemToContain.Removed ||
                             !ItemToContain.IsOwnedBy(character) || container.Item.GetRootInventoryOwner() is Character c && c != character,
-                        SpeakIfFails = !objectiveManager.IsCurrentOrder<AIObjectiveCleanupItems>()
+                        SpeakIfFails = !objectiveManager.IsCurrentOrder<AIObjectiveCleanupItems>(),
+                        endNodeFilter = n => Vector2.DistanceSquared(n.Waypoint.WorldPosition, container.Item.WorldPosition) <= MathUtils.Pow2(AIObjectiveGetItem.DefaultReach)
                     },
                     onAbandon: () => Abandon = true,
                     onCompleted: () => RemoveSubObjective(ref goToObjective));
@@ -244,7 +246,8 @@ namespace Barotrauma
 
         public bool IsInTargetSlot(Item item)
         {
-            if (container?.Inventory is ItemInventory inventory && TargetSlot is not null)
+            if (TargetSlot == null) { return true; }
+            if (container?.Inventory is ItemInventory inventory)
             {
                 return inventory.IsInSlot(item, (int)TargetSlot);
             }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs

@@ -19,7 +19,6 @@ namespace Barotrauma
 
         private AIObjectiveGetItem getExtinguisherObjective;
         private AIObjectiveGoTo gotoObjective;
-        private float useExtinquisherTimer;
 
         public AIObjectiveExtinguishFire(Character character, Hull targetHull, AIObjectiveManager objectiveManager, float priorityModifier = 1) 
             : base(character, objectiveManager, priorityModifier)
@@ -44,7 +43,8 @@ namespace Barotrauma
             }
             else
             {
-                float yDist = Math.Abs(character.WorldPosition.Y - targetHull.WorldPosition.Y);
+                float characterY = character.CurrentHull?.WorldPosition.Y ?? character.WorldPosition.Y;
+                float yDist = Math.Abs(characterY - targetHull.WorldPosition.Y);
                 yDist = yDist > 100 ? yDist * 3 : 0;
                 float dist = Math.Abs(character.WorldPosition.X - targetHull.WorldPosition.X) + yDist;
                 float distanceFactor = MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, dist));
@@ -119,24 +119,18 @@ namespace Barotrauma
                         Abandon = true;
                         break;
                     }
-                    float xDist = Math.Abs(character.WorldPosition.X - fs.WorldPosition.X) - fs.DamageRange;
-                    float yDist = Math.Abs(character.WorldPosition.Y - fs.WorldPosition.Y);
-                    bool inRange = xDist + yDist < extinguisher.Range;
-                    // Use the hull position, because the fire x pos is sometimes inside a wall -> the bot can't ever see it and continues running towards the wall.
-                    ISpatialEntity lookTarget = character.CurrentHull == targetHull || character.CurrentHull.linkedTo.Contains(targetHull) ? targetHull : fs as ISpatialEntity;
-                    bool move = !inRange || !character.CanSeeTarget(lookTarget);
-                    if ((inRange && character.CanSeeTarget(lookTarget)) || useExtinquisherTimer > 0)
+                    float xDist = Math.Abs(character.WorldPosition.X - fs.WorldPosition.X);
+                    float yDist = Math.Abs(character.CurrentHull.WorldPosition.Y - targetHull.WorldPosition.Y);
+                    float dist = xDist + yDist;
+                    bool inRange = dist < extinguisher.Range;
+                    bool isInDamageRange = fs.IsInDamageRange(character, fs.DamageRange) && character.CanSeeTarget(targetHull);
+                    bool moveCloser = !isInDamageRange && (!inRange || !character.CanSeeTarget(targetHull));
+                    bool operateExtinguisher = !moveCloser || (dist < extinguisher.Range * 1.2f && character.CanSeeTarget(targetHull));
+                    if (operateExtinguisher)
                     {
-                        useExtinquisherTimer += deltaTime;
-                        if (useExtinquisherTimer > 2.0f)
-                        {
-                            useExtinquisherTimer = 0.0f;
-                        }
-                        // Aim
                         character.CursorPosition = fs.Position;
                         Vector2 fromCharacterToFireSource = fs.WorldPosition - character.WorldPosition;
-                        float dist = fromCharacterToFireSource.Length();
-                        character.CursorPosition += VectorExtensions.Forward(extinguisherItem.body.TransformedRotation + (float)Math.Sin(sinTime) / 2, dist / 2);
+                        character.CursorPosition += VectorExtensions.Forward(extinguisherItem.body.TransformedRotation + (float)Math.Sin(sinTime) / 2, fromCharacterToFireSource.Length() / 2);
                         if (extinguisherItem.RequireAimToUse)
                         {
                             character.SetInput(InputType.Aim, false, true);
@@ -148,25 +142,29 @@ namespace Barotrauma
                         {
                             character.Speak(TextManager.GetWithVariable("DialogPutOutFire", "[roomname]", targetHull.DisplayName, FormatCapitals.Yes).Value, null, 0, "putoutfire".ToIdentifier(), 10.0f);
                         }
+                        // Prevents running into the flames.
+                        objectiveManager.CurrentObjective.ForceWalk = true;
                     }
-                    if (move)
+                    if (moveCloser)
                     {
-                        //go to the first firesource
-                        if (TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(fs, character, objectiveManager, closeEnough: Math.Max(fs.DamageRange, extinguisher.Range * 0.7f))
-                            {
-                                DialogueIdentifier = "dialogcannotreachfire".ToIdentifier(),
-                                TargetName = fs.Hull.DisplayName
-                            }, 
-                                onAbandon: () =>  Abandon = true, 
-                                onCompleted: () => RemoveSubObjective(ref gotoObjective)))
+                        if (TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(fs, character, objectiveManager, closeEnough: extinguisher.Range * 0.8f)
+                        {
+                            DialogueIdentifier = "dialogcannotreachfire".ToIdentifier(),
+                            TargetName = fs.Hull.DisplayName,
+                        },
+                        onAbandon: () => Abandon = true,
+                        onCompleted: () => RemoveSubObjective(ref gotoObjective)))
                         {
                             gotoObjective.requiredCondition = () => character.CanSeeTarget(targetHull);
                         }
                     }
-                    else
+                    else if (!operateExtinguisher || isInDamageRange)
                     {
-                        character.AIController.SteeringManager.Reset();
+                        // Don't walk into the flames.
+                        RemoveSubObjective(ref gotoObjective);
+                        SteeringManager.Reset();
                     }
+                    // Only target one fire source at the time.
                     break;
                 }
             }
@@ -177,8 +175,20 @@ namespace Barotrauma
             base.Reset();
             getExtinguisherObjective = null;
             gotoObjective = null;
-            useExtinquisherTimer = 0;
             sinTime = 0;
+            SteeringManager.Reset();
+        }
+
+        protected override void OnCompleted()
+        {
+            base.OnCompleted();
+            SteeringManager.Reset();
+        }
+
+        protected override void OnAbandon()
+        {
+            base.OnAbandon();
+            SteeringManager.Reset();
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs

@@ -47,31 +47,25 @@ namespace Barotrauma
             }
             if (character.CurrentHull == null)
             {
-                if (!character.NeedsAir)
-                {
-                    Priority = 0;
-                }
-                else
-                {
-                    Priority = (
-                        objectiveManager.HasOrder<AIObjectiveGoTo>(o => o.Priority > 0) ||
-                        objectiveManager.HasOrder<AIObjectiveReturn>(o => o.Priority > 0) ||
-                        objectiveManager.HasActiveObjective<AIObjectiveRescue>() ||
-                        objectiveManager.Objectives.Any(o => o is AIObjectiveCombat && o.Priority > 0))
-                        && HumanAIController.HasDivingSuit(character) ? 0 : 100;
-                }
+                Priority = (
+                    objectiveManager.HasOrder<AIObjectiveGoTo>(o => o.Priority > 0) ||
+                    objectiveManager.HasOrder<AIObjectiveReturn>(o => o.Priority > 0) ||
+                    objectiveManager.HasActiveObjective<AIObjectiveRescue>() ||
+                    objectiveManager.Objectives.Any(o => o is AIObjectiveCombat && o.Priority > 0))
+                    && character.IsProtectedFromPressure ? 0 : 100;
             }
             else
             {
-                if (HumanAIController.NeedsDivingGear(character.CurrentHull, out bool needsSuit) && 
+                if ((character.IsLowInOxygen && !character.AnimController.HeadInWater && HumanAIController.HasDivingSuit(character, requireOxygenTank: false)) ||
+                    (HumanAIController.NeedsDivingGear(character.CurrentHull, out bool needsSuit) && 
                     (needsSuit ? 
                     !HumanAIController.HasDivingSuit(character, conditionPercentage: AIObjectiveFindDivingGear.GetMinOxygen(character)) : 
-                    !HumanAIController.HasDivingGear(character, conditionPercentage: AIObjectiveFindDivingGear.GetMinOxygen(character))))
+                    !HumanAIController.HasDivingGear(character, conditionPercentage: AIObjectiveFindDivingGear.GetMinOxygen(character)))))
                 {
                     Priority = 100;
                 }
                 else if ((objectiveManager.IsCurrentOrder<AIObjectiveGoTo>() || objectiveManager.IsCurrentOrder<AIObjectiveReturn>()) &&
-                         character.Submarine != null && !AIController.IsOnFriendlyTeam(character.TeamID, character.Submarine.TeamID))
+                         character.Submarine != null && !character.IsOnFriendlyTeam(character.Submarine.TeamID))
                 {
                     // Ordered to follow, hold position, or return back to main sub inside a hostile sub
                     // -> ignore find safety unless we need to find a diving gear
@@ -117,6 +111,11 @@ namespace Barotrauma
                 if (currenthullSafety > HumanAIController.HULL_SAFETY_THRESHOLD)
                 {
                     Priority -= priorityDecrease * deltaTime;
+                    if (currenthullSafety >= 100)
+                    {
+                        // Reduce the priority to zero so that the bot can get switch to other objectives immediately, e.g. when entering the airlock.
+                        Priority = 0;
+                    }
                 }
                 else
                 {
@@ -137,12 +136,14 @@ namespace Barotrauma
         private float retryTimer;
         protected override void Act(float deltaTime)
         {
+            if (resetPriority) { return; }
             var currentHull = character.CurrentHull;
-            bool dangerousPressure = currentHull == null || currentHull.LethalPressure > 0 && character.PressureProtection <= 0;
-            if (!character.LockHands && (!dangerousPressure || cannotFindSafeHull))
+            bool dangerousPressure = !character.IsProtectedFromPressure && (currentHull == null || currentHull.LethalPressure > 0);
+            bool shouldActOnSuffocation = character.IsLowInOxygen && !character.AnimController.HeadInWater && HumanAIController.HasDivingSuit(character, requireOxygenTank: false);
+            if (!character.LockHands && (!dangerousPressure || shouldActOnSuffocation || cannotFindSafeHull))
             {
                 bool needsDivingGear = HumanAIController.NeedsDivingGear(currentHull, out bool needsDivingSuit);
-                bool needsEquipment = false;
+                bool needsEquipment = shouldActOnSuffocation;
                 if (needsDivingSuit)
                 {
                     needsEquipment = !HumanAIController.HasDivingSuit(character, AIObjectiveFindDivingGear.GetMinOxygen(character));
@@ -218,7 +219,11 @@ namespace Barotrauma
                         TryAddSubObjective(ref goToObjective,
                         constructor: () => new AIObjectiveGoTo(currentSafeHull, character, objectiveManager, getDivingGearIfNeeded: true)
                         {
-                            AllowGoingOutside = HumanAIController.HasDivingSuit(character, conditionPercentage: 50)
+                            AllowGoingOutside =
+                                character.IsProtectedFromPressure ||
+                                character.CurrentHull == null || 
+                                character.CurrentHull.IsTaggedAirlock() ||
+                                character.CurrentHull.LeadsOutside(character)
                         },
                         onCompleted: () =>
                         {
@@ -349,8 +354,8 @@ namespace Barotrauma
                     //tends to make the method much faster, because we find a potential hull earlier and can discard further-away hulls more easily
                     //(for instance, an NPC in an outpost might otherwise go through all the hulls in the main sub first and do tons of expensive
                     //path calculations, only to discard all of them when going through the hulls in the outpost)
-                    float hullSuitability = EstimateHullSuitability(character, hull);                  
-                    if (!hulls.Any())
+                    float hullSuitability = EstimateHullSuitability(character, hull);
+                    if (hulls.None())
                     {
                         hulls.Add(hull);
                     }
@@ -445,9 +450,12 @@ namespace Barotrauma
                 {
                     hullSafety = 100;
                 }
+                float characterY = character.CurrentHull?.WorldPosition.Y ?? character.WorldPosition.Y;
+                float yDist = Math.Abs(characterY - potentialHull.WorldPosition.Y);
+                yDist = yDist > 100 ? yDist * 3 : 0;
+                float distance = Math.Abs(character.WorldPosition.X - potentialHull.WorldPosition.X) + yDist;
                 // Huge preference for closer targets
-                float distance = Vector2.DistanceSquared(character.WorldPosition, potentialHull.WorldPosition);
-                float distanceFactor = MathHelper.Lerp(1, 0.2f, MathUtils.InverseLerp(0, MathUtils.Pow(100000, 2), distance));
+                float distanceFactor = MathHelper.Lerp(1, 0.2f, MathUtils.InverseLerp(0, 10000, distance));
                 hullSafety *= distanceFactor;
                 // If the target is not inside a friendly submarine, considerably reduce the hull safety.
                 // Intentionally exclude wrecks from this check

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFixLeak.cs

@@ -155,17 +155,21 @@ namespace Barotrauma
             bool canOperate = toLeak.LengthSquared() < reach * reach;
             if (canOperate)
             {
-                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: Identifier.Empty, requireEquip: true, operateTarget: Leak), 
-                    onAbandon: () => Abandon = true,
-                    onCompleted: () =>
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: Identifier.Empty, requireEquip: true, operateTarget: Leak)
+                {
+                    // Use an empty filter to override the default
+                    EndNodeFilter = n => true
+                }, 
+                onAbandon: () => Abandon = true,
+                onCompleted: () =>
+                {
+                    if (CheckObjectiveSpecific()) { IsCompleted = true; }
+                    else
                     {
-                        if (CheckObjectiveSpecific()) { IsCompleted = true; }
-                        else
-                        {
-                            // Failed to operate. Probably too far.
-                            Abandon = true;
-                        }
-                    });
+                        // Failed to operate. Probably too far.
+                        Abandon = true;
+                    }
+                });
             }
             else
             {
@@ -178,7 +182,7 @@ namespace Barotrauma
                     requiredCondition = () => 
                         Leak.Submarine == character.Submarine &&
                         Leak.linkedTo.Any(e => e is Hull h && (character.CurrentHull == h || h.linkedTo.Contains(character.CurrentHull))),
-                    endNodeFilter = n => n.Waypoint.CurrentHull != null && Leak.linkedTo.Any(e => e is Hull h && h == n.Waypoint.CurrentHull),
+                    endNodeFilter = IsSuitableEndNode,
                     // The Go To objective can be abandoned if the leak is fixed (in which case we don't want to use the dialogue)
                     SpeakCannotReachCondition = () => !CheckObjectiveSpecific()
                 },
@@ -197,6 +201,14 @@ namespace Barotrauma
                     }
                 },
                 onCompleted: () => RemoveSubObjective(ref gotoObjective));
+
+                bool IsSuitableEndNode(PathNode n)
+                {
+                    if (n.Waypoint.CurrentHull is null) { return false; }
+                    if (n.Waypoint.CurrentHull.ConnectedGaps.Contains(Leak)) { return true; }
+                    // Accept also nodes located in the linked hulls (multi-hull rooms)
+                    return Leak.linkedTo.Any(e => e is Hull h && h.linkedTo.Contains(n.Waypoint.CurrentHull));
+                }
             }
         }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs

@@ -54,7 +54,7 @@ namespace Barotrauma
         public bool AllowVariants { get; set; }
         public bool Equip { get; set; }
         public bool Wear { get; set; }
-        public bool RequireLoaded { get; set; }
+        public bool RequireNonEmpty { get; set; }
         public bool EvaluateCombatPriority { get; set; }
         public bool CheckPathForEachItem { get; set; }
         public bool SpeakIfFails { get; set; }
@@ -123,6 +123,11 @@ namespace Barotrauma
             return ignoredTags;
         }
 
+        public static Func<PathNode, bool> CreateEndNodeFilter(ISpatialEntity targetEntity)
+        {
+            return n => (n.Waypoint.Ladders == null || n.Waypoint.IsInWater) && Vector2.DistanceSquared(n.Waypoint.WorldPosition, targetEntity.WorldPosition) <= MathUtils.Pow2(DefaultReach);
+        }
+
         private bool CheckInventory()
         {
             if (IdentifiersOrTags == null) { return false; }
@@ -155,11 +160,6 @@ namespace Barotrauma
                 Abandon = true;
                 return;
             }
-            if (character.Submarine == null)
-            {
-                Abandon = true;
-                return;
-            }
             if (IdentifiersOrTags != null && !isDoneSeeking)
             {
                 if (checkInventory)
@@ -171,9 +171,14 @@ namespace Barotrauma
                 }
                 if (!isDoneSeeking)
                 {
+                    if (character.Submarine == null)
+                    {
+                        Abandon = true;
+                        return;
+                    }
                     if (!AllowDangerousPressure)
                     {
-                        bool dangerousPressure = character.CurrentHull == null || character.CurrentHull.LethalPressure > 0 && character.PressureProtection <= 0;
+                        bool dangerousPressure = !character.IsProtectedFromPressure && (character.CurrentHull == null || character.CurrentHull.LethalPressure > 0);
                         if (dangerousPressure)
                         {
 #if DEBUG
@@ -192,6 +197,11 @@ namespace Barotrauma
                     return;
                 }
             }
+            else if (character.Submarine == null)
+            {
+                Abandon = true;
+                return;
+            }
             if (targetItem == null || targetItem.Removed)
             {
 #if DEBUG
@@ -307,7 +317,8 @@ namespace Barotrauma
                         {
                             // If the root container changes, the item is no longer where it was (taken by someone -> need to find another item)
                             AbortCondition = obj => targetItem == null || targetItem.GetRootInventoryOwner() != moveToTarget,
-                            SpeakIfFails = false
+                            SpeakIfFails = false,
+                            endNodeFilter = CreateEndNodeFilter(moveToTarget)
                         };
                     },
                     onAbandon: () =>
@@ -391,10 +402,10 @@ namespace Barotrauma
                 {
                     if (!itemInventory.Container.HasRequiredItems(character, addMessage: false)) { continue; }
                 }
-                float itemPriority = 1;
+                float itemPriority = item.Prefab.BotPriority;
                 if (GetItemPriority != null)
                 {
-                    itemPriority = GetItemPriority(item);
+                    itemPriority *= GetItemPriority(item);
                 }
                 Entity rootInventoryOwner = item.GetRootInventoryOwner();
                 if (rootInventoryOwner is Item ownerItem)
@@ -513,7 +524,7 @@ namespace Barotrauma
             float lowestCost = float.MaxValue;
             foreach (MapEntityPrefab prefab in MapEntityPrefab.List)
             {
-                if (!(prefab is ItemPrefab itemPrefab)) { continue; }
+                if (prefab is not ItemPrefab itemPrefab) { continue; }
                 if (IdentifiersOrTags.Any(id => id == prefab.Identifier || prefab.Tags.Contains(id)))
                 {
                     float cost = itemPrefab.DefaultPrice != null && itemPrefab.CanBeBought ?
@@ -561,7 +572,7 @@ namespace Barotrauma
             if (ignoredIdentifiersOrTags != null && CheckItemIdentifiersOrTags(item, ignoredIdentifiersOrTags)) { return false; }
             if (item.Condition < TargetCondition) { return false; }
             if (ItemFilter != null && !ItemFilter(item)) { return false; }
-            if (RequireLoaded && item.Components.Any(i => !i.IsLoaded(character))) { return false; }
+            if (RequireNonEmpty && item.Components.Any(i => !i.IsNotEmpty(character))) { return false; }
             return CheckItemIdentifiersOrTags(item, IdentifiersOrTags) || (AllowVariants && !item.Prefab.VariantOf.IsEmpty && IdentifiersOrTags.Contains(item.Prefab.VariantOf));
         }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItems.cs

@@ -21,7 +21,7 @@ namespace Barotrauma
         public bool CheckInventory { get; set; }
         public bool EvaluateCombatPriority { get; set; }
         public bool CheckPathForEachItem { get; set; }
-        public bool RequireLoaded { get; set; }
+        public bool RequireNonEmpty { get; set; }
         public bool RequireAllItems { get; set; }
 
         private readonly ImmutableArray<Identifier> gearTags;
@@ -61,7 +61,7 @@ namespace Barotrauma
                             AllowStealing = AllowStealing,
                             ignoredIdentifiersOrTags = ignoredTags,
                             CheckPathForEachItem = CheckPathForEachItem,
-                            RequireLoaded = RequireLoaded,
+                            RequireNonEmpty = RequireNonEmpty,
                             ItemCount = count,
                             SpeakIfFails = RequireAllItems
                         },

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs

@@ -50,6 +50,7 @@ namespace Barotrauma
         private readonly float minDistance = 50;
         private readonly float seekGapsInterval = 1;
         private float seekGapsTimer;
+        private bool cantFindDivingGear;
 
         /// <summary>
         /// Display units
@@ -90,7 +91,7 @@ namespace Barotrauma
         /// </summary>
         public bool UseDistanceRelativeToAimSourcePos { get; set; } = false;
 
-        public override bool AbandonWhenCannotCompleteSubjectives => !repeat;
+        public override bool AbandonWhenCannotCompleteSubjectives => false;
 
         public override bool AllowOutsideSubmarine => AllowGoingOutside;
         public override bool AllowInAnySub => true;
@@ -263,48 +264,73 @@ namespace Barotrauma
             }
             if (!Abandon)
             {
-                if (getDivingGearIfNeeded && !character.LockHands)
+                if (getDivingGearIfNeeded)
                 {
                     Character followTarget = Target as Character;
-                    bool needsDivingSuit = (!isInside || hasOutdoorNodes) && character.NeedsAir && !character.HasAbilityFlag(AbilityFlags.ImmuneToPressure);
-                    bool needsDivingGear = needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit);
-                    if (Mimic)
+                    bool needsDivingSuit = (!isInside || hasOutdoorNodes) && !character.IsImmuneToPressure;
+                    bool tryToGetDivingGear = needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit);
+                    bool tryToGetDivingSuit = needsDivingSuit;
+                    if (Mimic && !character.IsImmuneToPressure)
                     {
                         if (HumanAIController.HasDivingSuit(followTarget))
                         {
-                            needsDivingGear = true;
-                            needsDivingSuit = true;
+                            tryToGetDivingGear = true;
+                            tryToGetDivingSuit = true;
                         }
-                        else if (HumanAIController.HasDivingMask(followTarget))
+                        else if (HumanAIController.HasDivingMask(followTarget) && character.CharacterHealth.OxygenLowResistance < 1)
                         {
-                            needsDivingGear = true;
+                            tryToGetDivingGear = true;
                         }
                     }
                     bool needsEquipment = false;
                     float minOxygen = AIObjectiveFindDivingGear.GetMinOxygen(character);
-                    if (needsDivingSuit)
+                    if (tryToGetDivingSuit)
                     {
                         needsEquipment = !HumanAIController.HasDivingSuit(character, minOxygen);
                     }
-                    else if (needsDivingGear)
+                    else if (tryToGetDivingGear)
                     {
                         needsEquipment = !HumanAIController.HasDivingGear(character, minOxygen);
                     }
-                    if (needsEquipment)
+                    if (character.LockHands)
+                    {
+                        cantFindDivingGear = true;
+                    }
+                    if (cantFindDivingGear && needsDivingSuit)
+                    {
+                        // Don't try to reach the target without a suit because it's lethal.
+                        Abandon = true;
+                        return;
+                    }
+                    if (needsEquipment && !cantFindDivingGear)
                     {
                         SteeringManager.Reset();
-                        if (findDivingGear != null && !findDivingGear.CanBeCompleted)
-                        {
-                            TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit: false, objectiveManager),
-                                onAbandon: () => Abandon = true,
-                                onCompleted: () => RemoveSubObjective(ref findDivingGear));
-                        }
-                        else
-                        {
-                            TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit, objectiveManager),
-                                onAbandon: () => Abandon = true,
-                                onCompleted: () => RemoveSubObjective(ref findDivingGear));
-                        }
+                        TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit: tryToGetDivingSuit, objectiveManager),
+                            onAbandon: () =>
+                            {
+                            cantFindDivingGear = true;
+                            if (needsDivingSuit)
+                            {
+                                // Shouldn't try to reach the target without a suit, because it's lethal.
+                                Abandon = true;
+                            }
+                            else
+                            {
+                                // Try again without requiring the diving suit
+                                RemoveSubObjective(ref findDivingGear);
+                                TryAddSubObjective(ref findDivingGear, () => new AIObjectiveFindDivingGear(character, needsDivingSuit: false, objectiveManager),
+                                    onAbandon: () =>
+                                    {
+                                        Abandon = character.CurrentHull != null && (objectiveManager.CurrentOrder != this || Target.Submarine == null);
+                                        RemoveSubObjective(ref findDivingGear);
+                                    },
+                                    onCompleted: () =>
+                                    {
+                                        RemoveSubObjective(ref findDivingGear);
+                                    });
+                                }
+                            },
+                            onCompleted: () => RemoveSubObjective(ref findDivingGear));
                         return;
                     }
                 }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -170,7 +170,8 @@ namespace Barotrauma
                 TargetHull = character.CurrentHull;
             }
 
-            if (behavior == BehaviorType.StayInHull)
+            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
+            if (behavior == BehaviorType.StayInHull && !currentTargetIsInvalid)
             {
                 currentTarget = TargetHull;
                 bool stayInHull = character.CurrentHull == currentTarget && IsSteeringFinished() && !character.IsClimbing;
@@ -190,9 +191,6 @@ namespace Barotrauma
             }
             else
             {
-                bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) ||
-                    (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
-
                 if (currentTarget != null && !currentTargetIsInvalid)
                 {
                     if (character.TeamID == CharacterTeamType.FriendlyNPC && !character.IsEscorted)

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveManager.cs

@@ -364,8 +364,7 @@ namespace Barotrauma
                     CurrentOrders.RemoveAt(i);
                     continue;
                 }
-                var currentOrderInfo = character.GetCurrentOrder(currentOrder);
-                if (currentOrderInfo is Order)
+                if (character.GetCurrentOrder(currentOrder) is Order currentOrderInfo)
                 {
                     int currentPriority = currentOrderInfo.ManualPriority;
                     if (currentOrder.ManualPriority != currentPriority)
@@ -539,7 +538,8 @@ namespace Barotrauma
                         KeepActiveWhenReady = true,
                         CheckInventory = true,
                         Equip = false,
-                        FindAllItems = true
+                        FindAllItems = true,
+                        RequireNonEmpty = false
                     };
                     break;
                 case "findweapon":
@@ -555,7 +555,8 @@ namespace Barotrauma
                             KeepActiveWhenReady = false,
                             CheckInventory = false,
                             EvaluateCombatPriority = true,
-                            FindAllItems = false
+                            FindAllItems = false,
+                            RequireNonEmpty = true
                         };
                     }
                     prepareObjective.KeepActiveWhenReady = false;
@@ -600,9 +601,9 @@ namespace Barotrauma
 
             Order dismissOrder = currentOrder.GetDismissal();
 #if CLIENT
-            if (GameMain.GameSession?.CrewManager != null && GameMain.GameSession.CrewManager.IsSinglePlayer)
+            if (GameMain.GameSession?.CrewManager is CrewManager cm && cm.IsSinglePlayer)
             {
-                GameMain.GameSession.CrewManager.SetCharacterOrder(character, dismissOrder);
+                character.SetOrder(dismissOrder, isNewOrder: true, speak: false);
             }
 #else
             GameMain.Server?.SendOrderChatMessage(new OrderChatMessage(dismissOrder, character, character));

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -23,6 +23,11 @@ namespace Barotrauma
         private AIObjectiveGoTo goToObjective;
         private AIObjectiveGetItem getItemObjective;
 
+        /// <summary>
+        /// If undefined, a default filter will be used.
+        /// </summary>
+        public Func<PathNode, bool> EndNodeFilter;
+
         public bool Override { get; set; } = true;
 
         public override bool CanBeCompleted => base.CanBeCompleted && (!useController || controller != null);
@@ -232,7 +237,7 @@ namespace Barotrauma
                     TryAddSubObjective(ref goToObjective, () => new AIObjectiveGoTo(target.Item, character, objectiveManager, closeEnough: 50)
                     {
                         TargetName = target.Item.Name,
-                        endNodeFilter = node => node.Waypoint.Ladders == null
+                        endNodeFilter = EndNodeFilter ?? AIObjectiveGetItem.CreateEndNodeFilter(target.Item)
                     },
                         onAbandon: () => Abandon = true,
                         onCompleted: () => RemoveSubObjective(ref goToObjective));

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectivePrepare.cs

@@ -27,6 +27,7 @@ namespace Barotrauma
         public bool FindAllItems { get; set; }
         public bool Equip { get; set; }
         public bool EvaluateCombatPriority { get; set; }
+        public bool RequireNonEmpty { get; set; }
 
         private AIObjective GetSubObjective()
         {
@@ -74,7 +75,7 @@ namespace Barotrauma
                     Abandon = true;
 
                 }
-                else if (items.Any(i => i.Components.Any(i => !i.IsLoaded(character))))
+                else if (items.Any(i => i.Components.Any(i => !i.IsNotEmpty(character))))
                 {
                     Reset();
                 }
@@ -106,7 +107,7 @@ namespace Barotrauma
                             CheckInventory = CheckInventory,
                             Equip = Equip,
                             EvaluateCombatPriority = EvaluateCombatPriority,
-                            RequireLoaded = true,
+                            RequireNonEmpty = RequireNonEmpty,
                             RequireAllItems = requireAll
                         },
                         onCompleted: () =>
@@ -157,7 +158,7 @@ namespace Barotrauma
                         {
                             EvaluateCombatPriority = EvaluateCombatPriority,
                             SpeakIfFails = true,
-                            RequireLoaded = true
+                            RequireNonEmpty = RequireNonEmpty
                         };
                     }
                     if (!TryAddSubObjective(ref getSingleItemObjective, getItemConstructor,

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRepairItem.cs

@@ -17,7 +17,6 @@ namespace Barotrauma
 
         private AIObjectiveGoTo goToObjective;
         private AIObjectiveContainItem refuelObjective;
-        private float previousCondition = -1;
         private RepairTool repairTool;
 
         private const float WaitTimeBeforeRepair = 0.5f;
@@ -196,15 +195,7 @@ namespace Barotrauma
                                 Abandon = true;
                             }
                         }
-                        if (previousCondition == -1)
-                        {
-                            previousCondition = Item.Condition;
-                        }
-                        else if (Item.Condition < previousCondition)
-                        {
-                            // If the current condition is less than the previous condition, we can't complete the task, so let's abandon it. The item is probably deteriorating at a greater speed than we can repair it.
-                            Abandon = true;
-                        }
+                        CheckPreviousCondition(deltaTime);
                     }
                     if (Abandon)
                     {
@@ -229,7 +220,6 @@ namespace Barotrauma
                 TryAddSubObjective(ref goToObjective,
                     constructor: () =>
                     {
-                        previousCondition = -1;
                         var objective = new AIObjectiveGoTo(Item, character, objectiveManager)
                         {
                             TargetName = Item.Name
@@ -251,6 +241,27 @@ namespace Barotrauma
             }
         }
 
+        private const float conditionCheckDelay = 1;
+        private float conditionCheckTimer;
+        private float previousCondition;
+        private void CheckPreviousCondition(float deltaTime)
+        {
+            if (Item == null || Item.Removed) { return; }
+            conditionCheckTimer -= deltaTime;
+            if (conditionCheckTimer > 0) { return; }
+            conditionCheckTimer = conditionCheckDelay;
+            if (previousCondition > -1 && Item.Condition < previousCondition)
+            {
+                // If the current condition is less than the previous condition, we can't complete the task, so let's abandon it. The item is probably deteriorating at a greater speed than we can repair it.
+                Abandon = true;
+            }
+            else
+            {
+                // If the previous condition is not yet stored or if it's valid (greater or equal to current condition), save the condition for the next check here.
+                previousCondition = Item.Condition;
+            }
+        }
+
         private void FindRepairTool()
         {
             foreach (Repairable repairable in Item.Repairables)
@@ -303,7 +314,6 @@ namespace Barotrauma
             base.Reset();
             goToObjective = null;
             refuelObjective = null;
-            previousCondition = -1;
             repairTool = null;
         }
     }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRescue.cs

@@ -320,10 +320,10 @@ namespace Barotrauma
                     foreach (KeyValuePair<Identifier, float> treatmentSuitability in currentTreatmentSuitabilities)
                     {
                         if (treatmentSuitability.Value <= cprSuitability) { continue; }
-                        if (MapEntityPrefab.Find(null, treatmentSuitability.Key, showErrorMessages: false) is ItemPrefab itemPrefab)
+                        if (ItemPrefab.Prefabs.TryGet(treatmentSuitability.Key, out ItemPrefab itemPrefab))
                         {
-                            if (!Item.ItemList.Any(it => ((MapEntity)it).Prefab.Identifier == treatmentSuitability.Key)) { continue; }
-                            suitableItemIdentifiers.Add(treatmentSuitability.Key);
+                            if (Item.ItemList.None(it => it.Prefab.Identifier == treatmentSuitability.Key)) { continue; }
+                            suitableItemIdentifiers.Add(itemPrefab.Identifier);
                             //only list the first 4 items
                             if (itemNameList.Count < 4)
                             {
@@ -482,18 +482,6 @@ namespace Barotrauma
 
         public static IEnumerable<Affliction> GetSortedAfflictions(Character character, bool excludeBuffs = true) => CharacterHealth.SortAfflictionsBySeverity(character.CharacterHealth.GetAllAfflictions(), excludeBuffs);
 
-        public static IEnumerable<Affliction> GetTreatableAfflictions(Character character)
-        {
-            var allAfflictions = character.CharacterHealth.GetAllAfflictions();
-            foreach (Affliction affliction in allAfflictions)
-            {
-                if (affliction.Prefab.IsBuff || affliction.Strength < affliction.Prefab.TreatmentThreshold) { continue; }
-                if (!affliction.Prefab.TreatmentSuitability.Any(kvp => kvp.Value > 0)) { continue; }
-                if (allAfflictions.Any(otherAffliction => affliction.Prefab.IgnoreTreatmentIfAfflictedBy.Contains(otherAffliction.Identifier))) { continue; }
-                yield return affliction;
-            }
-        }
-
         public override void Reset()
         {
             base.Reset();

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRescueAll.cs

@@ -26,7 +26,7 @@ namespace Barotrauma
                 // When targeting player characters, always treat them when ordered, else use the threshold so that minor/non-severe damage is ignored.
                 // If we ignore any damage when the player orders a bot to do healings, it's observed to cause confusion among the players.
                 // On the other hand, if the bots too eagerly heal characters when it's not necessary, it's inefficient and can feel frustrating, because it can't be controlled.
-                return character == target || manager.HasOrder<AIObjectiveRescueAll>() ? (target.IsPlayer ? 100 : vitalityThresholdForOrders) : vitalityThreshold;
+                return character == target || manager.HasOrder<AIObjectiveRescueAll>() ? (target.IsPlayer && target.HealthPercentage < 100 ? 100 : vitalityThresholdForOrders) : vitalityThreshold;
             }
         }
         
@@ -67,15 +67,34 @@ namespace Barotrauma
             float vitality = 100;
             vitality -= character.Bleeding * 2;
             vitality += Math.Min(character.Oxygen, 0);
-            vitality -= character.CharacterHealth.GetAfflictionStrength("paralysis");
-            foreach (Affliction affliction in AIObjectiveRescue.GetTreatableAfflictions(character))
+            foreach (Affliction affliction in GetTreatableAfflictions(character))
             {
                 float strength = character.CharacterHealth.GetPredictedStrength(affliction, predictFutureDuration: 10.0f);
                 vitality -= affliction.GetVitalityDecrease(character.CharacterHealth, strength) / character.MaxVitality * 100;
+                if (affliction.Prefab.AfflictionType == AfflictionPrefab.ParalysisType)
+                {
+                    vitality -= affliction.Strength;
+                }
+                else if (affliction.Prefab.AfflictionType == AfflictionPrefab.PoisonType)
+                {
+                    vitality -= affliction.Strength;
+                }
             }
             return Math.Clamp(vitality, 0, 100);
         }
 
+        public static IEnumerable<Affliction> GetTreatableAfflictions(Character character)
+        {
+            var allAfflictions = character.CharacterHealth.GetAllAfflictions();
+            foreach (Affliction affliction in allAfflictions)
+            {
+                if (affliction.Prefab.IsBuff || affliction.Strength < affliction.Prefab.TreatmentThreshold) { continue; }
+                if (affliction.Prefab.TreatmentSuitability.None(kvp => kvp.Value > 0)) { continue; }
+                if (allAfflictions.Any(otherAffliction => affliction.Prefab.IgnoreTreatmentIfAfflictedBy.Contains(otherAffliction.Identifier))) { continue; }
+                yield return affliction;
+            }
+        }
+
         protected override AIObjective ObjectiveConstructor(Character target)
             => new AIObjectiveRescue(character, target, objectiveManager, PriorityModifier);
 

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveReturn.cs

@@ -12,6 +12,9 @@ namespace Barotrauma
         private AIObjectiveGoTo moveInsideObjective, moveOutsideObjective;
         private bool usingEscapeBehavior, isSteeringThroughGap;
 
+        public override bool AllowOutsideSubmarine => true;
+        public override bool AllowInAnySub => true;
+
         public AIObjectiveReturn(Character character, Character orderGiver, AIObjectiveManager objectiveManager, float priorityModifier = 1.0f) : base(character, objectiveManager, priorityModifier)
         {
             ReturnTarget = GetReturnTarget(Submarine.MainSubs) ?? GetReturnTarget(Submarine.Loaded);

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Wreck/WreckAI.cs

@@ -27,6 +27,15 @@ namespace Barotrauma
                     turrets.Add(turret);
                     // Set false, because we manage the turrets in the Update method.
                     turret.AutoOperate = false;
+                    // Set to full condition, because items don't work when they are broken.
+                    turret.Item.Condition = turret.Item.MaxCondition;
+                    foreach (MapEntity linkedEntity in turret.Item.linkedTo)
+                    {
+                        if (linkedEntity is Item linkedItem)
+                        {
+                            linkedItem.Condition = linkedItem.MaxCondition;
+                        }
+                    }
                 }
             }
             LoadAllTurrets();
@@ -264,27 +273,52 @@ namespace Barotrauma
                 }
             }
             destroyedOrgans.ForEach(o => spawnOrgans.Remove(o));
-            bool someoneNearby = false;
+            bool isSomeoneNearby = false;
             float minDist = Sonar.DefaultSonarRange * 2.0f;
-            foreach (Submarine submarine in Submarine.Loaded)
+#if SERVER
+            foreach (var client in GameMain.Server.ConnectedClients)
             {
-                if (submarine.Info.Type != SubmarineType.Player) { continue; }
-                if (Vector2.DistanceSquared(submarine.WorldPosition, Submarine.WorldPosition) < minDist * minDist)
+                var spectatePos = client.SpectatePos;
+                if (spectatePos.HasValue)
                 {
-                    someoneNearby = true;
-                    break;
+                    if (IsCloseEnough(spectatePos.Value, minDist))
+                    {
+                        isSomeoneNearby = true;
+                        break;
+                    }
                 }
             }
-            foreach (Character c in Character.CharacterList)
+#else
+            if (IsCloseEnough(GameMain.GameScreen.Cam.Position, minDist))
             {
-                if (c != Character.Controlled && !c.IsRemotePlayer) { continue; }
-                if (Vector2.DistanceSquared(c.WorldPosition, Submarine.WorldPosition) < minDist * minDist)
+                isSomeoneNearby = true;
+            }
+#endif
+            if (!isSomeoneNearby)
+            {
+                foreach (Submarine submarine in Submarine.Loaded)
                 {
-                    someoneNearby = true;
-                    break;
+                    if (submarine.Info.Type != SubmarineType.Player) { continue; }
+                    if (IsCloseEnough(submarine.WorldPosition, minDist))
+                    {
+                        isSomeoneNearby = true;
+                        break;
+                    }
                 }
             }
-            if (!someoneNearby) { return; }
+            if (!isSomeoneNearby)
+            {
+                foreach (Character c in Character.CharacterList)
+                {
+                    if (!c.IsPlayer && !c.IsOnPlayerTeam) { continue; }
+                    if (IsCloseEnough(c.WorldPosition, minDist))
+                    {
+                        isSomeoneNearby = true;
+                        break;
+                    }
+                }
+            }
+            if (!isSomeoneNearby) { return; }
             OperateTurrets(deltaTime, Config.Entity);
             if (!IsClient)
             {
@@ -292,6 +326,7 @@ namespace Barotrauma
                 UpdateReinforcements(deltaTime);
             }
         }
+        private bool IsCloseEnough(Vector2 targetPos, float minDist) => Vector2.DistanceSquared(targetPos, Submarine.WorldPosition) < minDist * minDist;
 
         private void SpawnInitialCells()
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/AnimController.cs

@@ -541,11 +541,11 @@ namespace Barotrauma
             float wobbleStrength = 0.0f;
             if (character.Inventory?.GetItemInLimbSlot(InvSlotType.RightHand) == heldItem)
             {
-                wobbleStrength += Character.CharacterHealth.GetLimbDamage(rightHand, afflictionType: "damage");
+                wobbleStrength += Character.CharacterHealth.GetLimbDamage(rightHand, afflictionType: AfflictionPrefab.DamageType);
             }
             if (character.Inventory?.GetItemInLimbSlot(InvSlotType.LeftHand) == heldItem)
             {
-                wobbleStrength += Character.CharacterHealth.GetLimbDamage(leftHand, afflictionType: "damage");
+                wobbleStrength += Character.CharacterHealth.GetLimbDamage(leftHand, afflictionType: AfflictionPrefab.DamageType);
             }
             if (wobbleStrength <= 0.1f) { return 0.0f; }
             wobbleStrength = (float)Math.Min(wobbleStrength, 1.0f);

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs

@@ -150,8 +150,10 @@ namespace Barotrauma
 
         private readonly float movementLerp;
 
-        private float cprAnimTimer;
-        private float cprPump;
+        private float cprAnimTimer,cprPump;
+
+        private float fallingProneAnimTimer;
+        const float FallingProneAnimDuration = 1.0f;
 
         private bool swimming;
         //time until the character can switch from walking to swimming or vice versa
@@ -268,7 +270,8 @@ namespace Barotrauma
                 if (deathAnimTimer < deathAnimDuration)
                 {
                     deathAnimTimer += deltaTime;
-                    UpdateDying(deltaTime);
+                    //the force/torque used to move the limbs goes from 1 to 0 during the death anim duration
+                    UpdateFallingProne(1.0f - deathAnimTimer / deathAnimDuration);
                 }
             }
             else
@@ -278,6 +281,11 @@ namespace Barotrauma
 
             if (!character.CanMove)
             {
+                if (fallingProneAnimTimer < FallingProneAnimDuration)
+                {
+                    fallingProneAnimTimer += deltaTime;
+                    UpdateFallingProne(1.0f);
+                }
                 levitatingCollider = false;
                 Collider.FarseerBody.FixedRotation = false;
                 if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
@@ -291,18 +299,20 @@ namespace Barotrauma
                 }
                 return;
             }
+            fallingProneAnimTimer = 0.0f;
 
             //re-enable collider
             if (!Collider.Enabled)
             {
                 var lowestLimb = FindLowestLimb();
-                
+
                 Collider.SetTransform(new Vector2(
                     Collider.SimPosition.X,
                     Math.Max(lowestLimb.SimPosition.Y + (Collider.Radius + Collider.Height / 2), Collider.SimPosition.Y)),
                     Collider.Rotation);
                 
                 Collider.FarseerBody.ResetDynamics();
+                Collider.FarseerBody.LinearVelocity = MainLimb.LinearVelocity;
                 Collider.Enabled = true;
             }            
 
@@ -444,12 +454,13 @@ namespace Barotrauma
             aiming = false;
             wasAimingMelee = aimingMelee;
             aimingMelee = false;
-            IsHanging = false;
+            IsHanging = IsHanging && character.IsRagdolled;
         }
 
         void UpdateStanding()
         {
-            if (CurrentGroundedParams == null) { return; }
+            var currentGroundedParams = CurrentGroundedParams;
+            if (currentGroundedParams == null) { return; }
             Vector2 handPos;
 
             Limb leftFoot = GetLimb(LimbType.LeftFoot);
@@ -472,7 +483,7 @@ namespace Barotrauma
                 walkCycleMultiplier *= 1.5f;                
             }
 
-            float getUpForce = CurrentGroundedParams.GetUpForce / RagdollParams.JointScale;
+            float getUpForce = currentGroundedParams.GetUpForce / RagdollParams.JointScale;
 
             Vector2 colliderPos = GetColliderBottom();
             if (Math.Abs(TargetMovement.X) > 1.0f)
@@ -573,7 +584,7 @@ namespace Barotrauma
                 }
                 
                 float stepLift = TargetMovement.X == 0.0f ? 0 : 
-                    (float)Math.Sin(WalkPos * CurrentGroundedParams.StepLiftFrequency + MathHelper.Pi * CurrentGroundedParams.StepLiftOffset) * (CurrentGroundedParams.StepLiftAmount / 100);
+                    (float)Math.Sin(WalkPos * currentGroundedParams.StepLiftFrequency + MathHelper.Pi * currentGroundedParams.StepLiftOffset) * (currentGroundedParams.StepLiftAmount / 100);
 
                 float y = colliderPos.Y + stepLift;
 
@@ -588,7 +599,7 @@ namespace Barotrauma
 
                 if (!head.Disabled)
                 {
-                    y = colliderPos.Y + stepLift * CurrentGroundedParams.StepLiftHeadMultiplier;
+                    y = colliderPos.Y + stepLift * currentGroundedParams.StepLiftHeadMultiplier;
                     if (HeadPosition.HasValue) { y += HeadPosition.Value; }
                     if (Crouching && !movingHorizontally) { y -= HumanCrouchParams.MoveDownAmountWhenStationary; }
                     head.PullJointWorldAnchorB =
@@ -605,18 +616,18 @@ namespace Barotrauma
             if (TorsoAngle.HasValue && !torso.Disabled)
             {
                 float torsoAngle = TorsoAngle.Value;
-                float herpesStrength = character.CharacterHealth.GetAfflictionStrength("spaceherpes");
+                float herpesStrength = character.CharacterHealth.GetAfflictionStrength(AfflictionPrefab.SpaceHerpesType);
                 if (Crouching && !movingHorizontally && !Aiming) { torsoAngle -= HumanCrouchParams.ExtraTorsoAngleWhenStationary; }
                 torsoAngle -= herpesStrength / 150.0f;
-                torso.body.SmoothRotate(torsoAngle * Dir, CurrentGroundedParams.TorsoTorque);
+                torso.body.SmoothRotate(torsoAngle * Dir, currentGroundedParams.TorsoTorque);
             }
             if (!head.Disabled)
             {
-                if (!Aiming && CurrentGroundedParams.FixedHeadAngle && HeadAngle.HasValue)
+                if (!Aiming && currentGroundedParams.FixedHeadAngle && HeadAngle.HasValue)
                 {
                     float headAngle = HeadAngle.Value;
                     if (Crouching && !movingHorizontally) { headAngle -= HumanCrouchParams.ExtraHeadAngleWhenStationary; }
-                    head.body.SmoothRotate(headAngle * Dir, CurrentGroundedParams.HeadTorque);
+                    head.body.SmoothRotate(headAngle * Dir, currentGroundedParams.HeadTorque);
                 }
                 else
                 {
@@ -655,16 +666,16 @@ namespace Barotrauma
                     if (footPos.Y < 0.0f) { footPos.Y = -0.15f; }
 
                     //make the character limp if the feet are damaged
-                    float footAfflictionStrength = character.CharacterHealth.GetAfflictionStrength("damage", foot, true);
+                    float footAfflictionStrength = character.CharacterHealth.GetAfflictionStrength(AfflictionPrefab.DamageType, foot, true);
                     footPos.X *= MathHelper.Lerp(1.0f, 0.75f, MathHelper.Clamp(footAfflictionStrength / 50.0f, 0.0f, 1.0f));
 
-                    if (CurrentGroundedParams.FootLiftHorizontalFactor > 0)
+                    if (currentGroundedParams.FootLiftHorizontalFactor > 0)
                     {
                         // Calculate the foot y dynamically based on the foot position relative to the waist,
                         // so that the foot aims higher when it's behind the waist and lower when it's in the front.
                         float xDiff = (foot.SimPosition.X - waistPos.X + FootMoveOffset.X) * Dir;
-                        float min = MathUtils.InverseLerp(1, 0, CurrentGroundedParams.FootLiftHorizontalFactor);
-                        float max = 1 + MathUtils.InverseLerp(0, 1, CurrentGroundedParams.FootLiftHorizontalFactor);
+                        float min = MathUtils.InverseLerp(1, 0, currentGroundedParams.FootLiftHorizontalFactor);
+                        float max = 1 + MathUtils.InverseLerp(0, 1, currentGroundedParams.FootLiftHorizontalFactor);
                         float xFactor = MathHelper.Lerp(min, max, MathUtils.InverseLerp(RagdollParams.JointScale, -RagdollParams.JointScale, xDiff));
                         footPos.Y *= xFactor;
                     }
@@ -688,19 +699,19 @@ namespace Barotrauma
                     {
                         foot.DebugRefPos = colliderPos;
                         foot.DebugTargetPos = colliderPos + footPos;
-                        MoveLimb(foot, colliderPos + footPos, CurrentGroundedParams.FootMoveStrength);
+                        MoveLimb(foot, colliderPos + footPos, currentGroundedParams.FootMoveStrength);
                         FootIK(foot, colliderPos + footPos, 
-                            CurrentGroundedParams.LegBendTorque, CurrentGroundedParams.FootTorque, CurrentGroundedParams.FootAngleInRadians);
+                            currentGroundedParams.LegBendTorque, currentGroundedParams.FootTorque, currentGroundedParams.FootAngleInRadians);
                     }
                 }
 
                 //calculate the positions of hands
                 handPos = torso.SimPosition;
-                handPos.X = -walkPosX * CurrentGroundedParams.HandMoveAmount.X;
+                handPos.X = -walkPosX * currentGroundedParams.HandMoveAmount.X;
 
-                float lowerY = CurrentGroundedParams.HandClampY;
+                float lowerY = currentGroundedParams.HandClampY;
 
-                handPos.Y = lowerY + (float)(Math.Abs(Math.Sin(WalkPos - Math.PI * 1.5f) * CurrentGroundedParams.HandMoveAmount.Y));
+                handPos.Y = lowerY + (float)(Math.Abs(Math.Sin(WalkPos - Math.PI * 1.5f) * currentGroundedParams.HandMoveAmount.Y));
 
                 Vector2 posAddition = new Vector2(Math.Sign(movement.X) * HandMoveOffset.X, HandMoveOffset.Y);
 
@@ -708,13 +719,13 @@ namespace Barotrauma
                 {
                     HandIK(rightHand,
                         torso.SimPosition + posAddition + new Vector2(-handPos.X, (Math.Sign(walkPosX) == Math.Sign(Dir)) ? handPos.Y : lowerY),
-                        CurrentGroundedParams.ArmMoveStrength, CurrentGroundedParams.HandMoveStrength);
+                        currentGroundedParams.ArmMoveStrength, currentGroundedParams.HandMoveStrength);
                 }
                 if (leftHand != null && !leftHand.Disabled)
                 {
                     HandIK(leftHand,
                         torso.SimPosition + posAddition + new Vector2(handPos.X, (Math.Sign(walkPosX) == Math.Sign(-Dir)) ? handPos.Y : lowerY),
-                        CurrentGroundedParams.ArmMoveStrength, CurrentGroundedParams.HandMoveStrength);
+                        currentGroundedParams.ArmMoveStrength, currentGroundedParams.HandMoveStrength);
                 }
             }
             else
@@ -745,8 +756,8 @@ namespace Barotrauma
                     {
                         foot.DebugRefPos = colliderPos;
                         foot.DebugTargetPos = footPos;
-                        float footMoveForce = CurrentGroundedParams.FootMoveStrength;
-                        float legBendTorque = CurrentGroundedParams.LegBendTorque;
+                        float footMoveForce = currentGroundedParams.FootMoveStrength;
+                        float legBendTorque = currentGroundedParams.LegBendTorque;
                         if (Crouching)
                         {
                             // Keeps the pose
@@ -754,7 +765,7 @@ namespace Barotrauma
                             footMoveForce *= 2;
                         }
                         MoveLimb(foot, footPos, footMoveForce);
-                        FootIK(foot, footPos, legBendTorque, CurrentGroundedParams.FootTorque, CurrentGroundedParams.FootAngleInRadians);
+                        FootIK(foot, footPos, legBendTorque, currentGroundedParams.FootTorque, currentGroundedParams.FootAngleInRadians);
                     }
                 }
 
@@ -770,7 +781,7 @@ namespace Barotrauma
                     var arm = GetLimb(armType);
                     if (arm != null && Math.Abs(arm.body.AngularVelocity) < 10.0f)
                     {
-                        arm.body.SmoothRotate(MathHelper.Clamp(-arm.body.AngularVelocity, -0.5f, 0.5f), arm.Mass * 50.0f * CurrentGroundedParams.ArmMoveStrength);
+                        arm.body.SmoothRotate(MathHelper.Clamp(-arm.body.AngularVelocity, -0.5f, 0.5f), arm.Mass * 50.0f * currentGroundedParams.ArmMoveStrength);
                     }
 
                     //get the elbow to a neutral rotation
@@ -781,14 +792,14 @@ namespace Barotrauma
                         if (elbow != null)
                         {
                             float diff = elbow.JointAngle - (Dir > 0 ? elbow.LowerLimit : elbow.UpperLimit);
-                            forearm.body.ApplyTorque(MathHelper.Clamp(-diff, -MathHelper.PiOver2, MathHelper.PiOver2) * forearm.Mass * 100.0f * CurrentGroundedParams.ArmMoveStrength);
+                            forearm.body.ApplyTorque(MathHelper.Clamp(-diff, -MathHelper.PiOver2, MathHelper.PiOver2) * forearm.Mass * 100.0f * currentGroundedParams.ArmMoveStrength);
                         }
                     }
                     // Try to keep the wrist straight
                     LimbJoint wrist = GetJointBetweenLimbs(foreArmType, hand.type);
                     if (wrist != null)
                     {
-                        hand.body.ApplyTorque(MathHelper.Clamp(-wrist.JointAngle, -MathHelper.PiOver2, MathHelper.PiOver2) * hand.Mass * 100f * CurrentGroundedParams.HandMoveStrength);
+                        hand.body.ApplyTorque(MathHelper.Clamp(-wrist.JointAngle, -MathHelper.PiOver2, MathHelper.PiOver2) * hand.Mass * 100f * currentGroundedParams.HandMoveStrength);
                     }
                 }
             }
@@ -1292,10 +1303,9 @@ namespace Barotrauma
             }
         }
 
-        void UpdateDying(float deltaTime)
+        void UpdateFallingProne(float strength)
         {
-            //the force/torque used to move the limbs goes from 1 to 0 during the death anim duration
-            float strength = 1.0f - deathAnimTimer / deathAnimDuration;
+            if (strength <= 0.0f) { return; }
 
             Limb head = GetLimb(LimbType.Head);
             Limb torso = GetLimb(LimbType.Torso);
@@ -1319,6 +1329,19 @@ namespace Barotrauma
             }
 
             if (torso == null) { return; }
+
+            //make the torso tip over
+            //otherwise it tends to just drop straight down, pinning the characters legs in a weird pose
+            if (!InWater)
+            {
+                //prefer tipping over in the same direction the torso is rotating
+                //or moving
+                //or lastly, in the direction it's facing if it's not moving/rotating
+                float fallDirection = Math.Sign(torso.body.AngularVelocity - torso.body.LinearVelocity.X - Dir * 0.01f);
+                float torque = MathF.Cos(torso.Rotation) * fallDirection * 5.0f * strength;
+                torso.body.ApplyTorque(torque * torso.body.Mass);
+            }
+
             //attempt to make legs stay in a straight line with the torso to prevent the character from doing a split
             for (int i = 0; i < 2; i++)
             {
@@ -1503,12 +1526,12 @@ namespace Barotrauma
             Limb rightHand = GetLimb(LimbType.RightHand);
 
             Limb targetLeftHand = target.AnimController.GetLimb(LimbType.LeftForearm);
-            if (targetLeftHand == null) targetLeftHand = target.AnimController.GetLimb(LimbType.Torso);
-            if (targetLeftHand == null) targetLeftHand = target.AnimController.MainLimb;
+            if (targetLeftHand == null) { targetLeftHand = target.AnimController.GetLimb(LimbType.Torso); }
+            if (targetLeftHand == null) { targetLeftHand = target.AnimController.MainLimb; }
 
             Limb targetRightHand = target.AnimController.GetLimb(LimbType.RightForearm);
-            if (targetRightHand == null) targetRightHand = target.AnimController.GetLimb(LimbType.Torso);
-            if (targetRightHand == null) targetRightHand = target.AnimController.MainLimb;
+            if (targetRightHand == null) { targetRightHand = target.AnimController.GetLimb(LimbType.Torso); }
+            if (targetRightHand == null) { targetRightHand = target.AnimController.MainLimb; }
 
             if (!target.AllowInput)
             {
@@ -1644,18 +1667,24 @@ namespace Barotrauma
                     pullLimb.PullJointEnabled = true;
                     if (targetLimb.type == LimbType.Torso || targetLimb == target.AnimController.MainLimb)
                     {
-                        Vector2 pullLimbAnchor = targetLimb.SimPosition;
                         pullLimb.PullJointMaxForce = 5000.0f;
                         if (!character.HasAbilityFlag(AbilityFlags.MoveNormallyWhileDragging))
                         {
                             targetMovement *= MathHelper.Clamp(Mass / target.Mass, 0.5f, 1.0f);
                         }
-                            
-                        Vector2 shoulderPos = rightShoulder.WorldAnchorA;
-                        Vector2 dragDir = inWater ? Vector2.Normalize(targetLimb.SimPosition - shoulderPos) : Vector2.UnitY;
-                        if (!MathUtils.IsValid(dragDir)) { dragDir = Vector2.UnitY; }
 
-                        targetAnchor = shoulderPos - dragDir * ConvertUnits.ToSimUnits(upperArmLength + forearmLength);
+                        Vector2 shoulderPos = rightShoulder.WorldAnchorA;
+                        float targetDist = Vector2.Distance(targetLimb.SimPosition, shoulderPos);
+                        Vector2 dragDir = (targetLimb.SimPosition - shoulderPos) / targetDist;
+                        if (!MathUtils.IsValid(dragDir)) { dragDir = -Vector2.UnitY; }
+                        if (!InWater) 
+                        { 
+                            //lerp the arm downwards when not swimming
+                            dragDir = Vector2.Lerp(dragDir, -Vector2.UnitY, 0.5f); 
+                        }
+
+                        Vector2 pullLimbAnchor = shoulderPos + dragDir * Math.Min(targetDist, (upperArmLength + forearmLength) * 2);
+                        targetAnchor = shoulderPos + dragDir * (upperArmLength + forearmLength);
                         targetForce = 200.0f;
                         if (target.Submarine != character.Submarine)
                         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs

@@ -1212,7 +1212,9 @@ namespace Barotrauma
                 RefreshFloorY(ignoreStairs: Stairs == null);
                 if (currentHull.WaterPercentage > 0.001f)
                 {
-                    float waterSurface = ConvertUnits.ToSimUnits(GetSurfaceY());
+                    (float waterSurfaceDisplayUnits, float ceilingDisplayUnits) = GetWaterSurfaceAndCeilingY();
+                    float waterSurfaceY = ConvertUnits.ToSimUnits(waterSurfaceDisplayUnits);
+                    float ceilingY = ConvertUnits.ToSimUnits(ceilingDisplayUnits);
                     if (targetMovement.Y < 0.0f)
                     {
                         Vector2 colliderBottom = GetColliderBottom();
@@ -1222,13 +1224,21 @@ namespace Barotrauma
                         {
                             //set floorY to the position of the floor in the hull below the character
                             var lowerHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(colliderBottom), useWorldCoordinates: false);
-                            if (lowerHull != null) floorY = ConvertUnits.ToSimUnits(lowerHull.Rect.Y - lowerHull.Rect.Height);
+                            if (lowerHull != null)
+                            {
+                                floorY = ConvertUnits.ToSimUnits(lowerHull.Rect.Y - lowerHull.Rect.Height);
+                            }
                         }
                     }
                     float standHeight = HeadPosition ?? TorsoPosition ?? Collider.GetMaxExtent() * 0.5f;
-                    if (Collider.SimPosition.Y < waterSurface && waterSurface - floorY > standHeight * 0.8f)
+                    if (Collider.SimPosition.Y < waterSurfaceY)
                     {
-                        inWater = true;
+                        //too deep to stand up, or not enough room to stand up
+                        if (waterSurfaceY - floorY > standHeight * 0.8f ||
+                            ceilingY - floorY < standHeight * 0.8f)
+                        {
+                            inWater = true;
+                        }
                     }
                 }
             }
@@ -1663,22 +1673,34 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Get the position of the surface of water at the position of the character, in display units (taking into account connected hulls above the hull the character is in)
+        /// </summary>
         public float GetSurfaceY()
+        {
+            return GetWaterSurfaceAndCeilingY().WaterSurfaceY;
+        }
+
+        /// <summary>
+        /// Get the position of the surface of water and the ceiling (= upper edge of the hull) at the position of the character, in display units (taking into account connected hulls above the hull the character is in).
+        /// </summary>
+        private (float WaterSurfaceY, float CeilingY) GetWaterSurfaceAndCeilingY()
         {
             //check both hulls: the hull whose coordinate space the ragdoll is in, and the hull whose bounds the character's origin actually is inside
             if (currentHull == null || character.CurrentHull == null)
             {
-                return float.PositiveInfinity;
+                return (float.PositiveInfinity, float.PositiveInfinity);
             }
-            
-            float surfacePos = currentHull.Surface;
+
+            float surfaceY = currentHull.Surface;
+            float ceilingY = currentHull.Rect.Y;
             float surfaceThreshold = ConvertUnits.ToDisplayUnits(Collider.SimPosition.Y + 1.0f);
             //if the hull is almost full of water, check if there's a water-filled hull above it
             //and use its water surface instead of the current hull's 
             if (currentHull.Rect.Y - currentHull.Surface < 5.0f)
-            {
-                GetSurfacePos(currentHull, ref surfacePos);
-                void GetSurfacePos(Hull hull, ref float prevSurfacePos)
+            {                
+                GetSurfacePos(currentHull, ref surfaceY, ref ceilingY);
+                void GetSurfacePos(Hull hull, ref float prevSurfacePos, ref float ceilingPos)
                 {
                     if (prevSurfacePos > surfaceThreshold) { return; }
                     foreach (Gap gap in hull.ConnectedGaps)
@@ -1689,6 +1711,7 @@ namespace Barotrauma
                         //if the gap is above us and leads outside, there's no surface to limit the movement
                         if (!gap.IsRoomToRoom && gap.Position.Y > hull.Position.Y)
                         {
+                            ceilingPos += 100000.0f;
                             prevSurfacePos += 100000.0f;
                             return;
                         }
@@ -1697,15 +1720,16 @@ namespace Barotrauma
                         {
                             if (linkedTo is Hull otherHull && otherHull != hull && otherHull != currentHull)
                             {
-                                prevSurfacePos = Math.Max(surfacePos, otherHull.Surface);
-                                GetSurfacePos(otherHull, ref prevSurfacePos);
+                                prevSurfacePos = Math.Max(surfaceY, otherHull.Surface);
+                                ceilingPos = Math.Max(ceilingPos, otherHull.Rect.Y);
+                                GetSurfacePos(otherHull, ref prevSurfacePos, ref ceilingPos);
                                 break;
                             }
                         }
                     }
                 }
             }
-            return surfacePos;            
+            return (surfaceY, ceilingY);            
         }
 
         public void SetPosition(Vector2 simPosition, bool lerp = false, bool ignorePlatforms = true, bool forceMainLimbToCollider = false, bool detachProjectiles = true)

Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs

@@ -343,9 +343,10 @@ namespace Barotrauma
             return (Duration == 0.0f) ? LevelWallDamage : LevelWallDamage * deltaTime;
         }
 
-        public float GetItemDamage(float deltaTime)
+        public float GetItemDamage(float deltaTime, float multiplier = 1)
         {
-            return (Duration == 0.0f) ? ItemDamage : ItemDamage * deltaTime;
+            float dmg = ItemDamage * multiplier;
+            return (Duration == 0.0f) ? dmg : dmg * deltaTime;
         }
 
         public float GetTotalDamage(bool includeStructureDamage = false)

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -31,6 +31,9 @@ namespace Barotrauma
     {
         public readonly static List<Character> CharacterList = new List<Character>();
 
+        public const float MaxHighlightDistance = 150.0f;
+        public const float MaxDragDistance = 200.0f;
+
         partial void UpdateLimbLightSource(Limb limb);
 
         private bool enabled = true;
@@ -176,6 +179,13 @@ namespace Barotrauma
             }
         }
 
+        private Identifier? faction;
+        public Identifier Faction
+        {
+            get { return faction ?? HumanPrefab?.Faction ?? Identifier.Empty; }
+            set { faction = value; }
+        }
+
         private CharacterTeamType teamID;
         public CharacterTeamType TeamID
         {
@@ -497,7 +507,7 @@ namespace Barotrauma
                 LocalizedString displayName = Params.DisplayName;
                 if (displayName.IsNullOrWhiteSpace())
                 {
-                    if (string.IsNullOrWhiteSpace(Params.SpeciesTranslationOverride))
+                    if (Params.SpeciesTranslationOverride.IsEmpty)
                     {
                         displayName = TextManager.Get($"Character.{SpeciesName}");
                     }
@@ -529,8 +539,13 @@ namespace Barotrauma
             }
             set
             {
+                bool wasHidden = HideFace;
                 hideFaceTimer = MathHelper.Clamp(hideFaceTimer + (value ? 1.0f : -0.5f), 0.0f, 10.0f);
-                if (info != null && info.IsDisguisedAsAnother != HideFace) info.CheckDisguiseStatus(true);
+                bool isHidden = HideFace;
+                if (isHidden != wasHidden && info != null && info.IsDisguisedAsAnother != isHidden)
+                {
+                    info.CheckDisguiseStatus(true);
+                }
             }
         }
 
@@ -760,7 +775,7 @@ namespace Barotrauma
             get
             {
                 if (IsUnconscious) { return true; }
-                return CharacterHealth.GetAllAfflictions().Any(a => a.Prefab.AfflictionType == "paralysis" && a.Strength >= a.Prefab.MaxStrength);
+                return CharacterHealth.GetAllAfflictions().Any(a => a.Prefab.AfflictionType == AfflictionPrefab.ParalysisType && a.Strength >= a.Prefab.MaxStrength);
             }
         }
 
@@ -822,9 +837,15 @@ namespace Barotrauma
         public float HealthPercentage => CharacterHealth.HealthPercentage;
         public float MaxVitality => CharacterHealth.MaxVitality;
         public float MaxHealth => MaxVitality;
+
+        /// <summary>
+        /// Was the character in full health at the beginning of the frame?
+        /// </summary>
+        public bool WasFullHealth => CharacterHealth.WasInFullHealth;
         public AIState AIState => AIController is EnemyAIController enemyAI ? enemyAI.State : AIState.Idle;
         public bool IsLatched => AIController is EnemyAIController enemyAI && enemyAI.LatchOntoAI != null && enemyAI.LatchOntoAI.IsAttached;
         public float EmpVulnerability => Params.Health.EmpVulnerability;
+        public float PoisonVulnerability => Params.Health.PoisonVulnerability;
 
         public float Bloodloss
         {
@@ -838,7 +859,7 @@ namespace Barotrauma
 
         public float Bleeding
         {
-            get { return CharacterHealth.GetAfflictionStrength("bleeding", true); }
+            get { return CharacterHealth.GetAfflictionStrength(AfflictionPrefab.BleedingType, true); }
         }
 
         private bool speechImpedimentSet;
@@ -1043,6 +1064,8 @@ namespace Barotrauma
 
         public bool InWater => AnimController is AnimController { InWater: true };
 
+        public bool IsLowInOxygen => NeedsOxygen && OxygenAvailable < CharacterHealth.LowOxygenThreshold;
+
         public bool GodMode = false;
 
         public CampaignMode.InteractionType CampaignInteractionType;
@@ -1099,6 +1122,12 @@ namespace Barotrauma
 
         public bool IsInFriendlySub => Submarine != null && Submarine.TeamID == TeamID;
 
+        public float AITurretPriority
+        {
+            get => Params.AITurretPriority;
+            private set => Params.AITurretPriority = value;
+        }
+
         public delegate void OnDeathHandler(Character character, CauseOfDeath causeOfDeath);
         public OnDeathHandler OnDeath;
 
@@ -1691,7 +1720,7 @@ namespace Barotrauma
                             if (wearable.SkillModifiers.TryGetValue(skillIdentifier, out float skillValue))
                             {
                                 skillLevel += skillValue;
-                                    break;
+                                break;
                             }
                         }
 
@@ -1700,9 +1729,7 @@ namespace Barotrauma
             }
 
             skillLevel += GetStatValue(GetSkillStatType(skillIdentifier));
-
-
-            return skillLevel;
+            return Math.Max(skillLevel, 0);
         }
 
         // TODO: reposition? there's also the overrideTargetMovement variable, but it's not in the same manner
@@ -1900,7 +1927,7 @@ namespace Barotrauma
         {
             if (limb != null)
             {
-                sum += MathHelper.Lerp(0, max, CharacterHealth.GetLimbDamage(limb, afflictionType: "damage"));
+                sum += MathHelper.Lerp(0, max, CharacterHealth.GetLimbDamage(limb, afflictionType: AfflictionPrefab.DamageType));
             }
             return Math.Clamp(sum, 0, 1f);
         }
@@ -2201,7 +2228,9 @@ namespace Barotrauma
 
             if (SelectedCharacter != null)
             {
-                if (Vector2.DistanceSquared(SelectedCharacter.WorldPosition, WorldPosition) > 90000.0f || !SelectedCharacter.CanBeSelected)
+                if (!SelectedCharacter.CanBeSelected ||
+                    (Vector2.DistanceSquared(SelectedCharacter.WorldPosition, WorldPosition) > MaxDragDistance * MaxDragDistance &&
+                    SelectedCharacter.GetDistanceToClosestLimb(SimPosition) > ConvertUnits.ToSimUnits(MaxDragDistance)))
                 {
                     DeselectCharacter();
                 }
@@ -2494,8 +2523,12 @@ namespace Barotrauma
 
             if (!skipDistanceCheck)
             {
-                maxDist = ConvertUnits.ToSimUnits(maxDist);
-                if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) { return false; }
+                maxDist = Math.Max(ConvertUnits.ToSimUnits(maxDist), c.AnimController.Collider.GetMaxExtent());
+                if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist &&
+                    Vector2.DistanceSquared(SimPosition, c.AnimController.MainLimb.SimPosition) > maxDist * maxDist) 
+                { 
+                    return false; 
+                }
             }
 
             return checkVisibility ? CanSeeCharacter(c) : true;
@@ -2851,6 +2884,23 @@ namespace Barotrauma
                 }
                 else
                 {
+#if CLIENT
+                    if (Controlled == this)
+                    {
+                        HealingCooldown.PutOnCooldown();
+                    }
+#elif SERVER
+                    if (GameMain.Server?.ConnectedClients is { } clients)
+                    {
+                        foreach (Client c in clients)
+                        {
+                            if (c.Character != this) { continue; }
+
+                            HealingCooldown.SetCooldown(c);
+                            break;
+                        }
+                    }
+#endif
                     SelectCharacter(FocusedCharacter);
 #if CLIENT
                     if (Controlled == this)
@@ -3070,8 +3120,7 @@ namespace Barotrauma
             if (NeedsAir)
             {
                 //implode if not protected from pressure, and either outside or in a high-pressure hull
-                if (!IsProtectedFromPressure() &&
-                    (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 80.0f))
+                if (!IsProtectedFromPressure && (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 80.0f))
                 {
                     if (CharacterHealth.PressureKillDelay <= 0.0f)
                     {
@@ -3098,15 +3147,17 @@ namespace Barotrauma
                     PressureTimer = 0.0f;
                 }
             }
-            else if ((GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient) &&
-                PressureProtection < (Level.Loaded?.GetRealWorldDepth(WorldPosition.Y) ?? 1.0f) &&
-                WorldPosition.Y < CharacterHealth.CrushDepth && !HasAbilityFlag(AbilityFlags.ImmuneToPressure))
+            else if ((GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient) && !IsProtectedFromPressure)
             {
-                //implode if below crush depth, and either outside or in a high-pressure hull                
-                if (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 80.0f)
+                float realWorldDepth = Level.Loaded?.GetRealWorldDepth(WorldPosition.Y) ?? 0.0f;
+                if (PressureProtection < realWorldDepth && realWorldDepth > CharacterHealth.CrushDepth)
                 {
-                    Implode();
-                    if (IsDead) { return; }
+                    //implode if below crush depth, and either outside or in a high-pressure hull                
+                    if (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 80.0f)
+                    {
+                        Implode();
+                        if (IsDead) { return; }
+                    }
                 }
             }
 
@@ -3140,56 +3191,57 @@ namespace Barotrauma
 
             UpdateAIChatMessages(deltaTime);
 
-            //Do ragdoll shenanigans before Stun because it's still technically a stun, innit? Less network updates for us!
-            bool allowRagdoll = GameMain.NetworkMember?.ServerSettings?.AllowRagdollButton ?? true;
-            bool tooFastToUnragdoll = AnimController.Collider.LinearVelocity.LengthSquared() > 8.0f * 8.0f;
-            bool wasRagdolled = false;
-            bool selfRagdolled = false;
-
-            if (IsForceRagdolled)
+            if (GameMain.NetworkMember?.ServerSettings?.AllowRagdollButton ?? true)
             {
-                IsRagdolled = IsForceRagdolled;
-            }
-            else if (this != Controlled)
-            {
-                wasRagdolled = IsRagdolled;
-                IsRagdolled = selfRagdolled = IsKeyDown(InputType.Ragdoll);
-            }
-            //Keep us ragdolled if we were forced or we're too speedy to unragdoll
-            else if (allowRagdoll && (!IsRagdolled || !tooFastToUnragdoll))
-            {
-                if (ragdollingLockTimer > 0.0f)
+                bool wasRagdolled = IsRagdolled;
+                if (IsForceRagdolled)
                 {
-                    SetInput(InputType.Ragdoll, false, true);
-                    ragdollingLockTimer -= deltaTime;
+                    IsRagdolled = IsForceRagdolled;
+                }
+                else if (this != Controlled)
+                {
+                    wasRagdolled = IsRagdolled;
+                    IsRagdolled = IsKeyDown(InputType.Ragdoll);
                 }
                 else
                 {
-                    wasRagdolled = IsRagdolled;
-                    IsRagdolled = selfRagdolled = IsKeyDown(InputType.Ragdoll); //Handle this here instead of Control because we can stop being ragdolled ourselves
-                    if (wasRagdolled != IsRagdolled) { ragdollingLockTimer = 0.5f; }
+                    bool tooFastToUnragdoll = bodyMovingTooFast(AnimController.Collider) || bodyMovingTooFast(AnimController.MainLimb.body);
+                    bool bodyMovingTooFast(PhysicsBody body)
+                    {
+                        return
+                            body.LinearVelocity.LengthSquared() > 8.0f * 8.0f ||
+                            //falling down counts as going too fast
+                            (!InWater && body.LinearVelocity.Y < -5.0f);
+                    }
+                    if (ragdollingLockTimer > 0.0f)
+                    {
+                        ragdollingLockTimer -= deltaTime;
+                    }
+                    else if (!tooFastToUnragdoll)
+                    {
+                        IsRagdolled = IsKeyDown(InputType.Ragdoll); //Handle this here instead of Control because we can stop being ragdolled ourselves
+                        if (wasRagdolled != IsRagdolled) { ragdollingLockTimer = 0.2f; }
+                    }
+                    if (IsRagdolled)
+                    {
+                        SetInput(InputType.Ragdoll, false, true);
+                    }
                 }
-            }
-
-            if (!wasRagdolled && IsRagdolled)
-            {
-                if (selfRagdolled)
+                if (!wasRagdolled && IsRagdolled)
                 {
-                    CheckTalents(AbilityEffectType.OnSelfRagdoll);
+                    CheckTalents(AbilityEffectType.OnRagdoll);
                 }
-                // currently does not work when you are stunned, like it should
-                CheckTalents(AbilityEffectType.OnRagdoll);
             }
 
             lowPassMultiplier = MathHelper.Lerp(lowPassMultiplier, 1.0f, 0.1f);
 
-            //ragdoll button
             if (IsRagdolled || !CanMove)
             {
                 if (AnimController is HumanoidAnimController humanAnimController) 
                 { 
                     humanAnimController.Crouching = false; 
                 }
+                if (IsRagdolled) { AnimController.IgnorePlatforms = true; }
                 AnimController.ResetPullJoints();
                 SelectedItem = SelectedSecondaryItem = null;
                 return;
@@ -3367,6 +3419,20 @@ namespace Barotrauma
             return distSqr;
         }
 
+        public float GetDistanceToClosestLimb(Vector2 simPos)
+        {
+            float closestDist = float.MaxValue;
+            foreach (Limb limb in AnimController.Limbs)
+            {
+                if (limb.IsSevered) { continue; }
+                float dist = Vector2.Distance(simPos, limb.SimPosition);
+                dist -= limb.body.GetMaxExtent();
+                closestDist = Math.Min(closestDist, dist);
+                if (closestDist <= 0.0f) { return 0.0f; }
+            }
+            return closestDist;
+        }
+
         private float despawnTimer;
         private void UpdateDespawn(float deltaTime, bool ignoreThresholds = false, bool createNetworkEvents = true)
         {
@@ -3758,9 +3824,10 @@ namespace Barotrauma
                 message.SendDelay -= deltaTime;
                 if (message.SendDelay > 0.0f) { continue; }
 
+                bool canUseRadio = ChatMessage.CanUseRadio(this, out WifiComponent radio);
                 if (message.MessageType == null)
                 {
-                    message.MessageType = ChatMessage.CanUseRadio(this) ? ChatMessageType.Radio : ChatMessageType.Default;
+                    message.MessageType = canUseRadio ? ChatMessageType.Radio : ChatMessageType.Default;
                 }
 #if CLIENT
                 if (GameMain.GameSession?.CrewManager != null && GameMain.GameSession.CrewManager.IsSinglePlayer)
@@ -3770,6 +3837,11 @@ namespace Barotrauma
                     {
                         GameMain.GameSession.CrewManager.AddSinglePlayerChatMessage(Name, modifiedMessage, message.MessageType.Value, this);
                     }
+                    if (canUseRadio)
+                    {
+                        Signal s = new Signal(modifiedMessage, sender: this, source: radio.Item);
+                        radio.TransmitSignal(s, sentFromChat: true);
+                    }
                 }
 #endif
 #if SERVER
@@ -4005,17 +4077,7 @@ namespace Barotrauma
             CheckTalents(AbilityEffectType.OnKillCharacter, abilityCharacterKill);
 
             if (!IsOnPlayerTeam) { return; }
-            if (CreatureMetrics.Instance.Killed.Contains(target.SpeciesName)) { return; }
-            CreatureMetrics.Instance.Killed.Add(target.SpeciesName);
-            AddEncounter(target);
-        }
-
-        public void AddEncounter(Character other)
-        {
-            if (!IsOnPlayerTeam) { return; }
-            if (CreatureMetrics.Instance.Encountered.Contains(other.SpeciesName)) { return; }
-            CreatureMetrics.Instance.Encountered.Add(other.SpeciesName);
-            CreatureMetrics.Instance.RecentlyEncountered.Add(other.SpeciesName);
+            CreatureMetrics.RecordKill(target.SpeciesName);
         }
 
         public AttackResult DamageLimb(Vector2 worldPosition, Limb hitLimb, IEnumerable<Affliction> afflictions, float stun, bool playSound, float attackImpulse, Character attacker = null, float damageMultiplier = 1, bool allowStacking = true, float penetration = 0f, bool shouldImplode = false)
@@ -4082,17 +4144,23 @@ namespace Barotrauma
                 OnAttackedProjSpecific(attacker, attackResult, stun);
                 if (!wasDead)
                 {
-                    TryAdjustAttackerSkill(attacker, CharacterHealth.Vitality - prevVitality);
+                    TryAdjustAttackerSkill(attacker, attackResult);
                 }
-            };
+            }
             if (attackResult.Damage > 0)
             {
                 LastDamage = attackResult;
-                if (attacker != null)
+                if (attacker != null && attacker != this && !attacker.Removed)
                 {
                     AddAttacker(attacker, attackResult.Damage);
-                    AddEncounter(attacker);
-                    attacker.AddEncounter(this);
+                    if (IsOnPlayerTeam)
+                    {
+                        CreatureMetrics.AddEncounter(attacker.SpeciesName);
+                    }
+                    if (attacker.IsOnPlayerTeam)
+                    {
+                        CreatureMetrics.AddEncounter(SpeciesName);
+                    }
                 }
                 ApplyStatusEffects(ActionType.OnDamaged, 1.0f);
                 hitLimb.ApplyStatusEffects(ActionType.OnDamaged, 1.0f);
@@ -4108,26 +4176,85 @@ namespace Barotrauma
 
         partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult, float stun);
 
-        public void TryAdjustAttackerSkill(Character attacker, float healthChange)
+        public void TryAdjustAttackerSkill(Character attacker, AttackResult attackResult)
         {
             if (attacker == null) { return; }
-            
+            if (!attacker.IsOnPlayerTeam) { return; }
             bool isEnemy = AIController is EnemyAIController || TeamID != attacker.TeamID;
-            if (isEnemy)
+            if (!isEnemy) { return; }
+            float weaponDamage = 0;
+            float medicalDamage = 0;
+            foreach (var affliction in attackResult.Afflictions)
             {
-                if (healthChange < 0.0f)
+                if (affliction.Prefab.IsBuff) { continue; }
+                if (Params.IsMachine && !affliction.Prefab.AffectMachines) { continue; }
+                if (affliction.Prefab.AfflictionType == AfflictionPrefab.PoisonType || 
+                    affliction.Prefab.AfflictionType == AfflictionPrefab.ParalysisType)
                 {
-                    float attackerSkillLevel = attacker.GetSkillLevel("weapons");
-                    attacker.Info?.IncreaseSkillLevel("weapons".ToIdentifier(),
-                        -healthChange * SkillSettings.Current.SkillIncreasePerHostileDamage / Math.Max(attackerSkillLevel, 1.0f));
+                    if (!Params.Health.PoisonImmunity)
+                    {
+                        float relativeVitality = MaxVitality / 100f;
+                        // Undo the applied modifiers to get the base value. Poison damage is multiplied by max vitality when it's applied.
+                        float dmg = affliction.Strength;
+                        if (relativeVitality > 0)
+                        {
+                            dmg /= relativeVitality;
+                        }
+                        if (PoisonVulnerability > 0)
+                        {
+                            dmg /= PoisonVulnerability;
+                        }
+                        float strength = MaxVitality;
+                        if (Params.AI != null)
+                        {
+                            strength = Params.AI.CombatStrength;
+                        }
+                        // Adjust the skill gain by the strength of the target. Combat strength >= 1000 gives 2x bonus, combat strength < 333 less than 1x.
+                        float vitalityFactor = MathHelper.Lerp(0.5f, 2f, MathUtils.InverseLerp(0, 1000, strength));
+                        dmg *= vitalityFactor;
+                        medicalDamage += dmg * affliction.Prefab.MedicalSkillGain;
+                    }
                 }
+                else
+                {
+                    medicalDamage += affliction.GetVitalityDecrease(null) * affliction.Prefab.MedicalSkillGain;
+                }
+                weaponDamage += affliction.GetVitalityDecrease(null) * affliction.Prefab.WeaponsSkillGain;
             }
-            else if (healthChange > 0.0f)
+            if (medicalDamage > 0)
             {
-                float attackerSkillLevel = attacker.GetSkillLevel("medical");
-                attacker.Info?.IncreaseSkillLevel("medical".ToIdentifier(),
-                    healthChange * SkillSettings.Current.SkillIncreasePerFriendlyHealed / Math.Max(attackerSkillLevel, 1.0f));
+                IncreaseSkillLevel("medical".ToIdentifier(), medicalDamage);
             }
+            if (weaponDamage > 0)
+            {
+                IncreaseSkillLevel("weapons".ToIdentifier(), weaponDamage);
+            }
+
+            void IncreaseSkillLevel(Identifier skill, float damage)
+            {
+                float attackerSkillLevel = attacker.GetSkillLevel(skill);
+                // The formula is too generous on low skill levels, hence the minimum divider.
+                float minSkillDivider = 15f;
+                attacker.Info?.IncreaseSkillLevel(skill, damage * SkillSettings.Current.SkillIncreasePerHostileDamage / Math.Max(attackerSkillLevel, minSkillDivider));
+            }
+        }
+
+        public void TryAdjustHealerSkill(Character healer, float healthChange = 0, Affliction affliction = null)
+        {
+            if (healer == null) { return; }
+            bool isEnemy = AIController is EnemyAIController || TeamID != healer.TeamID;
+            if (isEnemy) { return; }
+            float medicalGain = healthChange;
+            if (affliction?.Prefab is { IsBuff: true } && (!Params.IsMachine || affliction.Prefab.AffectMachines))
+            {
+                medicalGain += affliction.Strength * affliction.Prefab.MedicalSkillGain;
+            }
+            if (medicalGain <= 0) { return; }
+            Identifier skill = new Identifier("medical");
+            float attackerSkillLevel = healer.GetSkillLevel(skill);
+            // The formula is too generous on low skill levels, hence the minimum divider.
+            float minSkillDivider = 15f;
+            healer.Info?.IncreaseSkillLevel(skill, medicalGain * SkillSettings.Current.SkillIncreasePerFriendlyHealed / Math.Max(attackerSkillLevel, minSkillDivider));
         }
 
         /// <summary>
@@ -4142,7 +4269,7 @@ namespace Barotrauma
             if (Screen.Selected != GameMain.GameScreen) { return; }
             if (newStun > 0 && Params.Health.StunImmunity)
             {
-                if (EmpVulnerability <= 0 || CharacterHealth.GetAfflictionStrength("emp", allowLimbAfflictions: false) <= 0)
+                if (EmpVulnerability <= 0 || CharacterHealth.GetAfflictionStrength(AfflictionPrefab.EMPType, allowLimbAfflictions: false) <= 0)
                 {
                     return;
                 }
@@ -4169,7 +4296,7 @@ namespace Barotrauma
                 float eatingRegen = Params.Health.HealthRegenerationWhenEating;
                 if (eatingRegen > 0)
                 {
-                    CharacterHealth.ReduceAfflictionOnAllLimbs("damage".ToIdentifier(), eatingRegen * deltaTime);
+                    CharacterHealth.ReduceAfflictionOnAllLimbs(AfflictionPrefab.DamageType, eatingRegen * deltaTime);
                 }
             }
             if (statusEffects.TryGetValue(actionType, out var statusEffectList))
@@ -4541,6 +4668,7 @@ namespace Barotrauma
             Submarine = null;
             AnimController.SetPosition(ConvertUnits.ToSimUnits(worldPos), lerp: false);
             AnimController.FindHull(worldPos, setSubmarine: true);
+            CurrentHull = AnimController.CurrentHull;
             if (AIController is HumanAIController humanAI)
             {
                 humanAI.PathSteering?.ResetPath();
@@ -4787,34 +4915,36 @@ namespace Barotrauma
             return visibleHulls;
         }
 
-        public Vector2 GetRelativeSimPosition(ISpatialEntity target, Vector2? worldPos = null)
+        public Vector2 GetRelativeSimPosition(ISpatialEntity target, Vector2? worldPos = null) => GetRelativeSimPosition(this, target, worldPos);
+
+        public static Vector2 GetRelativeSimPosition(ISpatialEntity from, ISpatialEntity to, Vector2? worldPos = null)
         {
-            Vector2 targetPos = target.SimPosition;
+            Vector2 targetPos = to.SimPosition;
             if (worldPos.HasValue)
             {
                 Vector2 wp = worldPos.Value;
-                if (target.Submarine != null)
+                if (to.Submarine != null)
                 {
-                    wp -= target.Submarine.Position;
+                    wp -= to.Submarine.Position;
                 }
                 targetPos = ConvertUnits.ToSimUnits(wp);
             }
-            if (Submarine == null && target.Submarine != null)
+            if (from.Submarine == null && to.Submarine != null)
             {
                 // outside and targeting inside
-                targetPos += target.Submarine.SimPosition;
+                targetPos += to.Submarine.SimPosition;
             }
-            else if (Submarine != null && target.Submarine == null)
+            else if (from.Submarine != null && to.Submarine == null)
             {
                 // inside and targeting outside
-                targetPos -= Submarine.SimPosition;
+                targetPos -= from.Submarine.SimPosition;
             }
-            else if (Submarine != target.Submarine)
+            else if (from.Submarine != to.Submarine)
             {
-                if (Submarine != null && target.Submarine != null)
+                if (from.Submarine != null && to.Submarine != null)
                 {
                     // both inside, but in different subs
-                    Vector2 diff = Submarine.SimPosition - target.Submarine.SimPosition;
+                    Vector2 diff = from.Submarine.SimPosition - to.Submarine.SimPosition;
                     targetPos -= diff;
                 }
             }
@@ -4836,13 +4966,14 @@ namespace Barotrauma
 
         public bool HasJob(Identifier identifier) => Info?.Job?.Prefab.Identifier == identifier;
 
-        public bool IsProtectedFromPressure()
-        {
-            return HasAbilityFlag(AbilityFlags.ImmuneToPressure) || PressureProtection >= (Level.Loaded?.GetRealWorldDepth(WorldPosition.Y) ?? 1.0f);
-        }
+        /// <summary>
+        /// Is the character currently protected from the pressure by immunity/ability or a status effect (e.g. from a diving suit).
+        /// </summary>
+        public bool IsProtectedFromPressure => IsImmuneToPressure || PressureProtection >= (Level.Loaded?.GetRealWorldDepth(WorldPosition.Y) ?? 1.0f);
 
-        // Talent logic begins here. Should be encapsulated to its own controller soon
+        public bool IsImmuneToPressure => !NeedsAir || HasAbilityFlag(AbilityFlags.ImmuneToPressure);
 
+        #region Talents
         private readonly List<CharacterTalent> characterTalents = new List<CharacterTalent>();
 
         public void LoadTalents()
@@ -4916,6 +5047,49 @@ namespace Barotrauma
             return info.UnlockedTalents.Contains(identifier);
         }
 
+        public bool HasUnlockedAllTalents()
+        {
+            if (TalentTree.JobTalentTrees.TryGet(Info.Job.Prefab.Identifier, out TalentTree talentTree))
+            {
+                foreach (TalentSubTree talentSubTree in talentTree.TalentSubTrees)
+                {
+                    foreach (TalentOption talentOption in talentSubTree.TalentOptionStages)
+                    {
+                        if (!talentOption.HasMaxTalents(info.UnlockedTalents))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        public bool HasTalents()
+        {
+            return characterTalents.Any();
+        }
+
+        public void CheckTalents(AbilityEffectType abilityEffectType, AbilityObject abilityObject)
+        {
+            foreach (var characterTalent in characterTalents)
+            {
+                characterTalent.CheckTalent(abilityEffectType, abilityObject);
+            }
+        }
+
+        public void CheckTalents(AbilityEffectType abilityEffectType)
+        {
+            foreach (var characterTalent in characterTalents)
+            {
+                characterTalent.CheckTalent(abilityEffectType, null);
+            }
+        }
+
+        partial void OnTalentGiven(TalentPrefab talentPrefab);
+
+        #endregion
+
         private readonly HashSet<Hull> sameRoomHulls = new();
 
         /// <summary>
@@ -4942,24 +5116,6 @@ namespace Barotrauma
             return sameRoomHulls.Contains(character.CurrentHull);
         }
 
-        public bool HasUnlockedAllTalents()
-        {
-            if (TalentTree.JobTalentTrees.TryGet(Info.Job.Prefab.Identifier, out TalentTree talentTree))
-            {
-                foreach (TalentSubTree talentSubTree in talentTree.TalentSubTrees)
-                {
-                    foreach (TalentOption talentOption in talentSubTree.TalentOptionStages)
-                    {
-                        if (!talentOption.HasMaxTalents(info.UnlockedTalents))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-
         public static IEnumerable<Character> GetFriendlyCrew(Character character)
         {
             if (character is null)
@@ -4969,27 +5125,6 @@ namespace Barotrauma
             return CharacterList.Where(c => HumanAIController.IsFriendly(character, c, onlySameTeam: true) && !c.IsDead);
         }
 
-        public bool HasTalents()
-        {
-            return characterTalents.Any();
-        }
-
-        public void CheckTalents(AbilityEffectType abilityEffectType, AbilityObject abilityObject)
-        {
-            foreach (var characterTalent in characterTalents)
-            {
-                characterTalent.CheckTalent(abilityEffectType, abilityObject);
-            }
-        }
-
-        public void CheckTalents(AbilityEffectType abilityEffectType)
-        {
-            foreach (var characterTalent in characterTalents)
-            {
-                characterTalent.CheckTalent(abilityEffectType, null);
-            }
-        }
-
         public bool HasRecipeForItem(Identifier recipeIdentifier)
         {
             return characterTalents.Any(t => t.UnlockedRecipes.Contains(recipeIdentifier));
@@ -5053,7 +5188,6 @@ namespace Barotrauma
 #endif
 
         partial void OnMoneyChanged(int prevAmount, int newAmount);
-        partial void OnTalentGiven(TalentPrefab talentPrefab);
 
         /// <summary>
         /// This dictionary is used for stats that are required very frequently. Not very performant, but easier to develop with for now.
@@ -5208,7 +5342,24 @@ namespace Barotrauma
 
         public bool IsFriendly(Character other) => IsFriendly(this, other);
 
-        public static bool IsFriendly(Character me, Character other) => AIController.IsOnFriendlyTeam(me, other) && IsSameSpeciesOrGroup(me, other);
+        public static bool IsFriendly(Character me, Character other) => IsOnFriendlyTeam(me, other) && IsSameSpeciesOrGroup(me, other);
+
+        public static bool IsOnFriendlyTeam(CharacterTeamType myTeam, CharacterTeamType otherTeam)
+        {
+            if (myTeam == otherTeam) { return true; }
+            return myTeam switch
+            {
+                // NPCs are friendly to the same team and the friendly NPCs
+                CharacterTeamType.None or CharacterTeamType.Team1 or CharacterTeamType.Team2 => otherTeam == CharacterTeamType.FriendlyNPC,
+                // Friendly NPCs are friendly to both player teams
+                CharacterTeamType.FriendlyNPC => otherTeam == CharacterTeamType.Team1 || otherTeam == CharacterTeamType.Team2,
+                _ => true
+            };
+        }
+
+        public static bool IsOnFriendlyTeam(Character me, Character other) => IsOnFriendlyTeam(me.TeamID, other.TeamID);
+        public bool IsOnFriendlyTeam(Character other) => IsOnFriendlyTeam(TeamID, other.TeamID);
+        public bool IsOnFriendlyTeam(CharacterTeamType otherTeam) => IsOnFriendlyTeam(TeamID, otherTeam);
 
         public bool IsSameSpeciesOrGroup(Character other) => IsSameSpeciesOrGroup(this, other);
 

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterPrefab.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Xml.Linq;
 using Microsoft.Xna.Framework;
-using static Barotrauma.CharacterInfo;
 
 namespace Barotrauma
 {
@@ -19,6 +17,8 @@ namespace Barotrauma
 
         public string Name => Identifier.Value;
         public Identifier VariantOf { get; }
+        public CharacterPrefab ParentPrefab { get; set; }
+
         public void InheritFrom(CharacterPrefab parent)
         {
             ConfigElement = CharacterParams.CreateVariantXml(originalElement, parent.ConfigElement).FromPackage(ConfigElement.ContentPackage);
@@ -38,7 +38,7 @@ namespace Barotrauma
             }
         }
 
-        private XElement originalElement;
+        private readonly XElement originalElement;
         public ContentXElement ConfigElement { get; private set; }
 
         public CharacterInfoPrefab CharacterInfoPrefab { get; private set; }
@@ -49,10 +49,6 @@ namespace Barotrauma
         public static CharacterFile HumanConfigFile => HumanPrefab.ContentFile as CharacterFile;
         public static CharacterPrefab HumanPrefab => FindBySpeciesName(HumanSpeciesName);
 
-        /// <summary>
-        /// Searches for a character config file from all currently selected content packages, 
-        /// or from a specific package if the contentPackage parameter is given.
-        /// </summary>
         public static CharacterPrefab FindBySpeciesName(Identifier speciesName)
         {
             if (!Prefabs.ContainsKey(speciesName)) { return null; }

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs

@@ -19,6 +19,10 @@ namespace Barotrauma
 
         private float fluctuationTimer;
 
+        private AfflictionPrefab.Effect activeEffect;
+        private float prevActiveEffectStrength;
+        protected bool activeEffectDirty = true;
+
         protected float _strength;
 
         [Serialize(0f, IsPropertySaveable.Yes), Editable]
@@ -46,6 +50,7 @@ namespace Barotrauma
                     Duration = Prefab.Duration;
                 }
                 _strength = newValue;
+                activeEffectDirty = true;
             }
         }
 
@@ -147,7 +152,16 @@ namespace Barotrauma
                 MathHelper.Clamp((int)Math.Floor(strength / maxStrength * strengthTexts.Length), 0, strengthTexts.Length - 1)];
         }
 
-        public AfflictionPrefab.Effect GetActiveEffect() => Prefab.GetActiveEffect(Strength);
+        public AfflictionPrefab.Effect GetActiveEffect()
+        {
+            if (activeEffectDirty)
+            {
+                activeEffect = Prefab.GetActiveEffect(_strength);
+                prevActiveEffectStrength = _strength;
+                activeEffectDirty = false;
+            }
+            return activeEffect;
+        }
 
         public float GetVitalityDecrease(CharacterHealth characterHealth)
         {
@@ -158,7 +172,7 @@ namespace Barotrauma
         {
             if (strength < Prefab.ActivationThreshold) { return 0.0f; }
             strength = MathHelper.Clamp(strength, 0.0f, Prefab.MaxStrength);
-            AfflictionPrefab.Effect currentEffect = Prefab.GetActiveEffect(strength);
+            AfflictionPrefab.Effect currentEffect = GetActiveEffect();
             if (currentEffect == null) { return 0.0f; }
             if (currentEffect.MaxStrength - currentEffect.MinStrength <= 0.0f) { return 0.0f; }
 
@@ -349,7 +363,7 @@ namespace Barotrauma
 
         public float GetStatValue(StatTypes statType)
         {
-            if (!(GetViableEffect() is AfflictionPrefab.Effect currentEffect)) { return 0.0f; }
+            if (GetViableEffect() is not AfflictionPrefab.Effect currentEffect) { return 0.0f; }
 
             if (currentEffect.AfflictionStatValues.TryGetValue(statType, out var value))
             {
@@ -363,7 +377,7 @@ namespace Barotrauma
 
         public bool HasFlag(AbilityFlags flagType)
         {
-            if (!(GetViableEffect() is AfflictionPrefab.Effect currentEffect)) { return false; }
+            if (GetViableEffect() is not AfflictionPrefab.Effect currentEffect) { return false; }
             return currentEffect.AfflictionAbilityFlags.HasFlag(flagType);
         }
 
@@ -415,6 +429,7 @@ namespace Barotrauma
             }
             // Don't use the property, because it's virtual and some afflictions like husk overload it for external use.
             _strength = MathHelper.Clamp(_strength, 0.0f, Prefab.MaxStrength);
+            activeEffectDirty |= !MathUtils.NearlyEqual(prevActiveEffectStrength, _strength);
 
             foreach (StatusEffect statusEffect in currentEffect.StatusEffects)
             {
@@ -442,7 +457,10 @@ namespace Barotrauma
             var currentEffect = GetActiveEffect();
             if (currentEffect != null)
             {
-                currentEffect.StatusEffects.ForEach(se => ApplyStatusEffect(type, se, deltaTime, characterHealth, targetLimb));
+                foreach (var statusEffect in currentEffect.StatusEffects)
+                {
+                    ApplyStatusEffect(type, statusEffect, deltaTime, characterHealth, targetLimb);
+                }
             }
         }
 
@@ -481,6 +499,7 @@ namespace Barotrauma
         {
             _nonClampedStrength = strength;
             _strength = _nonClampedStrength;
+            activeEffectDirty |= !MathUtils.NearlyEqual(_strength, prevActiveEffectStrength);
         }
 
         public bool ShouldShowIcon(Character afflictedCharacter)

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionHusk.cs

@@ -43,6 +43,7 @@ namespace Barotrauma
                     DeactivateHusk();
                     highestStrength = 0;
                 }
+                activeEffectDirty = true;
             }
         }
         private float highestStrength;

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs

@@ -319,6 +319,7 @@ namespace Barotrauma
         {
             public readonly List<StatusEffect> StatusEffects = new List<StatusEffect>();
             public readonly float MinInterval, MaxInterval;
+            public readonly float MinStrength, MaxStrength;
 
             public PeriodicEffect(ContentXElement element, string parentDebugName)
             {
@@ -333,23 +334,38 @@ namespace Barotrauma
                 }
                 else
                 {
-                    MinInterval = Math.Max(element.GetAttributeFloat("mininterval", 1.0f), 1.0f);
-                    MaxInterval = Math.Max(element.GetAttributeFloat("maxinterval", 1.0f), MinInterval);
+                    MinInterval = Math.Max(element.GetAttributeFloat(nameof(MinInterval), 1.0f), 1.0f);
+                    MaxInterval = Math.Max(element.GetAttributeFloat(nameof(MaxInterval), 1.0f), MinInterval);
+                    MinStrength = Math.Max(element.GetAttributeFloat(nameof(MinStrength), 0f), 0f);
+                    MaxStrength = Math.Max(element.GetAttributeFloat(nameof(MaxStrength), MinStrength), MinStrength);
                 }
             }
         }
 
+        public static readonly Identifier DamageType = "damage".ToIdentifier();
+        public static readonly Identifier BurnType = "burn".ToIdentifier();
+        public static readonly Identifier BleedingType = "bleeding".ToIdentifier();
+        public static readonly Identifier ParalysisType = "paralysis".ToIdentifier();
+        public static readonly Identifier PoisonType = "poison".ToIdentifier();
+        public static readonly Identifier StunType = "stun".ToIdentifier();
+        public static readonly Identifier EMPType = "emp".ToIdentifier();
+        public static readonly Identifier SpaceHerpesType = "spaceherpes".ToIdentifier();
+        public static readonly Identifier AlienInfectedType = "alieninfected".ToIdentifier();
+        public static readonly Identifier InvertControlsType = "invertcontrols".ToIdentifier();
+        public static readonly Identifier HuskInfectionType = "huskinfection".ToIdentifier();
+
         public static AfflictionPrefab InternalDamage => Prefabs["internaldamage"];
         public static AfflictionPrefab BiteWounds => Prefabs["bitewounds"];
         public static AfflictionPrefab ImpactDamage => Prefabs["blunttrauma"];
-        public static AfflictionPrefab Bleeding => Prefabs["bleeding"];
-        public static AfflictionPrefab Burn => Prefabs["burn"];
+        public static AfflictionPrefab Bleeding => Prefabs[BleedingType];
+        public static AfflictionPrefab Burn => Prefabs[BurnType];
         public static AfflictionPrefab OxygenLow => Prefabs["oxygenlow"];
         public static AfflictionPrefab Bloodloss => Prefabs["bloodloss"];
         public static AfflictionPrefab Pressure => Prefabs["pressure"];
-        public static AfflictionPrefab Stun => Prefabs["stun"];
+        public static AfflictionPrefab Stun => Prefabs[StunType];
         public static AfflictionPrefab RadiationSickness => Prefabs["radiationsickness"];
 
+
         public static readonly PrefabCollection<AfflictionPrefab> Prefabs = new PrefabCollection<AfflictionPrefab>();
 
         public override void Dispose() { }
@@ -413,8 +429,8 @@ namespace Barotrauma
         //how much karma changes when a player applies this affliction to someone (per strength of the affliction)
         public float KarmaChangeOnApplied;
 
-        public float BurnOverlayAlpha;
-        public float DamageOverlayAlpha;
+        public readonly float BurnOverlayAlpha;
+        public readonly float DamageOverlayAlpha;
 
         //steam achievement given when the affliction is removed from the controlled character
         public readonly Identifier AchievementOnRemoved;
@@ -425,6 +441,20 @@ namespace Barotrauma
         public readonly Sprite AfflictionOverlay;
         public readonly bool AfflictionOverlayAlphaIsLinear;
 
+        public readonly bool DamageParticles;
+
+        /// <summary>
+        /// An arbitrary modifier that affects how much medical skill is increased when you apply the affliction on a target. 
+        /// If the affliction causes damage or is of type poison or paralysis, the skill is increased only when the target is hostile. 
+        /// If the affliction is of type buff, the skill is increased only when the target is friendly.
+        /// </summary>
+        public readonly float MedicalSkillGain;
+        /// <summary>
+        /// An arbitrary modifier that affects how much weapons skill is increased when you apply the affliction on a target. 
+        /// The skill is increased only when the target is hostile. 
+        /// </summary>
+        public readonly float WeaponsSkillGain;
+
         private readonly List<Effect> effects = new List<Effect>();
         private readonly List<PeriodicEffect> periodicEffects = new List<PeriodicEffect>();
 
@@ -519,8 +549,14 @@ namespace Barotrauma
 
             KarmaChangeOnApplied = element.GetAttributeFloat(nameof(KarmaChangeOnApplied), 0.0f);
 
-            CauseOfDeathDescription     = TextManager.Get($"AfflictionCauseOfDeath.{TranslationIdentifier}").Fallback(element.GetAttributeString("causeofdeathdescription", ""));
-            SelfCauseOfDeathDescription = TextManager.Get($"AfflictionCauseOfDeathSelf.{TranslationIdentifier}").Fallback(element.GetAttributeString("selfcauseofdeathdescription", ""));
+            CauseOfDeathDescription     = 
+                TextManager.Get($"AfflictionCauseOfDeath.{TranslationIdentifier}")
+                .Fallback(TextManager.Get(element.GetAttributeString("causeofdeathdescription", "")))
+                .Fallback(element.GetAttributeString("causeofdeathdescription", ""));
+            SelfCauseOfDeathDescription = 
+                TextManager.Get($"AfflictionCauseOfDeathSelf.{TranslationIdentifier}")
+                .Fallback(TextManager.Get(element.GetAttributeString("selfcauseofdeathdescription", "")))
+                .Fallback(element.GetAttributeString("selfcauseofdeathdescription", ""));
 
             IconColors = element.GetAttributeColorArray(nameof(IconColors), null);
             AfflictionOverlayAlphaIsLinear = element.GetAttributeBool(nameof(AfflictionOverlayAlphaIsLinear), false);
@@ -530,6 +566,10 @@ namespace Barotrauma
 
             ResetBetweenRounds = element.GetAttributeBool("resetbetweenrounds", false);
 
+            DamageParticles = element.GetAttributeBool(nameof(DamageParticles), true);
+            WeaponsSkillGain = element.GetAttributeFloat(nameof(WeaponsSkillGain), 0.0f);
+            MedicalSkillGain = element.GetAttributeFloat(nameof(MedicalSkillGain), 0.0f);
+
             List<Description> descriptions = new List<Description>();
             foreach (var subElement in element.Elements())
             {
@@ -604,6 +644,18 @@ namespace Barotrauma
                         break;
                 }
             }
+            for (int i = 0; i < effects.Count; i++)
+            {
+                for (int j = i + 1; j < effects.Count; j++)
+                {
+                    var a = effects[i];
+                    var b = effects[j];
+                    if (a.MinStrength < b.MaxStrength && b.MinStrength < a.MaxStrength)
+                    {
+                        DebugConsole.AddWarning($"Affliction \"{Identifier}\" contains effects with overlapping strength ranges. Only one effect can be active at a time, meaning one of the effects won't work.");
+                    }
+                }
+            }
         }
 
         public void ClearEffects()

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs

@@ -230,6 +230,11 @@ namespace Barotrauma
 
         public float StunTimer { get; private set; }
 
+        /// <summary>
+        /// Was the character in full health at the beginning of the frame?
+        /// </summary>
+        public bool WasInFullHealth { get; private set; }
+
         public Affliction PressureAffliction
         {
             get { return pressureAffliction; }
@@ -334,12 +339,12 @@ namespace Barotrauma
             return null;
         }
 
-        public T GetAffliction<T>(string identifier, bool allowLimbAfflictions = true) where T : Affliction
+        public T GetAffliction<T>(Identifier identifier, bool allowLimbAfflictions = true) where T : Affliction
         {
             return GetAffliction(identifier, allowLimbAfflictions) as T;
         }
 
-        public Affliction GetAffliction(string identifier, Limb limb)
+        public Affliction GetAffliction(Identifier identifier, Limb limb)
         {
             if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count)
             {
@@ -375,7 +380,7 @@ namespace Barotrauma
         /// <param name="limb">The limb the affliction is attached to</param>
         /// <param name="requireLimbSpecific">Does the affliction have to be attached to only the specific limb. 
         /// Most monsters for example don't have separate healths for different limbs, essentially meaning that every affliction is applied to every limb.</param>
-        public float GetAfflictionStrength(string afflictionType, Limb limb, bool requireLimbSpecific)
+        public float GetAfflictionStrength(Identifier afflictionType, Limb limb, bool requireLimbSpecific)
         {
             if (requireLimbSpecific && limbHealths.Count == 1) { return 0.0f; }
 
@@ -396,7 +401,7 @@ namespace Barotrauma
             return strength;
         }
 
-        public float GetAfflictionStrength(string afflictionType, bool allowLimbAfflictions = true)
+        public float GetAfflictionStrength(Identifier afflictionType, bool allowLimbAfflictions = true)
         {
             float strength = 0.0f;
             foreach (KeyValuePair<Affliction, LimbHealth> kvp in afflictions)
@@ -478,16 +483,19 @@ namespace Barotrauma
             ReduceMatchingAfflictions(amount, treatmentAction);
         }
         
-        public void ReduceAfflictionOnAllLimbs(Identifier affliction, float amount, ActionType? treatmentAction = null)
+        public void ReduceAfflictionOnAllLimbs(Identifier afflictionIdOrType, float amount, ActionType? treatmentAction = null)
         {
-            if (affliction.IsEmpty) { throw new ArgumentException($"{nameof(affliction)} is empty"); }
-            
+            if (afflictionIdOrType.IsEmpty) { throw new ArgumentException($"{nameof(afflictionIdOrType)} is empty"); }
+
             matchingAfflictions.Clear();
-            matchingAfflictions.AddRange(afflictions.Keys);
-            matchingAfflictions.RemoveAll(a =>
-                a.Prefab.Identifier != affliction &&
-                a.Prefab.AfflictionType != affliction);
-            
+            foreach (var affliction in afflictions)
+            {
+                if (affliction.Key.Prefab.Identifier == afflictionIdOrType || affliction.Key.Prefab.AfflictionType == afflictionIdOrType)
+                {
+                    matchingAfflictions.Add(affliction.Key);
+                }
+            }
+
             ReduceMatchingAfflictions(amount, treatmentAction);
         }
 
@@ -504,18 +512,21 @@ namespace Barotrauma
             ReduceMatchingAfflictions(amount, treatmentAction);
         }
         
-        public void ReduceAfflictionOnLimb(Limb targetLimb, Identifier affliction, float amount, ActionType? treatmentAction = null)
+        public void ReduceAfflictionOnLimb(Limb targetLimb, Identifier afflictionIdOrType, float amount, ActionType? treatmentAction = null)
         {
-            if (affliction.IsEmpty) { throw new ArgumentException($"{nameof(affliction)} is empty"); }
+            if (afflictionIdOrType.IsEmpty) { throw new ArgumentException($"{nameof(afflictionIdOrType)} is empty"); }
             if (targetLimb is null) { throw new ArgumentNullException(nameof(targetLimb)); }
-            
+
             matchingAfflictions.Clear();
-            matchingAfflictions.AddRange(GetAfflictionsForLimb(targetLimb));
-
-            matchingAfflictions.RemoveAll(a =>
-                a.Prefab.Identifier != affliction &&
-                a.Prefab.AfflictionType != affliction);
-
+            var targetLimbHealth = limbHealths[targetLimb.HealthIndex];
+            foreach (var affliction in afflictions)
+            {
+                if ((affliction.Key.Prefab.Identifier == afflictionIdOrType || affliction.Key.Prefab.AfflictionType == afflictionIdOrType) &&
+                    affliction.Value == targetLimbHealth)
+                {
+                    matchingAfflictions.Add(affliction.Key);
+                }
+            }
             ReduceMatchingAfflictions(amount, treatmentAction);
         }
 
@@ -617,7 +628,7 @@ namespace Barotrauma
             KillIfOutOfVitality();
         }
 
-        public float GetLimbDamage(Limb limb, string afflictionType = null)
+        public float GetLimbDamage(Limb limb, Identifier afflictionType)
         {
             float damageStrength;
             if (limb.IsSevered)
@@ -630,16 +641,16 @@ namespace Barotrauma
                 // Therefore with e.g. 80 health, the max damage per limb would be 40.
                 // Having at least 40 damage on both legs would cause maximum limping.
                 float max = MaxVitality / 2;
-                if (string.IsNullOrEmpty(afflictionType))
+                if (afflictionType.IsEmpty)
                 {
-                    float damage = GetAfflictionStrength("damage", limb, true);
-                    float bleeding = GetAfflictionStrength("bleeding", limb, true);
-                    float burn = GetAfflictionStrength("burn", limb, true);
+                    float damage = GetAfflictionStrength(AfflictionPrefab.DamageType, limb, true);
+                    float bleeding = GetAfflictionStrength(AfflictionPrefab.BleedingType, limb, true);
+                    float burn = GetAfflictionStrength(AfflictionPrefab.BurnType, limb, true);
                     damageStrength = Math.Min(damage + bleeding + burn, max);
                 }
                 else
                 {
-                    damageStrength = Math.Min(GetAfflictionStrength("damage", limb, true), max);
+                    damageStrength = Math.Min(GetAfflictionStrength(afflictionType, limb, true), max);
                 }
                 return damageStrength / max;
             }
@@ -696,15 +707,16 @@ namespace Barotrauma
             if (Character.Params.IsMachine && !newAffliction.Prefab.AffectMachines) { return; }
             if (!DoesBleed && newAffliction is AfflictionBleeding) { return; }
             if (!Character.NeedsOxygen && newAffliction.Prefab == AfflictionPrefab.OxygenLow) { return; }
-            if (Character.Params.Health.StunImmunity && newAffliction.Prefab.AfflictionType == "stun")
+            if (Character.Params.Health.StunImmunity && newAffliction.Prefab.AfflictionType == AfflictionPrefab.StunType)
             {
-                if (Character.EmpVulnerability <= 0 || GetAfflictionStrength("emp", allowLimbAfflictions: false) <= 0)
+                if (Character.EmpVulnerability <= 0 || GetAfflictionStrength(AfflictionPrefab.EMPType, allowLimbAfflictions: false) <= 0)
                 {
                     return;
                 }
             }
-            if (Character.Params.Health.PoisonImmunity && newAffliction.Prefab.AfflictionType == "poison") { return; }
-            if (Character.EmpVulnerability <= 0 && newAffliction.Prefab.AfflictionType == "emp") { return; }
+            if (Character.Params.Health.PoisonImmunity && 
+                (newAffliction.Prefab.AfflictionType == AfflictionPrefab.PoisonType || newAffliction.Prefab.AfflictionType == AfflictionPrefab.ParalysisType)) { return; }
+            if (Character.EmpVulnerability <= 0 && newAffliction.Prefab.AfflictionType == AfflictionPrefab.EMPType) { return; }
             if (newAffliction.Prefab.TargetSpecies.Any() && newAffliction.Prefab.TargetSpecies.None(s => s == Character.SpeciesName)) { return; }
 
             Affliction existingAffliction = null;
@@ -742,7 +754,8 @@ namespace Barotrauma
                 Math.Min(newAffliction.Prefab.MaxStrength, newAffliction.Strength * (100.0f / MaxVitality) * (1f - GetResistance(newAffliction.Prefab))),
                 newAffliction.Source);
             afflictions.Add(copyAffliction, limbHealth);
-            
+            MedicalClinic.OnAfflictionCountChanged(Character);
+
             Character.HealthUpdateInterval = 0.0f;
 
             CalculateVitality();
@@ -766,6 +779,8 @@ namespace Barotrauma
 
         public void Update(float deltaTime)
         {
+            WasInFullHealth = vitality >= MaxVitality;
+
             UpdateOxygen(deltaTime);
 
             StunTimer = Stun > 0 ? StunTimer + deltaTime : 0;
@@ -813,10 +828,16 @@ namespace Barotrauma
                     }
                     Character.StackSpeedMultiplier(affliction.GetSpeedMultiplier());
                 }
+
                 foreach (var affliction in afflictionsToRemove)
                 {
                     afflictions.Remove(affliction);
-                }                
+                }
+
+                if (afflictionsToRemove.Count is not 0)
+                {
+                    MedicalClinic.OnAfflictionCountChanged(Character);
+                }
             }
 
             Character.StackSpeedMultiplier(1f + Character.GetStatValue(StatTypes.MovementSpeed));
@@ -870,6 +891,11 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// 0-1.
+        /// </summary>
+        public float OxygenLowResistance => !Character.NeedsOxygen ? 1 : GetResistance(oxygenLowAffliction.Prefab);
+
         private void UpdateOxygen(float deltaTime)
         {
             if (!Character.NeedsOxygen)
@@ -978,6 +1004,8 @@ namespace Barotrauma
             UpdateLimbAfflictionOverlays();
             UpdateSkinTint();
             Character.Kill(type, affliction);
+
+            WasInFullHealth = false;
 #if CLIENT
             DisplayVitalityDelay = 0.0f;
             DisplayedVitality = Vitality;

Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs

@@ -490,13 +490,9 @@ namespace Barotrauma
 
         public int RefJointIndex => Params.RefJoint;
 
-        private List<WearableSprite> wearingItems;
-        public List<WearableSprite> WearingItems
-        {
-            get { return wearingItems; }
-        }
+        public readonly List<WearableSprite> WearingItems = new List<WearableSprite>();
 
-        public List<WearableSprite> OtherWearables { get; private set; } = new List<WearableSprite>();
+        public readonly List<WearableSprite> OtherWearables = new List<WearableSprite>();
 
         public bool PullJointEnabled
         {
@@ -640,7 +636,6 @@ namespace Barotrauma
             this.ragdoll = ragdoll;
             this.character = character;
             this.Params = limbParams;
-            wearingItems = new List<WearableSprite>();            
             dir = Direction.Right;
             body = new PhysicsBody(limbParams);
             type = limbParams.Type;
@@ -772,7 +767,7 @@ namespace Barotrauma
                         tempModifiers.Add(damageModifier);
                     }
                 }
-                foreach (WearableSprite wearable in wearingItems)
+                foreach (WearableSprite wearable in WearingItems)
                 {
                     foreach (DamageModifier damageModifier in wearable.WearableComponent.DamageModifiers)
                     {
@@ -791,10 +786,15 @@ namespace Barotrauma
                 }
                 if (!foundMatchingModifier && random > affliction.Probability) { continue; }
                 float finalDamageModifier = damageMultiplier;
-                if (affliction.Prefab.AfflictionType == "emp" && character.EmpVulnerability > 0)
+                if (character.EmpVulnerability > 0 && affliction.Prefab.AfflictionType == AfflictionPrefab.EMPType)
                 {
                     finalDamageModifier *= character.EmpVulnerability;
                 }
+                if (!character.Params.Health.PoisonImmunity && 
+                    (affliction.Prefab.AfflictionType == AfflictionPrefab.PoisonType || affliction.Prefab.AfflictionType == AfflictionPrefab.ParalysisType))
+                {
+                    finalDamageModifier *= character.PoisonVulnerability;
+                }
                 foreach (DamageModifier damageModifier in tempModifiers)
                 {
                     float damageModifierValue = damageModifier.DamageMultiplier;

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs

@@ -21,7 +21,7 @@ namespace Barotrauma
         public Identifier SpeciesName { get; private set; }
 
         [Serialize("", IsPropertySaveable.Yes, description: "If the creature is a variant that needs to use a pre-existing translation."), Editable]
-        public string SpeciesTranslationOverride { get; private set; }
+        public Identifier SpeciesTranslationOverride { get; private set; }
 
         [Serialize("", IsPropertySaveable.Yes, description: "If the display name is not defined, the game first tries to find the translated name. If that is not found, the species name will be used."), Editable]
         public string DisplayName { get; private set; }
@@ -113,6 +113,12 @@ namespace Barotrauma
         [Serialize(false, IsPropertySaveable.Yes), Editable]
         public bool DrawLast { get; set; }
 
+        [Serialize(1.0f, IsPropertySaveable.Yes, "Tells the bots how much they should prefer targeting this character with submarine weapons. Defaults to 1. Set 0 to tell the bots not to target this character at all. Distance to the target affects the decision making."), Editable]
+        public float AITurretPriority { get; set; }
+
+        [Serialize(1.0f, IsPropertySaveable.Yes, "Tells the bots how much they should prefer targeting this character with submarine weapons tagged as \"slowturret\", like railguns. The tag is arbitrary and can be added to any turrets, just like the priority. Defaults to 1. Not used if AITurretPriority is 0. Distance to the target affects the decision making."), Editable]
+        public float AISlowTurretPriority { get; set; }
+
         public readonly CharacterFile File;
 
         public XDocument VariantFile { get; private set; }
@@ -479,7 +485,7 @@ namespace Barotrauma
             [Serialize(true, IsPropertySaveable.Yes), Editable]
             public bool DoesBleed { get; set; }
 
-            [Serialize(float.NegativeInfinity, IsPropertySaveable.Yes), Editable(minValue: float.NegativeInfinity, maxValue: 0)]
+            [Serialize(float.PositiveInfinity, IsPropertySaveable.Yes), Editable(minValue: 0, maxValue: float.PositiveInfinity)]
             public float CrushDepth { get; set; }
 
             // Make editable?
@@ -504,6 +510,9 @@ namespace Barotrauma
             [Serialize(false, IsPropertySaveable.Yes), Editable]
             public bool PoisonImmunity { get; set; }
 
+            [Serialize(1f, IsPropertySaveable.Yes, description: "1 = default, 0 = immune."), Editable(MinValueFloat = 0f, MaxValueFloat = 1000, DecimalCount = 1)]
+            public float PoisonVulnerability { get; set; }
+
             [Serialize(0f, IsPropertySaveable.Yes), Editable]
             public float EmpVulnerability { get; set; }
 
@@ -512,7 +521,20 @@ namespace Barotrauma
 
             // TODO: limbhealths, sprite?
 
-            public HealthParams(ContentXElement element, CharacterParams character) : base(element, character) { }
+            public HealthParams(ContentXElement element, CharacterParams character) : base(element, character) 
+            { 
+                //backwards compatibility
+                if (CrushDepth < 0)
+                {
+                    //invert y, convert to meters, and add 1000 to be on the safe side (previously the value would be from the bottom of the level)
+                    float newCrushDepth = -CrushDepth * Physics.DisplayToRealWorldRatio + 1000;
+                    DebugConsole.AddWarning($"Character \"{character.SpeciesName}\" has a negative crush depth. "+
+                        "Previously the crush depths were defined as display units (e.g. -30000 would correspond to 300 meters below the level), "+
+                        "but now they're in meters (e.g. 3000 would correspond to a depth of 3000 meters displayed on the nav terminal). "+
+                        $"Changing the crush depth from {CrushDepth} to {newCrushDepth}.");
+                    CrushDepth = newCrushDepth;
+                }
+            }
         }
 
         public class InventoryParams : SubParam

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionData/AbilityConditionCharacter.cs

@@ -28,7 +28,6 @@ namespace Barotrauma.Abilities
                             conditionals.Add(new PropertyConditional(attribute));
                         }
                     }
-                    break;
                 }
             }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionData/AbilityConditionItem.cs

@@ -37,19 +37,7 @@ namespace Barotrauma.Abilities
 
             if (itemPrefab != null)
             {
-                if (category != MapEntityCategory.None)
-                {
-                    if (!itemPrefab.Category.HasFlag(category)) { return false; }
-                }
-
-                if (identifiers.Any())
-                {
-                    if (!identifiers.Any(t => itemPrefab.Identifier == t))
-                    {
-                        return false;
-                    }
-                }
-                return !tags.Any() || tags.Any(t => itemPrefab.Tags.Any(p => t == p));
+                return MatchesItem(itemPrefab);
             }
             else
             {
@@ -57,5 +45,22 @@ namespace Barotrauma.Abilities
                 return false;
             }
         }
+
+        public bool MatchesItem(ItemPrefab itemPrefab)
+        {
+            if (category != MapEntityCategory.None)
+            {
+                if (!itemPrefab.Category.HasFlag(category)) { return false; }
+            }
+
+            if (identifiers.Any())
+            {
+                if (!identifiers.Any(t => itemPrefab.Identifier == t))
+                {
+                    return false;
+                }
+            }
+            return !tags.Any() || tags.Any(t => itemPrefab.Tags.Any(p => t == p));
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionData/AbilityConditionMission.cs

@@ -8,19 +8,19 @@ namespace Barotrauma.Abilities
     class AbilityConditionMission : AbilityConditionData
     {
         private readonly ImmutableHashSet<MissionType> missionType;
-        private readonly ImmutableHashSet<Identifier> factions;
+        private readonly bool isAffiliated;
 
         public AbilityConditionMission(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
             string[] missionTypeStrings = conditionElement.GetAttributeStringArray("missiontype", new []{ "None" })!;
             HashSet<MissionType> missionTypes = new HashSet<MissionType>();
-            factions = conditionElement.GetAttributeIdentifierImmutableHashSet("faction", ImmutableHashSet<Identifier>.Empty);
+            isAffiliated = conditionElement.GetAttributeBool("isaffiliated", false);
 
             foreach (string missionTypeString in missionTypeStrings)
             {
                 if (!Enum.TryParse(missionTypeString, out MissionType parsedMission) || parsedMission is MissionType.None)
                 {
-                    if (factions.IsEmpty)
+                    if (!isAffiliated)
                     {
                         DebugConsole.ThrowError($"Error in AbilityConditionMission \"{characterTalent.DebugIdentifier}\" - \"{missionTypeString}\" is not a valid mission type.");
                     }
@@ -37,23 +37,28 @@ namespace Barotrauma.Abilities
         {
             if (abilityObject is IAbilityMission { Mission: { } mission })
             {
-                if (factions.Any())
-                {
-                    if (GameMain.GameSession?.Campaign?.Factions is not { } factions) { return false; }
+                if (!isAffiliated) { return CheckMissionType(); }
 
-                    foreach (var (factionIdentifier, amount) in mission.ReputationRewards)
+                if (GameMain.GameSession?.Campaign?.Factions is not { } factions) { return false; }
+
+                foreach (var (factionIdentifier, amount) in mission.ReputationRewards)
+                {
+                    if (amount <= 0) { continue; }
+                    if (GetMatchingFaction(factionIdentifier) is { } faction &&
+                        Faction.GetPlayerAffiliationStatus(faction) is FactionAffiliation.Positive)
                     {
-                        if (amount <= 0) { continue; }
-                        if (factions.FirstOrDefault(faction => factionIdentifier == faction.Prefab.Identifier) is Faction faction &&
-                            Faction.GetPlayerAffiliationStatus(faction) is FactionAffiliation.Positive)
-                        {
-                            return true;
-                        }
+                        return CheckMissionType();
                     }
-                    return false;
                 }
 
-                return missionType.Contains(mission.Prefab.Type);
+                return false;
+
+                Faction GetMatchingFaction(Identifier factionIdentifier) =>
+                    factionIdentifier == "location"
+                        ? mission.OriginLocation?.Faction
+                        : factions.FirstOrDefault(f => factionIdentifier == f.Prefab.Identifier);
+
+                bool CheckMissionType() => missionType.IsEmpty || missionType.Contains(mission.Prefab.Type);
             }
 
             LogAbilityConditionError(abilityObject, typeof(IAbilityMission));

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CharacterAbilityRemoveRandomIngredient.cs

@@ -1,19 +1,35 @@
 #nullable enable
 
+using Barotrauma.Extensions;
 using Barotrauma.Items.Components;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma.Abilities
 {
     internal sealed class CharacterAbilityRemoveRandomIngredient : CharacterAbility
     {
-        public CharacterAbilityRemoveRandomIngredient(CharacterAbilityGroup characterAbilityGroup, ContentXElement abilityElement) : base(characterAbilityGroup, abilityElement) { }
+        private readonly AbilityConditionItem? condition;
+
+        public CharacterAbilityRemoveRandomIngredient(CharacterAbilityGroup characterAbilityGroup, ContentXElement abilityElement) : base(characterAbilityGroup, abilityElement) 
+        {
+            var conditionElement = abilityElement.GetChildElement(nameof(AbilityConditionItem));
+            if (conditionElement != null)
+            {
+                condition = new AbilityConditionItem(CharacterTalent, conditionElement);
+            }
+        }
 
         protected override void ApplyEffect(AbilityObject abilityObject)
         {
             if (abilityObject is not Fabricator.AbilityFabricationItemIngredients { Items.Count: > 0 } ingredients) { return; }
 
-            int randomIndex = Rand.Int(ingredients.Items.Count, Rand.RandSync.Unsynced);
-            ingredients.Items.RemoveAt(randomIndex);
+            List<Item> applicableIngredients = condition == null ?
+                ingredients.Items.ToList() :
+                ingredients.Items.Where(it => condition.MatchesItem(it.Prefab)).ToList();
+            if (applicableIngredients.None()) { return; }
+
+            ingredients.Items.Remove(applicableIngredients.GetRandom(Rand.RandSync.Unsynced));
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackage/ContentPackage.cs

@@ -42,7 +42,7 @@ namespace Barotrauma
         public readonly Version GameVersion;
         public readonly string ModVersion;
         public Md5Hash Hash { get; private set; }
-        public readonly Option<DateTime> InstallTime;
+        public readonly Option<SerializableDateTime> InstallTime;
 
         public ImmutableArray<ContentFile> Files { get; private set; }
         
@@ -73,7 +73,7 @@ namespace Barotrauma
             
             Steamworks.Ugc.Item? item = await SteamManager.Workshop.GetItem(steamWorkshopId.Value);
             if (item is null) { return true; }
-            return item.Value.LatestUpdateTime <= installTime;
+            return item.Value.LatestUpdateTime <= installTime.ToUtcValue();
         }
 
         public int Index => ContentPackageManager.EnabledPackages.IndexOf(this);
@@ -106,10 +106,7 @@ namespace Barotrauma
 
             GameVersion = rootElement.GetAttributeVersion("gameversion", GameMain.Version);
             ModVersion = rootElement.GetAttributeString("modversion", DefaultModVersion);
-            UInt64 installTimeUnix = rootElement.GetAttributeUInt64("installtime", 0);
-            InstallTime = installTimeUnix != 0
-                ? Option<DateTime>.Some(ToolBox.Epoch.ToDateTime(installTimeUnix))
-                : Option<DateTime>.None();
+            InstallTime = rootElement.GetAttributeDateTime("installtime");
 
             var fileResults = rootElement.Elements()
                 .Select(e => ContentFile.CreateFromXElement(this, e))
@@ -288,9 +285,7 @@ namespace Barotrauma
 
                     if (errorCatcher.Errors.Any())
                     {
-                        yield return ContentPackageManager.LoadProgress.Failure(
-                            ContentPackageManager.LoadProgress.Error
-                                .Reason.ConsoleErrorsThrown);
+                        yield return ContentPackageManager.LoadProgress.Failure(errorCatcher.Errors.Select(e => e.Text));
                         yield break;
                     }
                     yield return ContentPackageManager.LoadProgress.Progress((i + indexOffset) / (float)Files.Length);

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackageManager.cs

@@ -437,22 +437,19 @@ namespace Barotrauma
         public readonly record struct LoadProgress(Result<float, LoadProgress.Error> Result)
         {
             public readonly record struct Error(
-                Error.Reason ErrorReason,
-                Option<Exception> Exception)
+                Either<ImmutableArray<string>, Exception> ErrorsOrException)
             {
-                public enum Reason { Exception, ConsoleErrorsThrown }
-
-                public Error(Reason reason) : this(reason, Option.None) { }
-                public Error(Exception exception) : this(Reason.Exception, Option.Some(exception)) { }
+                public Error(IEnumerable<string> errorMessages) : this(ErrorsOrException: errorMessages.ToImmutableArray()) { }
+                public Error(Exception exception) : this(ErrorsOrException: exception) { }
             }
 
             public static LoadProgress Failure(Exception exception)
                 => new LoadProgress(
                     Result<float, Error>.Failure(new Error(exception)));
 
-            public static LoadProgress Failure(Error.Reason reason)
+            public static LoadProgress Failure(IEnumerable<string> errorMessages)
                 => new LoadProgress(
-                    Result<float, Error>.Failure(new Error(reason)));
+                    Result<float, Error>.Failure(new Error(errorMessages)));
 
             public static LoadProgress Progress(float value)
                 => new LoadProgress(

Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs

@@ -1443,7 +1443,7 @@ namespace Barotrauma
             commands.Add(new Command("kill", "kill [character]: Immediately kills the specified character.", (string[] args) =>
             {
                 Character killedCharacter = (args.Length == 0) ? Character.Controlled : FindMatchingCharacter(args);
-                killedCharacter?.SetAllDamage(200.0f, 0.0f, 0.0f);
+                killedCharacter?.Kill(CauseOfDeathType.Unknown, causeOfDeathAffliction: null);
             },
             () =>
             {
@@ -1887,6 +1887,9 @@ namespace Barotrauma
             commands.Add(new Command("followsub", "Toggle whether the camera should follow the nearest submarine (client-only).", null));
             commands.Add(new Command("toggleaitargets|aitargets", "Toggle the visibility of AI targets (= targets that enemies can detect and attack/escape from) (client-only).", null, isCheat: true));
             commands.Add(new Command("debugai", "Toggle the ai debug mode on/off (works properly only in single player).", null, isCheat: true));
+            commands.Add(new Command("devmode", "Toggle the dev mode on/off (client-only).", null, isCheat: true));
+            commands.Add(new Command("showmonsters", "Permanently unlocks all the monsters in the character editor. Use \"hidemonsters\" to undo.", null, isCheat: true));
+            commands.Add(new Command("hidemonsters", "Permanently hides in the character editor all the monsters that haven't been encountered in the game. Use \"showmonsters\" to undo.", null, isCheat: true));
 
             InitProjectSpecific();
 

Barotrauma/BarotraumaShared/SharedSource/Enums.cs

@@ -49,7 +49,6 @@ namespace Barotrauma
         OnUseRangedWeapon,
         OnReduceAffliction,
         OnAddDamageAffliction,
-        OnSelfRagdoll,
         OnRagdoll,
         OnRoundEnd,
         OnLootCharacter,

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

@@ -1,5 +1,4 @@
 using Barotrauma.Extensions;
-using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -8,7 +7,7 @@ using System.Linq;
 
 namespace Barotrauma
 {
-    class MissionAction : EventAction
+    partial class MissionAction : EventAction
     {
         [Serialize("", IsPropertySaveable.Yes)]
         public Identifier MissionIdentifier { get; set; }
@@ -106,7 +105,8 @@ namespace Barotrauma
                             IconColor = unlockedMission.Prefab.IconColor
                         };
 #else
-                        NotifyMissionUnlock(unlockedMission, unlockLocation);
+                        missionsUnlockedThisRound.Add(unlockedMission);
+                        NotifyMissionUnlock(unlockedMission);
 #endif
                     }
                 }
@@ -186,21 +186,5 @@ namespace Barotrauma
         {
             return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(MissionAction)} -> ({(MissionIdentifier.IsEmpty ? MissionTag : MissionIdentifier)})";
         }
-
-#if SERVER
-        private static void NotifyMissionUnlock(Mission mission, Location unlockLocation)
-        {
-            foreach (Client client in GameMain.Server.ConnectedClients)
-            {
-                IWriteMessage outmsg = new WriteOnlyMessage();
-                outmsg.WriteByte((byte)ServerPacketHeader.EVENTACTION);
-                outmsg.WriteByte((byte)EventManager.NetworkEventType.MISSION);
-                outmsg.WriteIdentifier(mission.Prefab.Identifier);
-                outmsg.WriteInt32(GameMain.GameSession?.Map?.Locations.IndexOf(unlockLocation) ?? -1);
-                outmsg.WriteString(mission.Name.Value);
-                GameMain.Server.ServerPeer.Send(outmsg, client.Connection, DeliveryMethod.Reliable);
-            }
-        }
-#endif
     }
 }

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

@@ -69,8 +69,8 @@ namespace Barotrauma
                         {
                             DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a location type with the identifier \"{Type}\".");
                         }
-                        else
-                        {
+                        else if (!location.LocationTypeChangesBlocked)
+                        {                           
                             location.ChangeType(campaign, locationType);
                         }
                     }

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

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
+using System.Collections.Immutable;
 
 namespace Barotrauma
 {
@@ -11,17 +9,20 @@ namespace Barotrauma
         public Identifier TargetTag { get; set; }
 
         [Serialize("", IsPropertySaveable.Yes)]
-        public Identifier ItemIdentifier { get; set; }
+        public string ItemIdentifiers { get; set; }
 
         [Serialize(1, IsPropertySaveable.Yes)]
         public int Amount { get; set; }
 
-        public RemoveItemAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) 
-        { 
-            if (ItemIdentifier.IsEmpty)
+        private readonly ImmutableHashSet<Identifier> itemIdentifierSplit;
+
+        public RemoveItemAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element)
+        {
+            if (string.IsNullOrEmpty(ItemIdentifiers))
             {
-                ItemIdentifier = element.GetAttributeIdentifier("itemidentifiers", element.GetAttributeIdentifier("identifier", Identifier.Empty));
+                ItemIdentifiers = element.GetAttributeString("itemidentifier", element.GetAttributeString("identifier", string.Empty));
             }
+            itemIdentifierSplit = ItemIdentifiers.Split(',').ToIdentifiers().ToImmutableHashSet();
         }
 
         private bool isFinished = false;
@@ -62,7 +63,7 @@ namespace Barotrauma
                         var item = inventory.FindItem(it => 
                             it != null && 
                             !removedItems.Contains(it) &&
-                            (ItemIdentifier.IsEmpty || it.Prefab.Identifier == ItemIdentifier), recursive: true);
+                            (itemIdentifierSplit.Count == 0 || itemIdentifierSplit.Contains(it.Prefab.Identifier)), recursive: true);
                         if (item == null) { break; }
                         Entity.Spawner.AddItemToRemoveQueue(item);
                         removedItems.Add(item);
@@ -70,7 +71,7 @@ namespace Barotrauma
                 }
                 else if (target is Item item)
                 {
-                    if (ItemIdentifier.IsEmpty || item.Prefab.Identifier == ItemIdentifier)
+                    if (itemIdentifierSplit.Count == 0 || itemIdentifierSplit.Contains(item.Prefab.Identifier))
                     {
                         Entity.Spawner.AddItemToRemoveQueue(item);
                         removedItems.Add(item);

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

@@ -93,7 +93,13 @@ namespace Barotrauma
         {
             ignoreSpawnPointType = element.GetAttribute("spawnpointtype") == null;
             //backwards compatibility
-            TeamID = element.GetAttributeEnum("teamtag", element.GetAttributeEnum<CharacterTeamType>("team", TeamID));
+            TeamID = element.GetAttributeEnum("teamtag", element.GetAttributeEnum("team", TeamID));
+            if (element.GetAttribute("submarinetype") != null)
+            {
+                DebugConsole.ThrowError(
+                    $"Error in even \"{(parentEvent.Prefab?.Identifier.ToString() ?? "unknown")}\". " +
+                    $"The attribute \"submarinetype\" is not valid in {nameof(SpawnAction)}. Did you mean {nameof(SpawnLocation)}?");
+            }
         }
 
         public override bool IsFinished(ref string goTo)
@@ -320,30 +326,24 @@ namespace Barotrauma
         public static WayPoint GetSpawnPos(SpawnLocationType spawnLocation, SpawnType? spawnPointType, IEnumerable<Identifier> moduleFlags = null, IEnumerable<Identifier> spawnpointTags = null, bool asFarAsPossibleFromAirlock = false, bool requireTaggedSpawnPoint = false)
         {
             bool requireHull = spawnLocation == SpawnLocationType.MainSub || spawnLocation == SpawnLocationType.Outpost;
-            List<WayPoint> potentialSpawnPoints = WayPoint.WayPointList.FindAll(wp => IsValidSubmarineType(spawnLocation, wp.Submarine) && (wp.CurrentHull != null || !requireHull));
-            
-            potentialSpawnPoints = potentialSpawnPoints.FindAll(wp => wp.ConnectedDoor == null && wp.Ladders == null && !wp.isObstructed);
-
+            List<WayPoint> potentialSpawnPoints = WayPoint.WayPointList.FindAll(wp => IsValidSubmarineType(spawnLocation, wp.Submarine) && (wp.CurrentHull != null || !requireHull));           
+            potentialSpawnPoints = potentialSpawnPoints.FindAll(wp => wp.ConnectedDoor == null && wp.Ladders == null && wp.IsTraversable);
             if (moduleFlags != null && moduleFlags.Any())
             {
-                List<WayPoint> spawnPoints = potentialSpawnPoints.Where(wp => wp.CurrentHull?.OutpostModuleTags.Any(moduleFlags.Contains) ?? false).ToList();
+                var spawnPoints = potentialSpawnPoints.Where(wp => wp.CurrentHull is Hull h && h.OutpostModuleTags.Any(moduleFlags.Contains));
                 if (spawnPoints.Any())
                 {
-                    potentialSpawnPoints = spawnPoints;
+                    potentialSpawnPoints = spawnPoints.ToList();
                 }
             }
-
             if (spawnpointTags != null && spawnpointTags.Any())
             {
-                var spawnPoints = potentialSpawnPoints
-                    .Where(wp => spawnpointTags.Any(tag => wp.Tags.Contains(tag) && wp.ConnectedDoor == null && !wp.isObstructed));
-
+                var spawnPoints = potentialSpawnPoints.Where(wp => spawnpointTags.Any(tag => wp.Tags.Contains(tag) && wp.ConnectedDoor == null && wp.IsTraversable));
                 if (requireTaggedSpawnPoint || spawnPoints.Any())
                 {
                     potentialSpawnPoints = spawnPoints.ToList();
                 }
             }
-
             if (potentialSpawnPoints.None())
             {
                 if (requireTaggedSpawnPoint && spawnpointTags != null && spawnpointTags.Any())

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

@@ -119,12 +119,12 @@ namespace Barotrauma
 
         private void TagItemsByIdentifier(Identifier identifier)
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && SubmarineTypeMatches(it.Submarine) && it.Prefab.Identifier == identifier);
+            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && IsValidItem(it) && it.Prefab.Identifier == identifier);
         }
 
         private void TagItemsByTag(Identifier tag)
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && SubmarineTypeMatches(it.Submarine) && it.HasTag(tag));
+            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && IsValidItem(it) && it.HasTag(tag));
         }
 
         private void TagHullsByName(Identifier name)
@@ -137,6 +137,11 @@ namespace Barotrauma
             ParentEvent.AddTargetPredicate(Tag, e => e is Submarine s && SubmarineTypeMatches(s) && (type.IsEmpty || type == s.Info?.Type.ToIdentifier()));
         }
 
+        private bool IsValidItem(Item it)
+        {
+            return !it.HiddenInGame && SubmarineTypeMatches(it.Submarine);
+        }
+
         private bool SubmarineTypeMatches(Submarine sub)
         {
             if (SubmarineType == SubType.Any) { return true; }

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

@@ -19,7 +19,9 @@ partial class UIHighlightAction : EventAction
         TurbineOutputSlider,
         DeconstructButton,
         RechargeSpeedSlider,
-        CPRButton
+        CPRButton,
+        CloseButton,
+        MessageBoxCloseButton
     }
 
     [Serialize(ElementId.None, IsPropertySaveable.Yes)]

Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs

@@ -135,7 +135,9 @@ namespace Barotrauma
             pendingEventSets.Clear();
             selectedEvents.Clear();
             activeEvents.Clear();
-
+#if SERVER
+            MissionAction.ResetMissionsUnlockedThisRound();
+#endif
             pathFinder = new PathFinder(WayPoint.WayPointList, false);
             totalPathLength = 0.0f;
             if (level != null)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs

@@ -147,10 +147,7 @@ namespace Barotrauma
                     ISpatialEntity spawnPoint = SpawnAction.GetSpawnPos(
                          SpawnAction.SpawnLocationType.Outpost, SpawnType.Human | SpawnType.Enemy,
                          moduleFlags, spawnPointTags, element.GetAttributeBool("asfaraspossible", false));
-                    if (spawnPoint == null)
-                    {
-                        spawnPoint = submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
-                    }
+                    spawnPoint ??= submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
                     Vector2 spawnPos = spawnPoint.WorldPosition;
                     if (spawnPoint is WayPoint wp && wp.CurrentHull != null && wp.CurrentHull.Rect.Width > 100)
                     {
@@ -189,7 +186,12 @@ namespace Barotrauma
 
                     if (element.Attribute("identifier") != null && element.Attribute("from") != null)
                     {
-                        HumanPrefab humanPrefab = GetHumanPrefabFromElement(element);
+                        HumanPrefab humanPrefab = GetHumanPrefabFromElement(element); 
+                        if (humanPrefab == null)
+                        {
+                            DebugConsole.ThrowError($"Couldn't spawn a human character for abandoned outpost mission: human prefab \"{element.GetAttributeString("identifier", string.Empty)}\" not found");
+                            continue;
+                        }
                         for (int i = 0; i < count; i++)
                         {
                             LoadHuman(humanPrefab, element, submarine);
@@ -201,7 +203,7 @@ namespace Barotrauma
                         var characterPrefab = CharacterPrefab.FindBySpeciesName(speciesName);
                         if (characterPrefab == null)
                         {
-                            DebugConsole.ThrowError("Couldn't spawn a character for abandoned outpost mission: character prefab \"" + speciesName + "\" not found");
+                            DebugConsole.ThrowError($"Couldn't spawn a character for abandoned outpost mission: character prefab \"{speciesName}\" not found");
                             continue;
                         }
                         for (int i = 0; i < count; i++)
@@ -223,10 +225,7 @@ namespace Barotrauma
                 moduleFlags ?? humanPrefab.GetModuleFlags(),
                 spawnPointTags ?? humanPrefab.GetSpawnPointTags(),
                 element.GetAttributeBool("asfaraspossible", false));
-            if (spawnPos == null)
-            {
-                spawnPos = submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
-            }
+            spawnPos ??= submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
 
             bool requiresRescue = element.GetAttributeBool("requirerescue", false);
             var teamId = element.GetAttributeEnum("teamid", requiresRescue ? CharacterTeamType.FriendlyNPC : CharacterTeamType.None);
@@ -255,6 +254,13 @@ namespace Barotrauma
                 }
 #endif
             }
+            else if (TimesAttempted > 0 && spawnedCharacter.AIController is HumanAIController humanAi)
+            {
+                var order = OrderPrefab.Prefabs["fightintruders"]
+                    .CreateInstance(OrderPrefab.OrderTargetType.Entity, orderGiver: spawnedCharacter)
+                    .WithManualPriority(CharacterInfo.HighestManualOrderPriority);
+                spawnedCharacter.SetOrder(order, isNewOrder: true, speak: false);
+            }
 
             if (element.GetAttributeBool("requirekill", false))
             {
@@ -267,10 +273,7 @@ namespace Barotrauma
             Identifier[] moduleFlags = element.GetAttributeIdentifierArray("moduleflags", null);
             Identifier[] spawnPointTags = element.GetAttributeIdentifierArray("spawnpointtags", null);
             ISpatialEntity spawnPos = SpawnAction.GetSpawnPos(SpawnAction.SpawnLocationType.Outpost, SpawnType.Enemy, moduleFlags, spawnPointTags, element.GetAttributeBool("asfaraspossible", false));
-            if (spawnPos == null)
-            {
-                spawnPos = submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
-            }
+            spawnPos ??= submarine.GetHulls(alsoFromConnectedSubs: false).GetRandomUnsynced();
             Character spawnedCharacter = Character.Create(monsterPrefab.Identifier, spawnPos.WorldPosition, ToolBox.RandomSeed(8), createNetworkEvent: false);
             characters.Add(spawnedCharacter);
             if (element.GetAttributeBool("requirekill", false))

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EndMission.cs

@@ -203,8 +203,11 @@ namespace Barotrauma
                     projectileTimer -= deltaTime;
                     if (projectileTimer <= 0.0f)
                     {
+                        float dist = Vector2.Distance(Submarine.MainSub.WorldPosition, boss.WorldPosition);
+                        float distanceFactor = Math.Min(dist / 10000.0f, 1.0f);
                         int projectileAmount = Rand.Range(3, 6);
-                        float spread = MathHelper.ToRadians(Rand.Range(20.0f, 180.0f));
+                        //more concentrated shots the further the sub is
+                        float spread = MathHelper.ToRadians(Rand.Range(20.0f, 180.0f)) * Math.Max(1.0f - distanceFactor, 0.2f);
                         for (int i = 0; i < projectileAmount; i++)
                         {
                             int index = i;
@@ -218,13 +221,13 @@ namespace Barotrauma
                                 }
                                 it.body.SetTransform(it.SimPosition, angle);
                                 it.UpdateTransform();
-                                projectile.Use();
+                                //faster launch velocity the further the sub is
+                                projectile.Use(launchImpulseModifier: MathHelper.Lerp(0, 5, distanceFactor));
                             });
                         }
 
-                        float dist = Vector2.Distance(Submarine.MainSub.WorldPosition, boss.WorldPosition);
                         //the closer the sub is, more likely it is to shoot frequently
-                        float shortIntervalProbability = MathHelper.Lerp(0.9f, 0.05f, dist / 15000.0f);
+                        float shortIntervalProbability = MathHelper.Lerp(0.9f, 0.05f, distanceFactor);
                         if (Rand.Range(0.0f, 1.0f) < shortIntervalProbability)
                         {
                             projectileTimer = Rand.Range(3.0f, 5.0f);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -42,6 +42,8 @@ namespace Barotrauma
             }
         }
 
+        public int TimesAttempted { get; set; }
+
         protected static bool IsClient => GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
 
         private readonly CheckDataAction completeCheckDataAction;
@@ -49,6 +51,12 @@ namespace Barotrauma
         public readonly ImmutableArray<LocalizedString> Headers;
         public readonly ImmutableArray<LocalizedString> Messages;
 
+        /// <summary>
+        /// The reward that was actually given from completing the mission, taking any talent bonuses into account 
+        /// (some of which may not be possible to determine in advance)
+        /// </summary>
+        private int? finalReward;
+
         public virtual LocalizedString Name => Prefab.Name;
 
         private readonly LocalizedString successMessage;
@@ -367,6 +375,8 @@ namespace Barotrauma
                 GiveReward();
             }
 
+            TimesAttempted++;
+
             EndMissionSpecific(completed);
         }
 
@@ -374,6 +384,27 @@ namespace Barotrauma
 
         protected virtual void EndMissionSpecific(bool completed) { }
 
+        /// <summary>
+        /// Get the final reward, taking talent bonuses into account if the mission has concluded and the talents modified the reward accordingly.
+        /// </summary>
+        public int GetFinalReward(Submarine sub)
+        {
+            return finalReward ?? GetReward(sub);
+        }
+
+        /// <summary>
+        /// Calculates the final reward after talent bonuses have been applied. Note that this triggers talent effects of the type OnGainMissionMoney, 
+        /// and should only be called once when the mission is completed!
+        /// </summary>
+        private void CalculateFinalReward(Submarine sub)
+        {
+            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));
+            crewCharacters.ForEach(c => missionMoneyGainMultiplier.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
+            finalReward = (int)(reward * missionMoneyGainMultiplier.Value);
+        }
 
         private void GiveReward()
         {
@@ -417,38 +448,35 @@ namespace Barotrauma
                 info?.GiveExperience((int)((experienceGain * experienceGainMultiplier.Value) * experienceGainMultiplierIndividual.Value));
             }
 
-            // apply money gains afterwards to prevent them from affecting XP gains
-            var missionMoneyGainMultiplier = new AbilityMissionMoneyGainMultiplier(this, 1f);
-            crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnGainMissionMoney, missionMoneyGainMultiplier));
-            crewCharacters.ForEach(c => missionMoneyGainMultiplier.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
-
-            int totalReward = (int)(reward * missionMoneyGainMultiplier.Value);
-            GameAnalyticsManager.AddMoneyGainedEvent(totalReward, GameAnalyticsManager.MoneySource.MissionReward, Prefab.Identifier.Value);
-
+            CalculateFinalReward(Submarine.MainSub);
 #if SERVER
-            totalReward = DistributeRewardsToCrew(GameSession.GetSessionCrewCharacters(CharacterType.Player), totalReward);
+            finalReward = DistributeRewardsToCrew(GameSession.GetSessionCrewCharacters(CharacterType.Player), finalReward.Value);
 #endif
             bool isSingleplayerOrServer = GameMain.IsSingleplayer || GameMain.NetworkMember is { IsServer: true };
-            if (isSingleplayerOrServer && totalReward > 0)
+            if (isSingleplayerOrServer)
             {
-                campaign.Bank.Give(totalReward);
-            }
-
-            foreach (Character character in crewCharacters)
-            {
-                character.Info.MissionsCompletedSinceDeath++;
-            }
-
-            foreach (KeyValuePair<Identifier, float> reputationReward in ReputationRewards)
-            {
-                if (reputationReward.Key == "location")
+                if (finalReward > 0)
                 {
-                    OriginLocation.Reputation?.AddReputation(reputationReward.Value);
+                    campaign.Bank.Give(finalReward.Value);
                 }
-                else
+
+                foreach (Character character in crewCharacters)
                 {
-                    Faction faction = campaign.Factions.Find(faction1 => faction1.Prefab.Identifier == reputationReward.Key);
-                    if (faction != null) { faction.Reputation.AddReputation(reputationReward.Value); }
+                    character.Info.MissionsCompletedSinceDeath++;
+                }
+
+                foreach (KeyValuePair<Identifier, float> reputationReward in ReputationRewards)
+                {
+                    if (reputationReward.Key == "location")
+                    {
+                        OriginLocation.Reputation?.AddReputation(reputationReward.Value);
+                    }
+                    else
+                    {
+                        Faction faction = campaign.Factions.Find(faction1 => faction1.Prefab.Identifier == reputationReward.Key);
+                           float prevValue = faction.Reputation.Value;
+                        faction?.Reputation.AddReputation(reputationReward.Value);
+                    }
                 }
             }
 
@@ -493,12 +521,9 @@ namespace Barotrauma
             float rewardWeight = sum > 100 ? rewardDistribution / sum : rewardDistribution / 100f;
             int rewardPercentage = (int)(rewardWeight * 100);
 
-            return reward switch
-            {
-                Some<int> { Value: var amount } => ((int)(amount * rewardWeight), rewardPercentage, sum),
-                None<int> _ => (0, rewardPercentage, sum),
-                _ => throw new ArgumentOutOfRangeException()
-            };
+            int amount = reward.TryUnwrap(out var a) ? a : 0;
+
+            return ((int)(amount * rewardWeight), rewardPercentage, sum);
         }
 
         protected void ChangeLocationType(LocationTypeChange change)
@@ -518,6 +543,8 @@ namespace Barotrauma
                 if (srcIndex == -1) { return; }
                 var location = Locations[srcIndex];
 
+                if (location.LocationTypeChangesBlocked) { return; }
+
                 if (change.RequiredDurationRange.X > 0)
                 {
                     location.PendingLocationTypeChange = (change, Rand.Range(change.RequiredDurationRange.X, change.RequiredDurationRange.Y), Prefab);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/MissionPrefab.cs

@@ -99,7 +99,13 @@ namespace Barotrauma
 
         public readonly bool RequireWreck, RequireRuin;
 
+        /// <summary>
+        /// If enabled, locations this mission takes place in cannot change their type
+        /// </summary>
+        public readonly bool BlockLocationTypeChanges;
+
         public readonly bool ShowProgressBar;
+        public readonly bool ShowProgressInNumbers;
         public readonly int MaxProgressState;
         public readonly LocalizedString ProgressBarLabel;
 
@@ -178,6 +184,7 @@ namespace Barotrauma
             IsSideObjective = element.GetAttributeBool("sideobjective", false);
             RequireWreck = element.GetAttributeBool("requirewreck", false);
             RequireRuin = element.GetAttributeBool("requireruin", false);
+            BlockLocationTypeChanges = element.GetAttributeBool(nameof(BlockLocationTypeChanges), false);
             Commonness  = element.GetAttributeInt("commonness", 1);
             AllowOtherMissionsInLevel = element.GetAttributeBool("allowothermissionsinlevel", true);
             if (element.GetAttribute("difficulty") != null)
@@ -187,6 +194,7 @@ namespace Barotrauma
             }
 
             ShowProgressBar = element.GetAttributeBool(nameof(ShowProgressBar), false);
+            ShowProgressInNumbers = element.GetAttributeBool(nameof(ShowProgressInNumbers), false);
             MaxProgressState = element.GetAttributeInt(nameof(MaxProgressState), 1);
             string progressBarLabel = element.GetAttributeString(nameof(ProgressBarLabel), "");
             ProgressBarLabel = TextManager.Get(progressBarLabel).Fallback(progressBarLabel);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs

@@ -234,6 +234,12 @@ namespace Barotrauma
                     if (!string.IsNullOrEmpty(target.ExistingItemTag))
                     {
                         var suitableItems = Item.ItemList.Where(it => it.HasTag(target.ExistingItemTag));
+                        if (GameMain.GameSession?.Missions != null)
+                        {
+                            //don't choose an item that was already chosen as the target for another salvage mission
+                            suitableItems = suitableItems.Where(it =>
+                                GameMain.GameSession.Missions.None(m => m != this && m is SalvageMission salvageMission && salvageMission.targets.Any(t => t.Item == it)));
+                        }
                         switch (target.SpawnPositionType)
                         {
                             case Level.PositionType.Cave:

Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs

@@ -311,11 +311,14 @@ namespace Barotrauma.Extensions
             => source
                 .Where(nullable => nullable.HasValue)
                 .Select(nullable => nullable.Value);
-        
+
         public static IEnumerable<T> NotNone<T>(this IEnumerable<Option<T>> source)
-            => source
-                .OfType<Some<T>>()
-                .Select(some => some.Value);
+        {
+            foreach (var o in source)
+            {
+                if (o.TryUnwrap(out var v)) { yield return v; }
+            }
+        }
 
         public static IEnumerable<TSuccess> Successes<TSuccess, TFailure>(
             this IEnumerable<Result<TSuccess, TFailure>> source)

Barotrauma/BarotraumaShared/SharedSource/GameSession/AutoItemPlacer.cs

@@ -21,7 +21,7 @@ namespace Barotrauma
                 for (int i = 0; i < Submarine.MainSubs.Length; i++)
                 {
                     var sub = Submarine.MainSubs[i];
-                    if (sub == null || sub.Info.InitialSuppliesSpawned || !sub.Info.IsPlayer) { continue; }
+                    if (sub == null || sub.Info.InitialSuppliesSpawned || sub.Info.IsManuallyOutfitted || !sub.Info.IsPlayer) { continue; }
                     //1st pass: items defined in the start item set, only spawned in the main sub (not drones/shuttles or other linked subs)
                     SpawnStartItems(sub, startItemSet);
                     //2nd pass: items defined using preferred containers, spawned in the main sub and all the linked subs (drones, shuttles etc)

Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 using Barotrauma.Networking;
+using System.Collections;
 #if SERVER
 using Barotrauma.Networking;
 #endif
@@ -471,6 +472,21 @@ namespace Barotrauma
             return true;
         }
 
+        public static IEnumerable<Hull> FindCargoRooms(IEnumerable<Submarine> subs) => subs.SelectMany(s => FindCargoRooms(s));
+
+        public static IEnumerable<Hull> FindCargoRooms(Submarine sub) => WayPoint.WayPointList
+            .Where(wp => wp.Submarine == sub && wp.SpawnType == SpawnType.Cargo)
+            .Select(wp => wp.CurrentHull)
+            .Distinct();
+
+        public static IEnumerable<Item> FilterCargoCrates(IEnumerable<Item> items, Func<Item, bool> conditional = null)
+            => items.Where(it => it.HasTag("crate") && !it.NonInteractable && !it.NonPlayerTeamInteractable && !it.HiddenInGame && !it.Removed && (conditional == null || conditional(it)));
+
+        public static IEnumerable<ItemContainer> FindReusableCargoContainers(IEnumerable<Submarine> subs, IEnumerable<Hull> cargoRooms = null) =>
+            FilterCargoCrates(Item.ItemList, it => subs.Contains(it.Submarine) && (cargoRooms == null || cargoRooms.Contains(it.CurrentHull)))
+                .Select(it => it.GetComponent<ItemContainer>())
+                .Where(c => c != null);
+
         public static ItemContainer GetOrCreateCargoContainerFor(ItemPrefab item, ISpatialEntity cargoRoomOrSpawnPoint, ref List<ItemContainer> availableContainers)
         {
             ItemContainer itemContainer = null;
@@ -553,8 +569,8 @@ namespace Barotrauma
                 }
 #endif
             }
-
-            List<ItemContainer> availableContainers = new List<ItemContainer>();
+            var connectedSubs = sub.GetConnectedSubs().Where(s => s.Info.Type == SubmarineType.Player);
+            List<ItemContainer> availableContainers = FindReusableCargoContainers(connectedSubs, FindCargoRooms(connectedSubs)).ToList();
             foreach (PurchasedItem pi in itemsToSpawn)
             {
                 Vector2 position = GetCargoPos(cargoRoom, pi.ItemPrefab);

Barotrauma/BarotraumaShared/SharedSource/GameSession/CrewManager.cs

@@ -248,11 +248,27 @@ namespace Barotrauma
             List<WayPoint> spawnWaypoints = null;
             List<WayPoint> mainSubWaypoints = WayPoint.SelectCrewSpawnPoints(characterInfos, Submarine.MainSub).ToList();
 
-            if (Level.IsLoadedOutpost && Submarine.Loaded.Any(s => s.Info.Type == SubmarineType.Outpost && (s.Info.OutpostGenerationParams?.SpawnCrewInsideOutpost ?? false)))
+            bool hostileOutpost = false;
+            if (Level.IsLoadedOutpost)
             {
-                spawnWaypoints = WayPoint.WayPointList.FindAll(wp => 
+                if (Submarine.Loaded.Any(s => s.Info.Type == SubmarineType.Outpost && (s.Info.OutpostGenerationParams?.SpawnCrewInsideOutpost ?? false)))
+                {
+                    hostileOutpost = true;
+                }
+                else if (GameMain.GameSession?.GameMode is CampaignMode campaign)
+                {
+                    var reputation = campaign.Map?.CurrentLocation?.Reputation;
+                    if (reputation != null && reputation.NormalizedValue < Reputation.HostileThreshold)
+                    {
+                        hostileOutpost = true;
+                    }
+                }
+            }
+            if (hostileOutpost)
+            {
+                spawnWaypoints = WayPoint.WayPointList.FindAll(wp =>
                     wp.SpawnType == SpawnType.Human &&
-                    wp.Submarine == Level.Loaded.StartOutpost && 
+                    wp.Submarine == Level.Loaded.StartOutpost &&
                     wp.CurrentHull != null &&
                     wp.CurrentHull.OutpostModuleTags.Contains("airlock".ToIdentifier()));
                 while (spawnWaypoints.Count > characterInfos.Count)
@@ -264,7 +280,6 @@ namespace Barotrauma
                     spawnWaypoints.Add(spawnWaypoints[Rand.Int(spawnWaypoints.Count)]);
                 }
             }
-
             if (spawnWaypoints == null || !spawnWaypoints.Any())
             {
                 spawnWaypoints = mainSubWaypoints;

Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Factions.cs

@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -27,28 +28,20 @@ namespace Barotrauma
         /// Get what kind of affiliation this faction has towards the player depending on who they chose to side with via talents
         /// </summary>
         /// <returns></returns>
-        public static FactionAffiliation GetPlayerAffiliationStatus(Faction faction, ImmutableHashSet<Character>? characterList = null)
+        public static FactionAffiliation GetPlayerAffiliationStatus(Faction faction)
         {
             if (GameMain.GameSession?.Campaign?.Factions is not { } factions) { return FactionAffiliation.Neutral; }
 
-            characterList ??= GameSession.GetSessionCrewCharacters(CharacterType.Both);
-
-            foreach (Character character in characterList)
+            bool isHighest = true;
+            foreach (Faction otherFaction in factions)
             {
-                if (character.Info is not { } info) { continue; }
+                if (otherFaction == faction || otherFaction.Reputation.Value < faction.Reputation.Value) { continue; }
 
-                foreach (Faction otherFaction in factions)
-                {
-                    Identifier factionIdentifier = otherFaction.Prefab.Identifier;
-                    if (info.GetSavedStatValue(StatTypes.Affiliation, factionIdentifier) > 0f)
-                    {
-                        return factionIdentifier == faction.Prefab.Identifier
-                            ? FactionAffiliation.Positive
-                            : FactionAffiliation.Negative;
-                    }
-                }
+                isHighest = false;
+                break;
             }
-            return FactionAffiliation.Neutral;
+
+            return isHighest ? FactionAffiliation.Positive : FactionAffiliation.Negative;
         }
 
         public override string ToString()
@@ -88,6 +81,8 @@ namespace Barotrauma
             public readonly LevelData.LevelType LevelType;
             public readonly float MinReputation, MaxReputation;
             public readonly float MinProbability, MaxProbability;
+            public readonly int MaxDistanceFromFactionOutpost;
+            public readonly bool DisallowBetweenOtherFactionOutposts;
 
             public AutomaticMission(ContentXElement element, string parentDebugName)
             {
@@ -102,6 +97,8 @@ namespace Barotrauma
                 float probability = element.GetAttributeFloat("probability", 0.0f);
                 MinProbability = element.GetAttributeFloat("minprobability", probability);
                 MaxProbability = element.GetAttributeFloat("maxprobability", probability);
+                MaxDistanceFromFactionOutpost = element.GetAttributeInt("maxdistance", int.MaxValue);
+                DisallowBetweenOtherFactionOutposts = element.GetAttributeBool(nameof(DisallowBetweenOtherFactionOutposts), false);
             }
         }
 

Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs

@@ -58,7 +58,7 @@ namespace Barotrauma
             Value = newReputation;
         }
 
-        public void AddReputation(float reputationChange)
+        public float GetReputationChangeMultiplier(float reputationChange)
         {
             if (reputationChange > 0f)
             {
@@ -68,7 +68,7 @@ namespace Barotrauma
                     reputationGainMultiplier *= 1f + character.GetStatValue(StatTypes.ReputationGainMultiplier, includeSaved: false);
                     reputationGainMultiplier *= 1f + character.Info?.GetSavedStatValue(StatTypes.ReputationGainMultiplier, Identifier) ?? 0;
                 }
-                reputationChange *= reputationGainMultiplier;
+                return reputationGainMultiplier;
             }
             else if (reputationChange < 0f)
             {
@@ -78,9 +78,14 @@ namespace Barotrauma
                     reputationLossMultiplier *= 1f + character.GetStatValue(StatTypes.ReputationLossMultiplier, includeSaved: false);
                     reputationLossMultiplier *= 1f + character.Info?.GetSavedStatValue(StatTypes.ReputationLossMultiplier, Identifier) ?? 0;
                 }
-                reputationChange *= reputationLossMultiplier;
+                return reputationLossMultiplier;
             }
-            Value += reputationChange;
+            return 1.0f;
+        }
+
+        public void AddReputation(float reputationChange)
+        {
+            Value += reputationChange * GetReputationChangeMultiplier(reputationChange);
         }
 
         public readonly NamedEvent<Reputation> OnReputationValueChanged = new NamedEvent<Reputation>();

Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Wallet.cs

@@ -69,7 +69,7 @@ namespace Barotrauma
         public Option<int> RewardDistributionChanged;
         public Option<int> BalanceChanged;
 
-        public WalletChangedData MergeInto(WalletChangedData other)
+        public readonly WalletChangedData MergeInto(WalletChangedData other)
         {
             other.BalanceChanged = AddOptionalInt(other.BalanceChanged, BalanceChanged);
             other.RewardDistributionChanged = AddOptionalInt(other.RewardDistributionChanged, RewardDistributionChanged);
@@ -80,32 +80,20 @@ namespace Barotrauma
 
             static Option<int> AddOptionalInt(Option<int> a, Option<int> b)
             {
-                return a switch
-                {
-                    Some<int> some1 => b switch
-                    {
-                        Some<int> some2 => Option<int>.Some(some1.Value + some2.Value),
-                        None<int> _ => Option<int>.Some(some1.Value),
-                        _ => throw new ArgumentOutOfRangeException(nameof(b))
-                    },
-                    None<int> _ => b switch
-                    {
-                        Some<int> some1 => Option<int>.Some(some1.Value),
-                        None<int> _ => Option<int>.None(),
-                        _ => throw new ArgumentOutOfRangeException(nameof(b))
-                    },
-                    _ => throw new ArgumentOutOfRangeException(nameof(a))
-                };
+                bool hasValue1 = a.TryUnwrap(out var value1);
+                bool hasValue2 = b.TryUnwrap(out var value2);
+                return hasValue1
+                    ? hasValue2
+                        ? Option.Some(value1 + value2)
+                        : Option.Some(value1)
+                    : hasValue2
+                        ? Option.Some(value2)
+                        : Option.None;
             }
 
             static Option<int> TurnToNoneIfZero(Option<int> option)
             {
-                return option switch
-                {
-                    Some<int> s => s.Value == 0 ? Option<int>.None() : option,
-                    None<int> _ => option,
-                    _ => throw new ArgumentOutOfRangeException(nameof(option))
-                };
+                return option.Bind(i => i == 0 ? Option.None : Option.Some(i));
             }
         }
     }
@@ -223,12 +211,8 @@ namespace Barotrauma
             };
         }
 
-        public string GetOwnerLogName() => Owner switch
-        {
-            Some<Character> { Value: var character } => character.Name,
-            None<Character> _ => "the bank",
-            _ => throw new ArgumentOutOfRangeException(nameof(Owner))
-        };
+        public string GetOwnerLogName()
+            => Owner.TryUnwrap(out var character) ? character.Name : "the bank";
 
         partial void SettingsChanged(Option<int> balanceChanged, Option<int> rewardChanged);
 

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs

@@ -5,6 +5,7 @@ using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Xml.Linq;
 
@@ -13,13 +14,11 @@ namespace Barotrauma
     abstract partial class CampaignMode : GameMode
     {
         [NetworkSerialize]
-        public struct SaveInfo : INetSerializableStruct
-        {
-            public string FilePath;
-            public int SaveTime;
-            public string SubmarineName;
-            public string[] EnabledContentPackageNames;
-        }
+        public readonly record struct SaveInfo(
+            string FilePath,
+            Option<SerializableDateTime> SaveTime,
+            string SubmarineName,
+            ImmutableArray<string> EnabledContentPackageNames) : INetSerializableStruct;
 
         public const int MaxMoney = int.MaxValue / 2; //about 1 billion
         public const int InitialMoney = 8500;
@@ -84,9 +83,9 @@ namespace Barotrauma
 
         public bool CheatsEnabled;
 
-        public const float HullRepairCostPerDamage = 0.5f, ItemRepairCostPerRepairDuration = 1.0f;
+        public const float HullRepairCostPerDamage = 0.1f, ItemRepairCostPerRepairDuration = 1.0f;
         public const int ShuttleReplaceCost = 1000;
-        public const int MaxHullRepairCost = 2000, MaxItemRepairCost = 2000;
+        public const int MaxHullRepairCost = 600, MaxItemRepairCost = 2000;
 
         protected bool wasDocked;
 
@@ -141,10 +140,19 @@ namespace Barotrauma
         private static bool AnyOneAllowedToManageCampaign(ClientPermissions permissions)
         {
             if (GameMain.NetworkMember == null) { return true; }
-            //allow managing if no-one with permissions is alive
-            return 
-                GameMain.NetworkMember.ConnectedClients.Count == 1 ||
-                GameMain.NetworkMember.ConnectedClients.None(c => c.InGame && c.Character is { IsIncapacitated: false, IsDead: false } && (IsOwner(c) || c.HasPermission(permissions)));
+            if (GameMain.NetworkMember.ConnectedClients.Count == 1) { return true; }
+
+            if (GameMain.NetworkMember.GameStarted)
+            {
+                //allow managing if no-one with permissions is alive and in-game
+                return GameMain.NetworkMember.ConnectedClients.None(c =>
+                    c.InGame && c.Character is { IsIncapacitated: false, IsDead: false } &&
+                    (IsOwner(c) || c.HasPermission(permissions)));
+            }
+            else
+            {
+                return GameMain.NetworkMember.ConnectedClients.None(c => IsOwner(c) || c.HasPermission(permissions));
+            }
         }
 
         protected CampaignMode(GameModePreset preset, CampaignSettings settings)
@@ -163,21 +171,20 @@ namespace Barotrauma
 #if CLIENT
             OnMoneyChanged.RegisterOverwriteExisting(new Identifier("CampaignMoneyChangeNotification"), e =>
             {
-                if (!(e.ChangedData.BalanceChanged is Some<int> { Value: var changed })) { return; }
+                if (!e.ChangedData.BalanceChanged.TryUnwrap(out var changed)) { return; }
 
                 if (changed == 0) { return; }
 
                 bool isGain = changed > 0;
                 Color clr = isGain ? GUIStyle.Yellow : GUIStyle.Red;
 
-                switch (e.Owner)
+                if (e.Owner.TryUnwrap(out var owner))
                 {
-                    case Some<Character> { Value: var owner}:
-                        owner.AddMessage(FormatMessage(), clr, playSound: Character.Controlled == owner, messageIdentifier, changed);
-                        break;
-                    case None<Character> _ when IsSinglePlayer:
-                        Character.Controlled?.AddMessage(FormatMessage(), clr, playSound: true, messageIdentifier, changed);
-                        break;
+                    owner.AddMessage(FormatMessage(), clr, playSound: Character.Controlled == owner, messageIdentifier, changed);
+                }
+                else if (IsSinglePlayer)
+                {
+                    Character.Controlled?.AddMessage(FormatMessage(), clr, playSound: true, messageIdentifier, changed);
                 }
 
                 string FormatMessage() => TextManager.GetWithVariable(isGain ? "moneygainformat" : "moneyloseformat", "[money]", TextManager.FormatCurrency(Math.Abs(changed))).ToString();
@@ -408,14 +415,27 @@ namespace Barotrauma
                 }
                 foreach (Faction faction in factions.OrderBy(f => f.Prefab.MenuOrder))
                 {
-                    if (currentLocation.Faction != faction && currentLocation.SecondaryFaction != faction && 
-                        map.SelectedLocation?.Faction != faction && map.SelectedLocation?.SecondaryFaction != faction)
-                    {
-                        continue;
-                    }
                     foreach (var automaticMission in faction.Prefab.AutomaticMissions)
                     {
                         if (faction.Reputation.Value < automaticMission.MinReputation || faction.Reputation.Value > automaticMission.MaxReputation) { continue; }
+
+                        if (automaticMission.DisallowBetweenOtherFactionOutposts && levelData.Type == LevelData.LevelType.LocationConnection)
+                        {
+                            if (Map.SelectedConnection.Locations.All(l => l.Faction != null && l.Faction != faction))
+                            {
+                                continue;
+                            }
+                        }
+                        if (automaticMission.MaxDistanceFromFactionOutpost < int.MaxValue)
+                        {
+                            if (!Map.LocationOrConnectionWithinDistance(
+                                currentLocation, 
+                                automaticMission.MaxDistanceFromFactionOutpost, 
+                                loc => loc.Faction == faction))
+                            {
+                                continue;
+                            }
+                        }
                         Random rand = new MTRandom(ToolBox.StringToInt(levelData.Seed + TotalPassedLevels));
                         if (levelData.Type != automaticMission.LevelType) { continue; }
                         float probability =
@@ -1012,11 +1032,14 @@ namespace Barotrauma
         public void AssignNPCMenuInteraction(Character character, InteractionType interactionType)
         {
             character.CampaignInteractionType = interactionType;
+
             if (character.CampaignInteractionType == InteractionType.Store &&
                 character.HumanPrefab is { Identifier: var merchantId })
             {
                 character.MerchantIdentifier = merchantId;
+                map.CurrentLocation?.GetStore(merchantId)?.SetMerchantFaction(character.Faction);
             }
+            
             character.DisableHealthWindow =
                 interactionType != InteractionType.None &&
                 interactionType != InteractionType.Examine &&
@@ -1129,7 +1152,7 @@ namespace Barotrauma
             if (npc.TeamID != CharacterTeamType.FriendlyNPC) { return; }
             if (!attacker.IsRemotePlayer && attacker != Character.Controlled) { return; }
 
-            if (npc.HumanPrefab?.Faction != null && Factions.FirstOrDefault(f => f.Prefab.Identifier == npc.HumanPrefab.Faction) is Faction faction)
+            if (npc.Faction != null && Factions.FirstOrDefault(f => f.Prefab.Identifier == npc.Faction) is Faction faction)
             {
                 faction.Reputation?.AddReputation(-attackResult.Damage * Reputation.ReputationLossPerNPCDamage);
             }
@@ -1143,6 +1166,11 @@ namespace Barotrauma
             }
         }
 
+        public Faction GetFaction(Identifier identifier)
+        {
+            return factions.Find(f => f.Prefab.Identifier == identifier);
+        }
+
         public float GetReputation(Identifier factionIdentifier)
         {
             var faction =
@@ -1152,6 +1180,12 @@ namespace Barotrauma
             return faction?.Reputation?.Value ?? 0.0f;
         }
 
+        public FactionAffiliation GetFactionAffiliation(Identifier factionIdentifier)
+        {
+            var faction = GetFaction(factionIdentifier);
+            return Faction.GetPlayerAffiliationStatus(faction);
+        }
+
         public abstract void Save(XElement element);
 
         protected void LoadStats(XElement element)
@@ -1267,7 +1301,7 @@ namespace Barotrauma
             var itemsToTransfer = new List<(Item item, Item container)>();
             if (PendingSubmarineSwitch != null)
             {
-                var connectedSubs = currentSub.GetConnectedSubs().Where(s => s.Info.Type == SubmarineType.Player).ToHashSet();
+                var connectedSubs = currentSub.GetConnectedSubs().Where(s => s.Info.Type == SubmarineType.Player);
                 // Remove items from the old sub
                 foreach (Item item in Item.ItemList)
                 {
@@ -1283,7 +1317,6 @@ namespace Barotrauma
                     if (item.Components.None(c => c is Pickable)) { continue; }
                     if (item.Components.Any(c => c is Pickable p && p.IsAttached)) { continue; }
                     if (item.Components.Any(c => c is Wire w && w.Connections.Any(c => c != null))) { continue; }
-                    if (item.Container?.GetComponent<ItemContainer>() is { DrawInventory: false }) { continue; }
                     itemsToTransfer.Add((item, item.Container));
                     item.Submarine = null;
                 }
@@ -1303,15 +1336,29 @@ namespace Barotrauma
             {
                 // Load the new sub
                 var newSub = new Submarine(PendingSubmarineSwitch);
-                var connectedSubs = newSub.GetConnectedSubs().Where(s => s.Info.Type == SubmarineType.Player).ToHashSet();
-                // Move the transferred items
-                List<ItemContainer> availableContainers = Item.ItemList
-                    .Where(it => connectedSubs.Contains(it.Submarine) && it.HasTag("crate") && !it.NonInteractable && !it.NonPlayerTeamInteractable && !it.HiddenInGame && !it.Removed)
-                    .Select(it => it.GetComponent<ItemContainer>())
-                    .Where(c => c != null)
-                    .ToList();
+                var connectedSubs = newSub.GetConnectedSubs().Where(s => s.Info.Type == SubmarineType.Player);
+                WayPoint wp = WayPoint.WayPointList.FirstOrDefault(wp => wp.SpawnType == SpawnType.Cargo && connectedSubs.Contains(wp.Submarine));
+                Hull spawnHull = wp?.CurrentHull ?? Hull.HullList.FirstOrDefault(h => connectedSubs.Contains(h.Submarine) && !h.IsWetRoom);
+                if (spawnHull == null)
+                {
+                    DebugConsole.AddWarning($"Failed to transfer items between subs. No cargo waypoint or dry hulls found in the new sub.");
+                    return;
+                }
+                // First move the cargo containers, so that we can reuse them
+                var cargoContainers = itemsToTransfer.Where(it => it.item.HasTag("crate"));
+                foreach (var (item, oldContainer) in cargoContainers)
+                {
+                    Vector2 simPos = ConvertUnits.ToSimUnits(CargoManager.GetCargoPos(spawnHull, item.Prefab));
+                    item.SetTransform(simPos, 0.0f, findNewHull: false, setPrevTransform: false);
+                    item.CurrentHull = spawnHull;
+                    item.Submarine = spawnHull.Submarine;
+                }
+                // Then move the other items
+                var cargoRooms = CargoManager.FindCargoRooms(newSub);
+                List<ItemContainer> availableContainers = CargoManager.FindReusableCargoContainers(connectedSubs).ToList();
                 foreach (var (item, oldContainer) in itemsToTransfer)
                 {
+                    if (cargoContainers.Contains((item, oldContainer))) { continue; }
                     Item newContainer = null;
                     item.Submarine = newSub;
                     if (item.Container == null)
@@ -1320,25 +1367,16 @@ namespace Barotrauma
                     }
                     if (item.Container == null && (newContainer == null || !newContainer.OwnInventory.TryPutItem(item, user: null, createNetworkEvent: false)))
                     {
-                        WayPoint wp = WayPoint.GetRandom(SpawnType.Cargo, null, newSub);
-                        Hull spawnHull = wp?.CurrentHull ?? Hull.HullList.Where(h => h.Submarine == newSub && !h.IsWetRoom).GetRandomUnsynced();
-                        if (spawnHull == null)
+                        var cargoContainer = CargoManager.GetOrCreateCargoContainerFor(item.Prefab, spawnHull, ref availableContainers);
+                        if (cargoContainer == null || !cargoContainer.Inventory.TryPutItem(item, user: null, createNetworkEvent: false))
                         {
-                            DebugConsole.AddWarning($"Failed to transfer items between subs. No cargo waypoint or dry hulls found in the new sub.");
-                            return;
+                            Vector2 simPos = ConvertUnits.ToSimUnits(CargoManager.GetCargoPos(spawnHull, item.Prefab));
+                            item.SetTransform(simPos, 0.0f, findNewHull: false, setPrevTransform: false);
                         }
-                        if (spawnHull != null)
+                        else if (cargoContainer.Item.Submarine is Submarine containerSub)
                         {
-                            var cargoContainer = CargoManager.GetOrCreateCargoContainerFor(item.Prefab, spawnHull, ref availableContainers);
-                            if (cargoContainer == null || !cargoContainer.Inventory.TryPutItem(item, user: null, createNetworkEvent: false))
-                            {
-                                Vector2 simPos = ConvertUnits.ToSimUnits(CargoManager.GetCargoPos(spawnHull, item.Prefab));
-                                item.SetTransform(simPos, 0.0f, findNewHull: false, setPrevTransform: false);
-                            }
-                        }
-                        else
-                        {
-                            DebugConsole.AddWarning($"Failed to transfer item {item.Prefab.Identifier} ({item.ID}), because no cargo spawn point could be found!");
+                            // Use the item's sub in case the sub consists of multiple linked subs.
+                            item.Submarine = containerSub;
                         }
                     }
                     string newContainerName = newContainer == null ? "(null)" : $"{newContainer.Prefab.Identifier} ({newContainer.Tags})";

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignSettings.cs

@@ -11,11 +11,14 @@ namespace Barotrauma
     {
         public static CampaignSettings Empty => new CampaignSettings(element: null);
 
+#if CLIENT
+        public static CampaignSettings CurrentSettings = new CampaignSettings(GameSettings.CurrentConfig.SavedCampaignSettings);
+#endif
         public string Name => "CampaignSettings";
 
         public const string LowerCaseSaveElementName = "campaignsettings";
 
-        [Serialize("", IsPropertySaveable.Yes)]
+        [Serialize("Normal", IsPropertySaveable.Yes)]
         public string PresetName { get; set; } = string.Empty;
 
         [Serialize(true, IsPropertySaveable.Yes)]
@@ -53,7 +56,6 @@ namespace Barotrauma
                     return definition.GetInt(StartingBalanceAmount.ToIdentifier());
                 }
                 return 8000;
-                
             }
         }
 
@@ -65,7 +67,7 @@ namespace Barotrauma
                 {
                     return definition.GetFloat(Difficulty.ToIdentifier());
                 }
-                return 0;                
+                return 0;
             }
         }
 
@@ -82,7 +84,7 @@ namespace Barotrauma
         }
 
         public const int DefaultMaxMissionCount = 2;
-        public const int MaxMissionCountLimit = 3;
+        public const int MaxMissionCountLimit = 10;
         public const int MinMissionCountLimit = 1;
 
         public Dictionary<Identifier, SerializableProperty> SerializableProperties { get; private set;  }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameModePreset.cs

@@ -46,15 +46,15 @@ namespace Barotrauma
         public static void Init()
         {
 #if CLIENT
-            Tutorial = new GameModePreset("tutorial".ToIdentifier(), typeof(TutorialMode), true);
-            DevSandbox = new GameModePreset("devsandbox".ToIdentifier(), typeof(GameMode), true);
-            SinglePlayerCampaign = new GameModePreset("singleplayercampaign".ToIdentifier(), typeof(SinglePlayerCampaign), true);
-            TestMode = new GameModePreset("testmode".ToIdentifier(), typeof(TestGameMode), true);
+            Tutorial = new GameModePreset("tutorial".ToIdentifier(), typeof(TutorialMode), isSinglePlayer: true);
+            DevSandbox = new GameModePreset("devsandbox".ToIdentifier(), typeof(GameMode), isSinglePlayer: true);
+            SinglePlayerCampaign = new GameModePreset("singleplayercampaign".ToIdentifier(), typeof(SinglePlayerCampaign), isSinglePlayer: true);
+            TestMode = new GameModePreset("testmode".ToIdentifier(), typeof(TestGameMode), isSinglePlayer: true);
 #endif
-            Sandbox = new GameModePreset("sandbox".ToIdentifier(), typeof(GameMode), false);
-            Mission = new GameModePreset("mission".ToIdentifier(), typeof(CoOpMode), false);
-            PvP = new GameModePreset("pvp".ToIdentifier(), typeof(PvPMode), false);
-            MultiPlayerCampaign = new GameModePreset("multiplayercampaign".ToIdentifier(), typeof(MultiPlayerCampaign), false, false);
+            Sandbox = new GameModePreset("sandbox".ToIdentifier(), typeof(GameMode), isSinglePlayer: false);
+            Mission = new GameModePreset("mission".ToIdentifier(), typeof(CoOpMode), isSinglePlayer: false);
+            PvP = new GameModePreset("pvp".ToIdentifier(), typeof(PvPMode), isSinglePlayer: false);
+            MultiPlayerCampaign = new GameModePreset("multiplayercampaign".ToIdentifier(), typeof(MultiPlayerCampaign), isSinglePlayer: false);
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -194,7 +194,16 @@ namespace Barotrauma
                         }
                         break;
                     case "metadata":
+                        var prevReputations = Factions.ToDictionary(k => k, v => v.Reputation.Value);
                         CampaignMetadata.Load(subElement);
+                        foreach (var faction in Factions)
+                        {
+                            if (!MathUtils.NearlyEqual(prevReputations[faction], faction.Reputation.Value))
+                            {
+                                faction.Reputation.OnReputationValueChanged?.Invoke(faction.Reputation);
+                                Reputation.OnAnyReputationValueChanged.Invoke(faction.Reputation);
+                            }
+                        }
                         break;
                     case "upgrademanager":
                     case "pendingupgrades":

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs

@@ -306,7 +306,7 @@ namespace Barotrauma
         /// <summary>
         /// Switch to another submarine. The sub is loaded when the next round starts.
         /// </summary>
-        public void SwitchSubmarine(SubmarineInfo newSubmarine, bool transferItems, int cost, Client? client = null)
+        public void SwitchSubmarine(SubmarineInfo newSubmarine, bool transferItems, Client? client = null)
         {
             if (!OwnedSubmarines.Any(s => s.Name == newSubmarine.Name))
             {
@@ -324,11 +324,6 @@ namespace Barotrauma
                     }
                 }
             }
-            if ((GameMain.NetworkMember is null || GameMain.NetworkMember is { IsServer: true }) && cost > 0)
-            {
-                Campaign!.TryPurchase(client, cost);
-            }
-            GameAnalyticsManager.AddMoneySpentEvent(cost, GameAnalyticsManager.MoneySink.SubmarineSwitch, newSubmarine.Name);
             Campaign!.PendingSubmarineSwitch = newSubmarine;
             Campaign!.TransferItemsOnSubSwitch = transferItems;
         }
@@ -586,9 +581,7 @@ namespace Barotrauma
             StatusEffect.StopAll();
 
 #if CLIENT
-#if !DEBUG
-            GameMain.LightManager.LosEnabled = GameMain.Client == null || GameMain.Client.CharacterInfo != null;
-#endif
+            GameMain.LightManager.LosEnabled = (GameMain.Client == null || GameMain.Client.CharacterInfo != null) && !GameMain.DevMode;
             if (GameMain.LightManager.LosEnabled) { GameMain.LightManager.LosAlpha = 1f; }
             if (GameMain.Client == null) { GameMain.LightManager.LosMode = GameSettings.CurrentConfig.Graphics.LosMode; }
 #endif
@@ -652,7 +645,7 @@ namespace Barotrauma
                 }
             }
 
-            CreatureMetrics.Instance.RecentlyEncountered.Clear();
+            CreatureMetrics.RecentlyEncountered.Clear();
 
             GameMain.GameScreen.Cam.Position = Character.Controlled?.WorldPosition ?? Submarine.MainSub.WorldPosition;
             RoundDuration = 0.0f;
@@ -905,6 +898,7 @@ namespace Barotrauma
                 TabMenu.OnRoundEnded();
                 GUIMessageBox.MessageBoxes.RemoveAll(mb => mb.UserData as string == "ConversationAction" || ReadyCheck.IsReadyCheck(mb));
                 ObjectiveManager.ResetUI();
+                CharacterHUD.ClearBossHealthBars();
 #endif
                 SteamAchievementManager.OnRoundEnded(this);
 
@@ -1123,7 +1117,10 @@ namespace Barotrauma
             XDocument doc = new XDocument(new XElement("Gamesession"));
             XElement rootElement = doc.Root ?? throw new NullReferenceException("Game session XML element is invalid: document is null.");
 
-            rootElement.Add(new XAttribute("savetime", ToolBox.Epoch.NowLocal));
+            rootElement.Add(new XAttribute("savetime", SerializableDateTime.UtcNow.ToUnixTime()));
+            #warning TODO: after this gets on main, replace savetime with the commented line
+            //rootElement.Add(new XAttribute("savetime", SerializableDateTime.LocalNow));
+
             rootElement.Add(new XAttribute("version", GameMain.Version));
             if (Submarine?.Info != null && !Submarine.Removed && Campaign != null)
             {

Barotrauma/BarotraumaShared/SharedSource/GameSession/MedicalClinic.cs

@@ -14,6 +14,8 @@ namespace Barotrauma
         public enum NetworkHeader
         {
             REQUEST_AFFLICTIONS,
+            AFFLICTION_UPDATE,
+            UNSUBSCRIBE_ME,
             REQUEST_PENDING,
             ADD_PENDING,
             REMOVE_PENDING,
@@ -295,6 +297,42 @@ namespace Barotrauma
             static int GetHealPrice(Affliction affliction) => (int)(affliction.Prefab.BaseHealCost + (affliction.Prefab.HealCostMultiplier * affliction.Strength));
         }
 
+        public static void OnAfflictionCountChanged(Character character) =>
+            GameMain.GameSession?.Campaign?.MedicalClinic?.OnAfflictionCountChangedPrivate(character);
+
+        private void OnAfflictionCountChangedPrivate(Character character)
+        {
+            if (character is not { CharacterHealth: { } health, Info: { } info }) { return; }
+
+            ImmutableArray<NetAffliction> afflictions = GetAllAfflictions(health);
+
+#if CLIENT
+            if (GameMain.NetworkMember is null)
+            {
+                ui?.UpdateAfflictions(new NetCrewMember(info, afflictions));
+            }
+
+            ui?.UpdateCrewPanel();
+#elif SERVER
+            foreach (AfflictionSubscriber sub in afflictionSubscribers.ToList())
+            {
+                if (sub.Expiry < DateTimeOffset.Now)
+                {
+                    afflictionSubscribers.Remove(sub);
+                    continue;
+                }
+
+                if (sub.Target == info)
+                {
+                    ServerSend(new NetCrewMember(info, afflictions),
+                        header: NetworkHeader.AFFLICTION_UPDATE,
+                        deliveryMethod: DeliveryMethod.Unreliable,
+                        targetClient: sub.Subscriber);
+                }
+            }
+#endif
+        }
+
         public int GetTotalCost() => PendingHeals.SelectMany(static h => h.Afflictions).Aggregate(0, static (current, affliction) => current + affliction.Price);
 
         private int GetAdjustedPrice(int price) => campaign?.Map?.CurrentLocation is { Type: { HasOutpost: true } } currentLocation ? currentLocation.GetAdjustedHealCost(price) : int.MaxValue;
@@ -330,7 +368,7 @@ namespace Barotrauma
             new NetAffliction { Identifier = "internaldamage".ToIdentifier(), Strength = 80, Price = 10 },
             new NetAffliction { Identifier = "blunttrauma".ToIdentifier(), Strength = 50, Price = 10 },
             new NetAffliction { Identifier = "lacerations".ToIdentifier(), Strength = 20, Price = 10 },
-            new NetAffliction { Identifier = "burn".ToIdentifier(), Strength = 10, Price = 10 }
+            new NetAffliction { Identifier = AfflictionPrefab.DamageType, Strength = 10, Price = 10 }
         };
 #endif
     }

Barotrauma/BarotraumaShared/SharedSource/GameSession/UpgradeManager.cs

@@ -692,11 +692,13 @@ namespace Barotrauma
         /// Gets the progress that is shown on the store interface.
         /// Includes values stored in the metadata and <see cref="PendingUpgrades"/>, and takes submarine tier and class restrictions into account
         /// </summary>
-        public int GetUpgradeLevel(UpgradePrefab prefab, UpgradeCategory category)
+        /// <param name="info">Submarine used to determine the upgrade limit. If not defined, will default to the current sub.</param>
+        public int GetUpgradeLevel(UpgradePrefab prefab, UpgradeCategory category, SubmarineInfo? info = null)
         {
             if (!Metadata.HasKey(FormatIdentifier(prefab, category))) { return GetPendingLevel(); }
 
-            return Math.Min(GetRealUpgradeLevel(prefab, category) + GetPendingLevel(), prefab.GetMaxLevelForCurrentSub());
+            int maxLevel = info is null ? prefab.GetMaxLevelForCurrentSub() : prefab.GetMaxLevel(info);
+            return Math.Min(GetRealUpgradeLevel(prefab, category) + GetPendingLevel(), maxLevel);
 
             int GetPendingLevel()
             {
@@ -713,6 +715,14 @@ namespace Barotrauma
             return !Metadata.HasKey(FormatIdentifier(prefab, category)) ? 0 : Metadata.GetInt(FormatIdentifier(prefab, category), 0);
         }
 
+        /// <summary>
+        /// Gets the level of the upgrade that is stored in the metadata. Takes into account the limits of the provided submarine.
+        /// </summary>
+        public int GetRealUpgradeLevelForSub(UpgradePrefab prefab, UpgradeCategory category, SubmarineInfo info)
+        {
+            return Math.Min(GetRealUpgradeLevel(prefab, category), prefab.GetMaxLevel(info));
+        }
+
         /// <summary>
         /// Stores the target upgrade level in the campaign metadata.
         /// </summary>

Barotrauma/BarotraumaShared/SharedSource/Items/CharacterInventory.cs

@@ -1,4 +1,5 @@
-using Barotrauma.Items.Components;
+using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -104,15 +105,21 @@ namespace Barotrauma
 
                 string slotString = subElement.GetAttributeString("slot", "None");
                 InvSlotType slot = Enum.TryParse(slotString, ignoreCase: true, out InvSlotType s) ? s : InvSlotType.None;
-                Entity.Spawner?.AddItemToSpawnQueue(itemPrefab, this, ignoreLimbSlots: subElement.GetAttributeBool("forcetoslot", false), slot: slot, onSpawned: (Item item) =>
+
+                bool forceToSlot = subElement.GetAttributeBool("forcetoslot", false);
+                int amount = subElement.GetAttributeInt("amount", 1);
+                for (int i = 0; i < amount; i++)
                 {
-                    if (item != null && item.ParentInventory != this)
+                    Entity.Spawner?.AddItemToSpawnQueue(itemPrefab, this, ignoreLimbSlots: forceToSlot, slot: slot, onSpawned: (Item item) =>
                     {
-                        string errorMsg = $"Failed to spawn the initial item \"{item.Prefab.Identifier}\" in the inventory of \"{character.SpeciesName}\".";
-                        DebugConsole.ThrowError(errorMsg);
-                        GameAnalyticsManager.AddErrorEventOnce("CharacterInventory:FailedToSpawnInitialItem", GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
-                    }
-                });
+                        if (item != null && item.ParentInventory != this)
+                        {
+                            string errorMsg = $"Failed to spawn the initial item \"{item.Prefab.Identifier}\" in the inventory of \"{character.SpeciesName}\".";
+                            DebugConsole.ThrowError(errorMsg);
+                            GameAnalyticsManager.AddErrorEventOnce("CharacterInventory:FailedToSpawnInitialItem", GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
+                        }
+                    });
+                }
             }
         }
 
@@ -171,21 +178,6 @@ namespace Barotrauma
                 (SlotTypes[i] == InvSlotType.Any || slots[i].Items.Count < 1);
         }
 
-        public bool CanBeAutoMovedToCorrectSlots(Item item)
-        {
-            if (item == null) { return false; }
-            foreach (var allowedSlot in item.AllowedSlots)
-            {
-                InvSlotType slotsFree = InvSlotType.None;
-                for (int i = 0; i < slots.Length; i++)
-                {
-                    if (allowedSlot.HasFlag(SlotTypes[i]) && slots[i].Empty()) { slotsFree |= SlotTypes[i]; }
-                }
-                if (allowedSlot == slotsFree) { return true; }
-            }
-            return false;
-        }
-
         public override void RemoveItem(Item item)
         {
             RemoveItem(item, tryEquipFromSameStack: false);
@@ -308,6 +300,8 @@ namespace Barotrauma
 #endif
             }
 
+            if (item.GetComponent<Pickable>() == null || item.AllowedSlots.None()) { return false; }
+
             bool inSuitableSlot = false;
             bool inWrongSlot = false;
             int currentSlot = -1;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs

@@ -289,7 +289,16 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            if (!(joint is WeldJoint))
+            if (joint == null)
+            {
+                string errorMsg = "Error while locking a docking port (joint between submarines doesn't exist)." +
+                    " Submarine: " + (item.Submarine?.Info.Name ?? "null") +
+                    ", target submarine: " + (DockingTarget.item.Submarine?.Info.Name ?? "null");
+                GameAnalyticsManager.AddErrorEventOnce("DockingPort.Lock:JointNotCreated", GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
+                return;
+            }
+
+            if (joint is not WeldJoint)
             {
                 DockingDir = GetDir(DockingTarget);
                 DockingTarget.DockingDir = -DockingDir;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs

@@ -1,10 +1,10 @@
 using Barotrauma.Networking;
 using FarseerPhysics;
-using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FarseerPhysics.Dynamics;
 #if CLIENT
 using Barotrauma.Lights;
 #endif
@@ -173,6 +173,21 @@ namespace Barotrauma.Items.Components
                 OpenState = isOpen ? 1.0f : 0.0f;
             }
         }
+        public bool IsClosed => !IsOpen;
+
+        /// <summary>
+        /// Is the door opening, but not yet fully opened? Returns false both when it's closed and when it's fully open.
+        /// </summary>
+        public bool IsOpening => IsOpen && !IsFullyOpen;
+
+        /// <summary>
+        /// Is the door closing, but not yet fully closed? Returns false both when the door is open and when it's fully closed.
+        /// </summary>
+        public bool IsClosing => IsClosed && !IsFullyClosed;
+
+        public bool IsFullyOpen => IsOpen && OpenState >= 1.0f;
+
+        public bool IsFullyClosed => IsClosed && OpenState <= 0f;
 
         [Serialize(false, IsPropertySaveable.No, description: "If the door has integrated buttons, it can be opened by interacting with it directly (instead of using buttons wired to it).")]
         public bool HasIntegratedButtons { get; private set; }
@@ -211,6 +226,8 @@ namespace Barotrauma.Items.Components
             IsHorizontal = element.GetAttributeBool("horizontal", false);
             canBePicked = element.GetAttributeBool("canbepicked", false);
             autoOrientGap = element.GetAttributeBool("autoorientgap", false);
+
+            allowedSlots.Clear();
             
             foreach (var subElement in element.Elements())
             {
@@ -365,7 +382,10 @@ namespace Barotrauma.Items.Components
             {
                 lastBrokenTime = Timing.TotalTime;
                 //the door has to be restored to 50% health before collision detection on the body is re-enabled
-                if (item.ConditionPercentage / Math.Max(item.MaxRepairConditionMultiplier, 1.0f) > 50.0f && 
+
+                //multiply by MaxRepairConditionMultiplier so the item gets repaired at 50% of the _default max condition_
+                //otherwise increasing the max condition is arguably harmful, as the door needs to be repaired further to re-enable the collider
+                if (item.ConditionPercentage * Math.Max(item.MaxRepairConditionMultiplier, 1.0f) > 50.0f && 
                     (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
                 {
                     IsBroken = false;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -58,9 +58,6 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        //the angle in which the Character holds the item
-        protected float holdAngle;
-
         public PhysicsBody Body
         {
             get { return item.body ?? body; }
@@ -143,6 +140,7 @@ namespace Barotrauma.Items.Components
             set { aimPos = ConvertUnits.ToSimUnits(value); }
         }
 
+        protected float holdAngle;
 #if DEBUG
         [Editable, Serialize(0.0f, IsPropertySaveable.No, description: "The rotation at which the character holds the item (in degrees, relative to the rotation of the character's hand).")]
 #else
@@ -154,6 +152,18 @@ namespace Barotrauma.Items.Components
             set { holdAngle = MathHelper.ToRadians(value); }
         }
 
+        protected float aimAngle;
+#if DEBUG
+        [Editable, Serialize(0.0f, IsPropertySaveable.No, description: "The rotation at which the character holds the item while aiming (in degrees, relative to the rotation of the character's hand).")]
+#else
+        [Serialize(0.0f, IsPropertySaveable.No)] 
+#endif
+        public float AimAngle
+        {
+            get { return MathHelper.ToDegrees(aimAngle); }
+            set { aimAngle = MathHelper.ToRadians(value); }
+        }
+
         private Vector2 swingAmount;
 #if DEBUG
         [Editable, Serialize("0.0,0.0", IsPropertySaveable.No, description: "How much the item swings around when aiming/holding it (in pixels, as an offset from AimPos/HoldPos).")]
@@ -549,10 +559,17 @@ namespace Barotrauma.Items.Components
 
         public override bool OnPicked(Character picker)
         {
+#if CLIENT
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)
             {
+                if (!picker.Inventory.CanBeAutoMovedToCorrectSlots(item))
+                {
+                    picker.Inventory.FlashAllowedSlots(item, Color.Red);
+                }
                 return false;
             }
+#endif
+            bool wasAttached = IsAttached;
             if (base.OnPicked(picker))
             {
                 DeattachFromWall();
@@ -561,7 +578,7 @@ namespace Barotrauma.Items.Components
                 if (GameMain.Server != null && attachable)
                 {
                     item.CreateServerEvent(this);
-                    if (picker != null)
+                    if (picker != null && wasAttached)
                     {
                         GameServer.Log(GameServer.CharacterLogName(picker) + " detached " + item.Name + " from a wall", ServerLog.MessageType.ItemInteraction);
                     }
@@ -689,16 +706,22 @@ namespace Barotrauma.Items.Components
                     if (maxAttachableCount == 0)
                     {
 #if CLIENT
-                        GUI.AddMessage(TextManager.Get("itemmsgrequiretraining"), Color.Red);
+                        if (character == Character.Controlled)
+                        {
+                            GUI.AddMessage(TextManager.Get("itemmsgrequiretraining"), Color.Red);
+                        }
 #endif
                         return false;
                     }
                     else if (currentlyAttachedCount >= maxAttachableCount)
                     {
 #if CLIENT
-                        GUI.AddMessage($"{TextManager.Get("itemmsgtotalnumberlimited")} ({currentlyAttachedCount}/{maxAttachableCount})", Color.Red);
+                        if (character == Character.Controlled)
+                        {
+                            GUI.AddMessage($"{TextManager.Get("itemmsgtotalnumberlimited")} ({currentlyAttachedCount}/{maxAttachableCount})", Color.Red);
+                        }
 #endif
-                        return false; 
+                        return false;
                     }
                 }
 
@@ -876,9 +899,13 @@ namespace Barotrauma.Items.Components
                 scaledHandlePos[0] = handlePos[0] * item.Scale;
                 scaledHandlePos[1] = handlePos[1] * item.Scale;
                 bool aim = picker.IsKeyDown(InputType.Aim) && aimPos != Vector2.Zero && picker.CanAim;
-                picker.AnimController.HoldItem(deltaTime, item, scaledHandlePos, holdPos + swingPos, aimPos + swingPos, aim, holdAngle);
-                if (!aim)
+                if (aim)
                 {
+                    picker.AnimController.HoldItem(deltaTime, item, scaledHandlePos, holdPos + swingPos, aimPos + swingPos, aim, holdAngle, aimAngle);
+                }
+                else
+                {
+                    picker.AnimController.HoldItem(deltaTime, item, scaledHandlePos, holdPos + swingPos, aimPos + swingPos, aim, holdAngle);
                     var rope = GetRope();
                     if (rope != null && rope.SnapWhenNotAimed && rope.Item.ParentInventory == null)
                     {

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs

@@ -223,7 +223,7 @@ namespace Barotrauma.Items.Components
                 {
                     UpdateSwingPos(deltaTime, out Vector2 swingPos);
                     hitPos = MathUtils.WrapAnglePi(Math.Min(hitPos + deltaTime * 3f, MathHelper.PiOver4));
-                    ac.HoldItem(deltaTime, item, handlePos, aimPos + swingPos, Vector2.Zero, aim: false, hitPos, holdAngle + hitPos, aimMelee: true);
+                    ac.HoldItem(deltaTime, item, handlePos, aimPos + swingPos, Vector2.Zero, aim: false, hitPos, holdAngle + hitPos + aimAngle, aimMelee: true);
                     if (ac.InWater)
                     {
                         ac.LockFlipping();
@@ -445,7 +445,7 @@ namespace Barotrauma.Items.Components
                             targetItem.Condition / targetItem.MaxCondition,
                             emptyColor: GUIStyle.HealthBarColorLow,
                             fullColor: GUIStyle.HealthBarColorHigh,
-                            textTag: targetItem.Name);
+                            textTag: targetItem.Prefab.ShowNameInHealthBar ? targetItem.Name : string.Empty);
                     }
 #endif
                 }
@@ -472,8 +472,8 @@ namespace Barotrauma.Items.Components
             }
             if (GameMain.NetworkMember is { IsServer: true } server && targetEntity != null)
             {
-                server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, targetItemComponent: null, targetCharacter, targetLimb, targetEntity));
-                server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnUse, targetItemComponent: null, targetCharacter, targetLimb, targetEntity));
+                server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, targetItemComponent: null, targetCharacter, targetLimb, useTarget: targetEntity));
+                server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnUse, targetItemComponent: null, targetCharacter, targetLimb, useTarget: targetEntity));
                 serverLogger ??= new System.Text.StringBuilder();
                 serverLogger.Clear();
                 serverLogger.Append($"{picker?.LogName} used {item.Name}");

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs

@@ -26,6 +26,8 @@ namespace Barotrauma.Items.Components
             get { return allowedSlots; }
         }
 
+        public bool PickingDone => pickTimer >= PickingTime;
+
         public Character Picker
         {
             get 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs

@@ -5,9 +5,7 @@ using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
@@ -145,7 +143,8 @@ namespace Barotrauma.Items.Components
 
         public override void Equip(Character character)
         {
-            ReloadTimer = Math.Min(reload, 1.0f);
+            //clamp above 1 to prevent rapid-firing by swapping weapons
+            ReloadTimer = Math.Max(Math.Min(reload, 1.0f), ReloadTimer);
             IsActive = true;
         }
 
@@ -261,7 +260,8 @@ namespace Barotrauma.Items.Components
                 {
                     Vector2 barrelPos = TransformedBarrelPos + item.body.SimPosition;
                     float rotation = (Item.body.Dir == 1.0f) ? Item.body.Rotation : Item.body.Rotation - MathHelper.Pi;
-                    float spread = GetSpread(character) * Rand.Range(-0.5f, 0.5f);
+                    float spread = GetSpread(character) * Projectile.GetSpreadFromPool(projectile.SpreadCounter);
+
                     var lastProjectile = LastProjectile;
                     if (lastProjectile != projectile)
                     {
@@ -277,7 +277,7 @@ namespace Barotrauma.Items.Components
                         {
                             Item.body.ApplyLinearImpulse(new Vector2((float)Math.Cos(projectile.Item.body.Rotation), (float)Math.Sin(projectile.Item.body.Rotation)) * Item.body.Mass * -50.0f, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
                         }
-                        projectile.Item.body.ApplyTorque(projectile.Item.body.Mass * degreeOfFailure * Rand.Range(-10.0f, 10.0f));
+                        projectile.Item.body.ApplyTorque(projectile.Item.body.Mass * degreeOfFailure * 20.0f * Projectile.GetSpreadFromPool(projectile.SpreadCounter));
                     }
                     Item.RemoveContained(projectile.Item);
                 }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs

@@ -100,6 +100,9 @@ namespace Barotrauma.Items.Components
         [Serialize(false, IsPropertySaveable.No, description: "Can the item hit broken doors.")]
         public bool HitBrokenDoors { get; set; }
 
+        [Serialize(false, IsPropertySaveable.No, description: "Should the tool ignore characters? Enabled e.g. for fire extinguisher.")]
+        public bool IgnoreCharacters { get; set; }
+
         [Serialize(0.0f, IsPropertySaveable.No, description: "The probability of starting a fire somewhere along the ray fired from the barrel (for example, 0.1 = 10% chance to start a fire during a second of use).")]
         public float FireProbability { get; set; }
 
@@ -313,7 +316,11 @@ namespace Barotrauma.Items.Components
         private readonly List<FireSource> fireSourcesInRange = new List<FireSource>();
         private void Repair(Vector2 rayStart, Vector2 rayEnd, float deltaTime, Character user, float degreeOfSuccess, List<Body> ignoredBodies)
         {
-            var collisionCategories = Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel | Physics.CollisionRepair;
+            var collisionCategories = Physics.CollisionWall | Physics.CollisionItem | Physics.CollisionLevel | Physics.CollisionRepair;
+            if (!IgnoreCharacters)
+            {
+                collisionCategories |= Physics.CollisionCharacter;
+            }
 
             //if the item can cut off limbs, activate nearby bodies to allow the raycast to hit them
             if (statusEffectLists != null)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Throwable.cs

@@ -42,6 +42,8 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public const float WaterDragCoefficient = 0.5f;
+
         public override bool Use(float deltaTime, Character character = null)
         {
             //actual throwing logic is handled in Update
@@ -59,6 +61,7 @@ namespace Barotrauma.Items.Components
             base.Drop(dropper);
             throwState = ThrowState.None;
             throwAngle = ThrowAngleStart;
+            Item.ResetWaterDragCoefficient();
         }
 
         public override void UpdateBroken(float deltaTime, Camera cam)
@@ -97,6 +100,7 @@ namespace Barotrauma.Items.Components
                     }
                     item.body.CollidesWith = Physics.CollisionWall | Physics.CollisionLevel | Physics.CollisionPlatform;
                     midAir = false;
+                    Item.ResetWaterDragCoefficient();
                 }
                 return;
             }
@@ -188,6 +192,7 @@ namespace Barotrauma.Items.Components
                     }
 
                     item.Drop(CurrentThrower, createNetworkEvent: GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer);
+                    item.WaterDragCoefficient = WaterDragCoefficient;
                     item.body.ApplyLinearImpulse(throwVector * ThrowForce * item.body.Mass * 3.0f, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
 
                     //disable platform collisions until the item comes back to rest again
@@ -205,12 +210,12 @@ namespace Barotrauma.Items.Components
 
                     if (GameMain.NetworkMember is { IsServer: true })
                     {
-                        GameMain.NetworkMember.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnSecondaryUse, this, CurrentThrower));
+                        GameMain.NetworkMember.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnSecondaryUse, this, targetCharacter: CurrentThrower));
                     }
                     if (!(GameMain.NetworkMember is { IsClient: true }))
                     {
                         //Stun grenades, flares, etc. all have their throw-related things handled in "onSecondaryUse"
-                        ApplyStatusEffects(ActionType.OnSecondaryUse, deltaTime, CurrentThrower, useTarget: CurrentThrower, user: CurrentThrower);
+                        ApplyStatusEffects(ActionType.OnSecondaryUse, deltaTime, character: CurrentThrower, user: CurrentThrower);
                     }
                     throwState = ThrowState.None;
                 }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs

@@ -125,8 +125,8 @@ namespace Barotrauma.Items.Components
             get { return drawable; }
             set
             {
-                if (value == drawable) return;
-                if (!(this is IDrawableComponent))
+                if (value == drawable) { return; }
+                if (this is not IDrawableComponent)
                 {
                     DebugConsole.ThrowError("Couldn't make \"" + this + "\" drawable (the component doesn't implement the IDrawableComponent interface)");
                     return;
@@ -236,10 +236,7 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        /// <summary>
-        /// How useful the item is in combat? Used by AI to decide which item it should use as a weapon. For the sake of clarity, use a value between 0 and 100 (not enforced).
-        /// </summary>
-        [Serialize(0f, IsPropertySaveable.No, description: "How useful the item is in combat? Used by AI to decide which item it should use as a weapon. For the sake of clarity, use a value between 0 and 100 (not enforced).")]
+        [Serialize(0f, IsPropertySaveable.No, description: "How useful the item is in combat? Used by AI to decide which item it should use as a weapon. For the sake of clarity, use a value between 0 and 100 (not enforced). Note that there's also a generic BotPriority for all item prefabs.")]
         public float CombatPriority { get; private set; }
 
         /// <summary>
@@ -690,7 +687,7 @@ namespace Barotrauma.Items.Components
 
         public virtual void FlipY(bool relativeToSub) { }
 
-        public bool IsLoaded(Character user, bool checkContainedItems = true) =>
+        public bool IsNotEmpty(Character user, bool checkContainedItems = true) =>
             HasRequiredContainedItems(user, addMessage: false) &&
             (!checkContainedItems || Item.OwnInventory == null || Item.OwnInventory.AllItems.Any(i => i.Condition > 0));
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs

@@ -12,20 +12,9 @@ namespace Barotrauma.Items.Components
 {
     partial class ItemContainer : ItemComponent, IDrawableComponent
     {
-        class ActiveContainedItem
-        {
-            public readonly Item Item;
-            public readonly StatusEffect StatusEffect;
-            public readonly bool ExcludeBroken;
-            public readonly bool ExcludeFullCondition;
-            public ActiveContainedItem(Item item, StatusEffect statusEffect, bool excludeBroken, bool excludeFullCondition)
-            {
-                Item = item;
-                StatusEffect = statusEffect;
-                ExcludeBroken = excludeBroken;
-                ExcludeFullCondition = excludeFullCondition;
-            }
-        }
+        readonly record struct ActiveContainedItem(Item Item, StatusEffect StatusEffect, bool ExcludeBroken, bool ExcludeFullCondition);
+
+        readonly record struct DrawableContainedItem(Item Item, bool Hide, Vector2? ItemPos, float Rotation);
 
         class SlotRestrictions
         {
@@ -63,7 +52,9 @@ namespace Barotrauma.Items.Components
         public readonly ItemInventory Inventory;
 
         private readonly List<ActiveContainedItem> activeContainedItems = new List<ActiveContainedItem>();
-        
+
+        private readonly List<DrawableContainedItem> drawableContainedItems = new List<DrawableContainedItem>();
+
         private List<ushort>[] itemIds;
 
         //how many items can be contained
@@ -114,7 +105,7 @@ namespace Barotrauma.Items.Components
         [Serialize(100, IsPropertySaveable.No, description: "How many items are placed in a row before starting a new row.")]
         public int ItemsPerRow { get; set; }
 
-        [Serialize(true, IsPropertySaveable.No, description: "Should the contents in the item's inventory be visible? Disabled on items like magazines that spawn the contents as needed.")]
+        [Serialize(true, IsPropertySaveable.No, description: "Should the inventory of this item be visible when the item is selected.")]
         public bool DrawInventory
         {
             get;
@@ -142,6 +133,9 @@ namespace Barotrauma.Items.Components
             set;
         }
 
+        [Serialize(true, IsPropertySaveable.No)]
+        public bool AllowAccess { get; set; }
+
         [Serialize(false, IsPropertySaveable.No)]
         public bool AccessOnlyWhenBroken { get; set; }
 
@@ -348,8 +342,6 @@ namespace Barotrauma.Items.Components
 
         public void OnItemContained(Item containedItem)
         {
-            item.SetContainedItemPositions();
-
             int index = Inventory.FindIndex(containedItem);
             if (index >= 0 && index < slotRestrictions.Length)
             {
@@ -367,6 +359,12 @@ namespace Barotrauma.Items.Components
                 }
             }
 
+            var relatedItem = FindContainableItem(containedItem);
+            drawableContainedItems.Add(new DrawableContainedItem(containedItem, 
+                Hide: relatedItem?.Hide ?? false, 
+                ItemPos: relatedItem?.ItemPos, 
+                Rotation: relatedItem?.Rotation ?? 0.0f));
+
             if (item.GetComponent<Planter>() != null)
             {
                 GameAnalyticsManager.AddDesignEvent("MicroInteraction:" + (GameMain.GameSession?.GameMode?.Preset.Identifier.Value ?? "null") + ":GardeningPlanted:" + containedItem.Prefab.Identifier);
@@ -381,6 +379,7 @@ namespace Barotrauma.Items.Components
                 // Set the contained items active if there's an item inserted inside the container. Enables e.g. the rifle flashlight when it's attached to the rifle (put inside of it).
                 SetContainedActive(true);
             }
+            item.SetContainedItemPositions();
             CharacterHUD.RecreateHudTextsIfFocused(item, containedItem);
             OnContainedItemsChanged.Invoke(this);
         }
@@ -393,6 +392,7 @@ namespace Barotrauma.Items.Components
         public void OnItemRemoved(Item containedItem)
         {
             activeContainedItems.RemoveAll(i => i.Item == containedItem);
+            drawableContainedItems.RemoveAll(i => i.Item == containedItem);
             //deactivate if the inventory is empty
             IsActive = activeContainedItems.Count > 0 || Inventory.AllItems.Any(it => it.body != null);
             CharacterHUD.RecreateHudTextsIfFocused(item, containedItem);
@@ -483,8 +483,8 @@ namespace Barotrauma.Items.Components
                             item.ApplyStatusEffects(ActionType.OnSuccess, 1.0f, ownerCharacter);
                             item.ApplyStatusEffects(ActionType.OnUse, 1.0f, ownerCharacter);
                             item.GetComponent<GeneticMaterial>()?.Equip(ownerCharacter);
-                            autoInjectCooldown = AutoInjectInterval;
                         }
+                        autoInjectCooldown = AutoInjectInterval;
                     }
                 }
 
@@ -509,10 +509,18 @@ namespace Barotrauma.Items.Components
                 if (activeContainedItem.ExcludeFullCondition && contained.IsFullCondition) { continue; }
                 StatusEffect effect = activeContainedItem.StatusEffect;
 
-                if (effect.HasTargetType(StatusEffect.TargetType.This))                 
+                if (effect.HasTargetType(StatusEffect.TargetType.This))
+                {
                     effect.Apply(ActionType.OnContaining, deltaTime, item, item.AllPropertyObjects);
-                if (effect.HasTargetType(StatusEffect.TargetType.Contained)) 
+                }
+                if (effect.HasTargetType(StatusEffect.TargetType.Contained))
+                {
                     effect.Apply(ActionType.OnContaining, deltaTime, item, contained.AllPropertyObjects);
+                }
+                if (effect.HasTargetType(StatusEffect.TargetType.Character) && item.ParentInventory?.Owner is Character character)
+                {
+                    effect.Apply(ActionType.OnContaining, deltaTime, item, character);
+                }
                 if (effect.HasTargetType(StatusEffect.TargetType.NearbyItems) ||
                     effect.HasTargetType(StatusEffect.TargetType.NearbyCharacters))
                 {
@@ -534,12 +542,12 @@ namespace Barotrauma.Items.Components
 
         public override bool HasRequiredItems(Character character, bool addMessage, LocalizedString msg = null)
         {
-            return DrawInventory && (!AccessOnlyWhenBroken || Item.Condition <= 0) && base.HasRequiredItems(character, addMessage, msg);
+            return AllowAccess && (!AccessOnlyWhenBroken || Item.Condition <= 0) && base.HasRequiredItems(character, addMessage, msg);
         }
 
         public override bool Select(Character character)
         {
-            if (!DrawInventory) { return false; }
+            if (!AllowAccess) { return false; }
             if (item.Container != null) { return false; }
             if (AccessOnlyWhenBroken)
             {
@@ -575,7 +583,7 @@ namespace Barotrauma.Items.Components
 
         public override bool Pick(Character picker)
         {
-            if (!DrawInventory) { return false; }
+            if (!AllowAccess) { return false; }
             if (AccessOnlyWhenBroken)
             {
                 if (item.Condition > 0)
@@ -756,54 +764,50 @@ namespace Barotrauma.Items.Components
 
             int i = 0;
             Vector2 currentItemPos = transformedItemPos;
-            foreach (Item contained in Inventory.AllItems)
+            foreach (DrawableContainedItem contained in drawableContainedItems)
             {
                 Vector2 itemPos = currentItemPos;
-                var relatedItem = FindContainableItem(contained);
-                if (relatedItem != null)
+                if (contained.ItemPos.HasValue)
                 {
-                    if (relatedItem.ItemPos.HasValue)
+                    Vector2 pos = contained.ItemPos.Value;
+                    if (item.body != null)
                     {
-                        Vector2 pos = relatedItem.ItemPos.Value;
-                        if (item.body != null)
+                        Matrix transform = Matrix.CreateRotationZ(item.body.Rotation);
+                        pos.X *= item.body.Dir;
+                        itemPos = Vector2.Transform(pos, transform) + item.body.Position;
+                    }
+                    else
+                    {
+                        itemPos = pos;
+                        // This code is aped based on above. Not tested.
+                        if (item.FlippedX)
                         {
-                            Matrix transform = Matrix.CreateRotationZ(item.body.Rotation);
-                            pos.X *= item.body.Dir;
-                            itemPos = Vector2.Transform(pos, transform) + item.body.Position;
+                            itemPos.X = -itemPos.X;
+                            itemPos.X += item.Rect.Width;
                         }
-                        else
+                        if (item.FlippedY)
                         {
-                            itemPos = pos;
-                            // This code is aped based on above. Not tested.
-                            if (item.FlippedX)
-                            {
-                                itemPos.X = -itemPos.X;
-                                itemPos.X += item.Rect.Width;
-                            }
-                            if (item.FlippedY)
-                            {
-                                itemPos.Y = -itemPos.Y;
-                                itemPos.Y -= item.Rect.Height;
-                            }
-                            itemPos += new Vector2(item.Rect.X, item.Rect.Y);
-                            if (Math.Abs(item.RotationRad) > 0.01f)
-                            {
-                                Matrix transform = Matrix.CreateRotationZ(item.RotationRad);
-                                itemPos = Vector2.Transform(itemPos - item.Position, transform) + item.Position;
-                            }
+                            itemPos.Y = -itemPos.Y;
+                            itemPos.Y -= item.Rect.Height;
+                        }
+                        itemPos += new Vector2(item.Rect.X, item.Rect.Y);
+                        if (Math.Abs(item.RotationRad) > 0.01f)
+                        {
+                            Matrix transform = Matrix.CreateRotationZ(item.RotationRad);
+                            itemPos = Vector2.Transform(itemPos - item.Position, transform) + item.Position;
                         }
                     }
-                }
+                }                
 
-                if (contained.body != null)
+                if (contained.Item.body != null)
                 {
                     try
                     {
                         Vector2 simPos = ConvertUnits.ToSimUnits(itemPos);
                         float rotation = itemRotation;
-                        if (relatedItem != null && relatedItem.Rotation != 0)
+                        if (contained.Rotation != 0)
                         {
-                            rotation = MathHelper.ToRadians(relatedItem.Rotation);
+                            rotation = MathHelper.ToRadians(contained.Rotation);
                         }
                         if (item.body != null)
                         {
@@ -814,29 +818,29 @@ namespace Barotrauma.Items.Components
                         {
                             rotation += -item.RotationRad;
                         }
-                        contained.body.FarseerBody.SetTransformIgnoreContacts(ref simPos, rotation);
-                        contained.body.SetPrevTransform(contained.body.SimPosition, contained.body.Rotation);
-                        contained.body.UpdateDrawPosition();
+                        contained.Item.body.FarseerBody.SetTransformIgnoreContacts(ref simPos, rotation);
+                        contained.Item.body.SetPrevTransform(contained.Item.body.SimPosition, contained.Item.body.Rotation);
+                        contained.Item.body.UpdateDrawPosition();
                     }
                     catch (Exception e)
                     {
                         DebugConsole.Log("SetTransformIgnoreContacts threw an exception in SetContainedItemPositions (" + e.Message + ")\n" + e.StackTrace.CleanupStackTrace());
-                        GameAnalyticsManager.AddErrorEventOnce("ItemContainer.SetContainedItemPositions.InvalidPosition:" + contained.Name,
+                        GameAnalyticsManager.AddErrorEventOnce("ItemContainer.SetContainedItemPositions.InvalidPosition:" + contained.Item.Name,
                             GameAnalyticsManager.ErrorSeverity.Error,
                             "SetTransformIgnoreContacts threw an exception in SetContainedItemPositions (" + e.Message + ")\n" + e.StackTrace.CleanupStackTrace());
                     }
-                    contained.body.Submarine = item.Submarine;
+                    contained.Item.body.Submarine = item.Submarine;
                 }
 
-                contained.Rect =
+                contained.Item.Rect =
                     new Rectangle(
-                        (int)(itemPos.X - contained.Rect.Width / 2.0f),
-                        (int)(itemPos.Y + contained.Rect.Height / 2.0f),
-                        contained.Rect.Width, contained.Rect.Height);
+                        (int)(itemPos.X - contained.Item.Rect.Width / 2.0f),
+                        (int)(itemPos.Y + contained.Item.Rect.Height / 2.0f),
+                        contained.Item.Rect.Width, contained.Item.Rect.Height);
 
-                contained.Submarine = item.Submarine;
-                contained.CurrentHull = item.CurrentHull;
-                contained.SetContainedItemPositions();
+                contained.Item.Submarine = item.Submarine;
+                contained.Item.CurrentHull = item.CurrentHull;
+                contained.Item.SetContainedItemPositions();
 
                 i++;
                 if (Math.Abs(ItemInterval.X) > 0.001f && Math.Abs(ItemInterval.Y) > 0.001f)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Engine.cs

@@ -116,7 +116,7 @@ namespace Barotrauma.Items.Components
             {
                 float voltageFactor = MinVoltage <= 0.0f ? 1.0f : Math.Min(Voltage, MaxOverVoltageFactor);
                 float currForce = force * voltageFactor;
-                float condition = item.Condition / item.MaxCondition;
+                float condition = item.MaxCondition <= 0.0f ? 0.0f : item.Condition / item.MaxCondition;
                 // Broken engine makes more noise.
                 float noise = Math.Abs(currForce) * MathHelper.Lerp(1.5f, 1f, condition);
                 UpdateAITargets(noise);

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs

@@ -6,6 +6,7 @@ using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Voronoi2;
 
@@ -13,6 +14,21 @@ namespace Barotrauma.Items.Components
 {
     partial class Projectile : ItemComponent, IServerSerializable
     {
+        const int SpreadCounterWrapAround = 256;
+
+        private static readonly ImmutableArray<float> spreadPool;
+        static Projectile()
+        {
+            MTRandom random = new MTRandom(0);
+            spreadPool = Enumerable.Range(0, SpreadCounterWrapAround).Select(f => (float)random.NextDouble() - 0.5f).ToImmutableArray();            
+        }
+
+        public static float GetSpreadFromPool(int seed)
+        {
+            if (seed < 0) { seed = -seed; }
+            return spreadPool[seed % SpreadCounterWrapAround];
+        }
+
         struct HitscanResult
         {
             public Fixture Fixture;
@@ -41,10 +57,14 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public const float WaterDragCoefficient = 0.1f;
+
         private readonly Queue<Impact> impactQueue = new Queue<Impact>();
 
         private bool removePending;
 
+        public byte SpreadCounter { get; private set; }
+
         //continuous collision detection is used while the projectile is moving faster than this
         const float ContinuousCollisionThreshold = 5.0f;
 
@@ -112,27 +132,34 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        [Serialize(false, IsPropertySaveable.No, description: "Can the item stick to the character it hits.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Can the projectile stick to characters.")]
         public bool StickToCharacters
         {
             get;
             set;
         }
 
-        [Serialize(false, IsPropertySaveable.No, description: "Can the item stick to the structure it hits.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Can the projectile stick to walls.")]
         public bool StickToStructures
         {
             get;
             set;
         }
 
-        [Serialize(false, IsPropertySaveable.No, description: "Can the item stick to the item it hits.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Can the projectile stick to items.")]
         public bool StickToItems
         {
             get;
             set;
         }
 
+        [Serialize(false, IsPropertySaveable.No, description: "Can the projectile stick to doors. Caution: may cause issues.")]
+        public bool StickToDoors
+        {
+            get;
+            set;
+        }
+
         [Serialize(false, IsPropertySaveable.No, description: "Can the item stick even to deflective targets.")]
         public bool StickToDeflective
         {
@@ -273,6 +300,8 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
+            SpreadCounter = (byte)(item.ID % SpreadCounterWrapAround);
+
             InitProjSpecific(element);
         }
         partial void InitProjSpecific(ContentXElement element);
@@ -352,7 +381,7 @@ namespace Barotrauma.Items.Components
             {
 #if SERVER
                 launchRot = rotation;               
-                Item.CreateServerEvent(this, new EventData(launch: true));         
+                Item.CreateServerEvent(this, new EventData(launch: true, spreadCounter: (byte)(SpreadCounter - 1)));         
 #endif
             }
         }
@@ -376,8 +405,9 @@ namespace Barotrauma.Items.Components
                 }
                 else
                 {
-                    launchAngle = item.body.Rotation + MathHelper.ToRadians(Spread * Rand.Range(-0.5f, 0.5f));
+                    launchAngle = item.body.Rotation + MathHelper.ToRadians(Spread * GetSpreadFromPool(SpreadCounter));
                 }
+                SpreadCounter++;
 
                 Vector2 launchDir = new Vector2((float)Math.Cos(launchAngle), (float)Math.Sin(launchAngle));
                 if (Hitscan)
@@ -395,7 +425,6 @@ namespace Barotrauma.Items.Components
                     item.body.SetTransform(item.body.SimPosition, launchAngle);
                     float modifiedLaunchImpulse = (LaunchImpulse + launchImpulseModifier) * (1 + Rand.Range(-ImpulseSpread, ImpulseSpread));
                     DoLaunch(launchDir * modifiedLaunchImpulse);
-                    System.Diagnostics.Debug.WriteLine("launch: " + modifiedLaunchImpulse + "   -   " + item.body.LinearVelocity);
                 }
             }
             User = character;
@@ -416,6 +445,7 @@ namespace Barotrauma.Items.Components
             }
 
             item.Drop(null, createNetworkEvent: false);
+            Item.WaterDragCoefficient = WaterDragCoefficient;
 
             launchPos = item.SimPosition;
 
@@ -450,6 +480,7 @@ namespace Barotrauma.Items.Components
             Vector2 simPositon = item.SimPosition;
             Vector2 rayStartWorld = item.WorldPosition;
             item.Drop(null);
+            Item.WaterDragCoefficient = WaterDragCoefficient;
 
             item.body.Enabled = true;
             //set the velocity of the body because the OnProjectileCollision method
@@ -467,36 +498,36 @@ namespace Barotrauma.Items.Components
             Vector2 rayEndWorld = rayStartWorld + dir * worldDist;
 
             List<HitscanResult> hits = new List<HitscanResult>();
-
             hits.AddRange(DoRayCast(rayStart, rayEnd, submarine: item.Submarine));
 
             if (item.Submarine != null)
             {
                 //shooting indoors, do a hitscan outside as well
                 hits.AddRange(DoRayCast(rayStart + item.Submarine.SimPosition, rayEnd + item.Submarine.SimPosition, submarine: null));
-                //also in the coordinate space of docked subs
-                foreach (Submarine dockedSub in item.Submarine.DockedTo)
-                {
-                    if (dockedSub == item.Submarine) { continue; }
-                    hits.AddRange(DoRayCast(rayStart + item.Submarine.SimPosition - dockedSub.SimPosition, rayEnd + item.Submarine.SimPosition - dockedSub.SimPosition, dockedSub));
-                }
+                //do a hitscan in other subs' coordinate spaces
+                RayCastInOtherSubs(rayStart + item.Submarine.SimPosition, rayEnd + item.Submarine.SimPosition);
             }
             else
+            {
+                RayCastInOtherSubs(rayStart, rayEnd);
+            }
+
+            void RayCastInOtherSubs(Vector2 rayStart, Vector2 rayEnd)
             {
                 //shooting outdoors, see if we can hit anything inside a sub
                 foreach (Submarine submarine in Submarine.Loaded)
                 {
+                    if (submarine == item.Submarine) { continue; }
                     var inSubHits = DoRayCast(rayStart - submarine.SimPosition, rayEnd - submarine.SimPosition, submarine);
                     //transform back to world coordinates
                     for (int i = 0; i < inSubHits.Count; i++)
                     {
                         inSubHits[i] = new HitscanResult(
-                            inSubHits[i].Fixture, 
-                            inSubHits[i].Point + submarine.SimPosition, 
-                            inSubHits[i].Normal, 
+                            inSubHits[i].Fixture,
+                            inSubHits[i].Point + submarine.SimPosition,
+                            inSubHits[i].Normal,
                             inSubHits[i].Fraction);
                     }
-
                     hits.AddRange(inSubHits);
                 }
             }
@@ -508,6 +539,7 @@ namespace Barotrauma.Items.Components
             {
                 var h = hits[i];
                 item.SetTransform(h.Point, rotation);
+                item.UpdateTransform();
                 if (HandleProjectileCollision(h.Fixture, h.Normal, Vector2.Zero))
                 {
                     hitCount++;
@@ -675,6 +707,7 @@ namespace Barotrauma.Items.Components
 
         public override void Drop(Character dropper)
         {
+            Item.ResetWaterDragCoefficient();
             if (dropper != null)
             {
                 DisableProjectileCollisions();
@@ -941,7 +974,7 @@ namespace Barotrauma.Items.Components
                             targetItem.Condition / targetItem.MaxCondition,
                             emptyColor: GUIStyle.HealthBarColorLow,
                             fullColor: GUIStyle.HealthBarColorHigh,
-                            textTag: targetItem.Name);
+                            textTag: targetItem.Prefab.ShowNameInHealthBar ? targetItem.Name : string.Empty);
                     }
 #endif
                 }
@@ -1016,8 +1049,8 @@ namespace Barotrauma.Items.Components
                     }
                     if (GameMain.NetworkMember is { IsServer: true } server)
                     {
-                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, this, targetLimb.character, targetLimb, null, item.WorldPosition));
-                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnImpact, this, targetLimb.character, targetLimb, null, item.WorldPosition));
+                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, this, targetLimb.character, targetLimb, useTarget: targetLimb.character, item.WorldPosition));
+                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnImpact, this, targetLimb.character, targetLimb, useTarget: targetLimb.character, item.WorldPosition));
                     }
                 }
                 else
@@ -1026,8 +1059,8 @@ namespace Barotrauma.Items.Components
                     ApplyStatusEffects(ActionType.OnImpact, 1.0f, useTarget: target.Body.UserData as Entity, user: User);
                     if (GameMain.NetworkMember is { IsServer: true } server)
                     {
-                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, this, null, null, target.Body.UserData as Entity, item.WorldPosition));
-                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnImpact, this, null, null, target.Body.UserData as Entity, item.WorldPosition));
+                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(conditionalActionType, this, useTarget: target.Body.UserData as Entity, worldPosition: item.WorldPosition));
+                        server.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnImpact, this, useTarget: target.Body.UserData as Entity, worldPosition: item.WorldPosition));
                     }
                 }
             }
@@ -1035,13 +1068,12 @@ namespace Barotrauma.Items.Components
             target.Body.ApplyLinearImpulse(velocity * item.body.Mass);
             target.Body.LinearVelocity = target.Body.LinearVelocity.ClampLength(NetConfig.MaxPhysicsBodyVelocity * 0.5f);
 
-            if (hits.Count() >= MaxTargetsToHit || hits.LastOrDefault()?.UserData is VoronoiCell)
+            if (hits.Count >= MaxTargetsToHit || hits.LastOrDefault()?.UserData is VoronoiCell)
             {
                 DisableProjectileCollisions();
             }
 
-            if (attackResult.AppliedDamageModifiers != null &&
-                (attackResult.AppliedDamageModifiers.Any(dm => dm.DeflectProjectiles) && !StickToDeflective))
+            if (attackResult.AppliedDamageModifiers != null && attackResult.AppliedDamageModifiers.Any(dm => dm.DeflectProjectiles) && !StickToDeflective)
             {
                 item.body.LinearVelocity *= deflectedSpeedMultiplier;
             }
@@ -1051,7 +1083,7 @@ namespace Barotrauma.Items.Components
                         ((StickToLightTargets || target.Body.Mass > item.body.Mass * 0.5f) &&
                         (DoesStick ||
                         (StickToCharacters && (target.Body.UserData is Limb || target.Body.UserData is Character)) ||
-                        (StickToItems && target.Body.UserData is Item))))
+                        (target.Body.UserData is Item i && (i.GetComponent<Door>() != null ? StickToDoors : StickToItems)))))
             {
                 Vector2 dir = new Vector2(
                     (float)Math.Cos(item.body.Rotation),

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs

@@ -1,12 +1,11 @@
-using Barotrauma.Extensions;
+using Barotrauma.Abilities;
+using Barotrauma.Extensions;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Xml.Linq;
-using Barotrauma.Abilities;
 
 namespace Barotrauma.Items.Components
 {
@@ -17,6 +16,9 @@ namespace Barotrauma.Items.Components
         private float deteriorationTimer;
         private float deteriorateAlwaysResetTimer;
 
+        private int updateDeteriorationCounter;
+        private const int UpdateDeteriorationInterval = 10;
+
         private int prevSentConditionValue;
         private string conditionSignal;
 
@@ -404,26 +406,11 @@ namespace Barotrauma.Items.Components
 #endif
                     }
                 }
-                if (!ShouldDeteriorate()) { return; }
-                if (item.Condition > 0.0f)
+                updateDeteriorationCounter++;
+                if (updateDeteriorationCounter >= UpdateDeteriorationInterval)
                 {
-                    if (deteriorationTimer > 0.0f)
-                    {
-                        if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
-                        {
-                            deteriorationTimer -= deltaTime * GetDeteriorationDelayMultiplier();
-#if SERVER
-                            if (deteriorationTimer <= 0.0f) { item.CreateServerEvent(this); }
-#endif
-                        }
-                        return;
-                    }
-
-                    if (item.ConditionPercentage > MinDeteriorationCondition)
-                    {
-                        float deteriorationSpeed = item.StatManager.GetAdjustedValue(ItemTalentStats.DetoriationSpeed, DeteriorationSpeed);
-                        item.Condition -= deteriorationSpeed * deltaTime;
-                    }
+                    UpdateDeterioration(deltaTime * UpdateDeteriorationInterval);
+                    updateDeteriorationCounter = 0;
                 }
                 return;
             }
@@ -559,6 +546,30 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        private void UpdateDeterioration(float deltaTime)
+        {
+            if (item.Condition <= 0.0f) { return; }
+            if (!ShouldDeteriorate()) { return; }
+
+            if (deteriorationTimer > 0.0f)
+            {
+                if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
+                {
+                    deteriorationTimer -= deltaTime * GetDeteriorationDelayMultiplier();
+#if SERVER
+                    if (deteriorationTimer <= 0.0f) { item.CreateServerEvent(this); }
+#endif
+                }
+                return;
+            }
+
+            if (item.ConditionPercentage > MinDeteriorationCondition)
+            {
+                float deteriorationSpeed = item.StatManager.GetAdjustedValue(ItemTalentStats.DetoriationSpeed, DeteriorationSpeed);
+                item.Condition -= deteriorationSpeed * deltaTime;
+            }            
+        }
+
         private float GetMaxRepairConditionMultiplier(Character character)
         {
             if (character == null) { return 1.0f; }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Rope.cs

@@ -302,33 +302,16 @@ namespace Barotrauma.Items.Components
                         var sourceBody = GetBodyToPull(source);
                         if (sourceBody != null)
                         {
-                            var targetBody = GetBodyToPull(target);
-                            if (targetBody != null && targetBody.UserData is not Character)
+                            if (user != null && user.InWater)
                             {
-                                sourceBody.ApplyForce(targetBody.LinearVelocity * sourceBody.Mass);
-                            }
-                            float forceMultiplier = 1;
-                            if (user != null)
-                            {
-                                user.AnimController.Hang();
-                                if (user.InWater)
+                                if (user.IsRagdolled)
                                 {
-                                    if (user.IsRagdolled)
-                                    {
-                                        forceMultiplier = 0;
-                                    }
-                                }
-                                else
-                                {
-                                    forceMultiplier = user.IsRagdolled ? 0.1f : 0.4f;
-                                    // Prevents too easy smashing to the walls
-                                    forceDir.X /= 4;
-                                    // Prevents rubberbanding up and down
-                                    if (forceDir.Y < 0)
-                                    {
-                                        forceDir.Y = 0;
-                                    }
+                                    // Reel in towards the target.
+                                    user.AnimController.Hang();
+                                    float force = LerpForces ? MathHelper.Lerp(0, SourcePullForce, MathUtils.InverseLerp(0, MaxLength / 2, distance)) : SourcePullForce;
+                                    sourceBody.ApplyForce(forceDir * force);
                                 }
+                                // Take the target velocity into account.
                                 if (targetCharacter != null)
                                 {
                                     var myCollider = user.AnimController.Collider;
@@ -341,9 +324,15 @@ namespace Barotrauma.Items.Components
                                         }
                                     }
                                 }
+                                else
+                                {
+                                    var targetBody = GetBodyToPull(target);
+                                    if (targetBody != null)
+                                    {
+                                        sourceBody.ApplyForce(targetBody.LinearVelocity * sourceBody.Mass);
+                                    }
+                                }
                             }
-                            float force = LerpForces ? MathHelper.Lerp(0, SourcePullForce, MathUtils.InverseLerp(0, MaxLength / 2, distance)) * forceMultiplier : SourcePullForce * forceMultiplier;
-                            sourceBody.ApplyForce(forceDir * force);
                         }
                     }
                 }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/CustomInterface.cs

@@ -304,9 +304,12 @@ namespace Barotrauma.Items.Components
             }
 #if SERVER
             //make sure the clients know about the states of the checkboxes and text fields
-            if (item.Submarine == null || !item.Submarine.Loading)
+            if (customInterfaceElementList.Any())
             {
-                item.CreateServerEvent(this);
+                if (item.Submarine == null || !item.Submarine.Loading)
+                {
+                    item.CreateServerEvent(this);
+                }
             }
 #endif
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs

@@ -94,7 +94,7 @@ namespace Barotrauma.Items.Components
                 if (isOn == value && IsActive == value) { return; }
 
                 IsActive = isOn = value;
-                SetLightSourceState(value);
+                SetLightSourceState(value, value ? lightBrightness : 0.0f);
                 OnStateChanged();
             }
         }
@@ -187,6 +187,15 @@ namespace Barotrauma.Items.Components
             set;
         }
 
+        [Serialize(true, IsPropertySaveable.No, description: "Should the light sprite be drawn on the item using alpha blending, in addition to being rendered in the light map? Can be used to make the light sprite stand out more.")]
+        public bool AlphaBlend
+        {
+            get;
+            set;
+        }
+
+        public float TemporaryFlickerTimer;
+
         public override void Move(Vector2 amount, bool ignoreContacts = false)
         {
 #if CLIENT
@@ -205,7 +214,7 @@ namespace Barotrauma.Items.Components
             {
                 if (base.IsActive == value) { return; }
                 base.IsActive = isOn = value;
-                SetLightSourceState(value);
+                SetLightSourceState(value, value ? lightBrightness : 0.0f);
             }
         }
 
@@ -239,6 +248,7 @@ namespace Barotrauma.Items.Components
             SetLightSourceState(IsActive);
             turret = item.GetComponent<Turret>();
 #if CLIENT
+            Drawable = AlphaBlend && Light.LightSprite != null;
             if (Screen.Selected.IsEditor)
             {
                 OnMapLoaded();
@@ -311,8 +321,10 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
+            TemporaryFlickerTimer -= deltaTime;
+
             //currPowerConsumption = powerConsumption;
-            if (Rand.Range(0.0f, 1.0f) < 0.05f && Voltage < Rand.Range(0.0f, MinVoltage))
+            if (Rand.Range(0.0f, 1.0f) < 0.05f && (Voltage < Rand.Range(0.0f, MinVoltage) || TemporaryFlickerTimer > 0.0f))
             {
 #if CLIENT
                 if (Voltage > 0.1f)
@@ -364,7 +376,7 @@ namespace Barotrauma.Items.Components
                     {
                         LightColor = XMLExtensions.ParseColor(signal.value, false);
 #if CLIENT
-                        SetLightSourceState(Light.Enabled);
+                        SetLightSourceState(Light.Enabled, lightBrightness);
 #endif
                         prevColorSignal = signal.value;
                     }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/MotionSensor.cs

@@ -136,7 +136,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Editable(DecimalCount = 3), Serialize(0.01f, IsPropertySaveable.Yes, description: "How fast the objects within the detector's range have to be moving (in m/s).", alwaysUseInstanceValues: true)]
+        [Editable(DecimalCount = 3), Serialize(0.1f, IsPropertySaveable.Yes, description: "How fast the objects within the detector's range have to be moving (in m/s).", alwaysUseInstanceValues: true)]
         public float MinimumVelocity
         {
             get;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WifiComponent.cs

@@ -25,7 +25,7 @@ namespace Barotrauma.Items.Components
 
         private string prevSignal;
 
-        private readonly int[] channelMemory = new int[ChannelMemorySize];
+        private int[] channelMemory = new int[ChannelMemorySize];
 
         private Connection signalInConnection;
         private Connection signalOutConnection;
@@ -94,7 +94,17 @@ namespace Barotrauma.Items.Components
         {
             list.Add(this);
             IsActive = true;
-            channelMemory = element.GetAttributeIntArray("channelmemory", new int[ChannelMemorySize]);
+        }
+
+        public override void Load(ContentXElement componentElement, bool usePrefabValues, IdRemap idRemap)
+        {
+            base.Load(componentElement, usePrefabValues, idRemap);
+            channelMemory = componentElement.GetAttributeIntArray("channelmemory", new int[ChannelMemorySize]);
+            if (channelMemory.Length != ChannelMemorySize)
+            {
+                DebugConsole.AddWarning($"Error when loading item {item.Prefab.Identifier}: the size of the channel memory doesn't match the default value of {ChannelMemorySize}. Resizing...");
+                Array.Resize(ref channelMemory, ChannelMemorySize);
+            }
         }
 
         public override void OnItemLoaded()

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Wire.cs

@@ -13,7 +13,7 @@ namespace Barotrauma.Items.Components
 {
     partial class Wire : ItemComponent, IDrawableComponent, IServerSerializable, IClientSerializable
     {
-        partial class WireSection
+        public partial class WireSection
         {
             private Vector2 start;
             private Vector2 end;
@@ -775,20 +775,25 @@ namespace Barotrauma.Items.Components
             UpdateSections();
         }
 
-        public override void Load(ContentXElement componentElement, bool usePrefabValues, IdRemap idRemap)
+        public static IEnumerable<Vector2> ExtractNodes(XElement element)
         {
-            base.Load(componentElement, usePrefabValues, idRemap);
-
-            string nodeString = componentElement.GetAttributeString("nodes", "");
-            if (nodeString == "") return;
+            string nodeString = element.GetAttributeString("nodes", "");
+            if (nodeString.IsNullOrWhiteSpace()) { yield break; }
 
             string[] nodeCoords = nodeString.Split(';');
             for (int i = 0; i < nodeCoords.Length / 2; i++)
             {
-                float.TryParse(nodeCoords[i * 2], NumberStyles.Float, CultureInfo.InvariantCulture, out float x);
-                float.TryParse(nodeCoords[i * 2 + 1], NumberStyles.Float, CultureInfo.InvariantCulture, out float y);
-                nodes.Add(new Vector2(x, y));
+                float.TryParse(nodeCoords[i * 2].Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out float x);
+                float.TryParse(nodeCoords[i * 2 + 1].Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out float y);
+                yield return new Vector2(x, y);
             }
+        }
+        
+        public override void Load(ContentXElement componentElement, bool usePrefabValues, IdRemap idRemap)
+        {
+            base.Load(componentElement, usePrefabValues, idRemap);
+
+            nodes.AddRange(ExtractNodes(componentElement));
 
             Drawable = nodes.Any();
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs

@@ -59,8 +59,9 @@ namespace Barotrauma.Items.Components
         private float aiTargetingGraceTimer;
 
         private float aiFindTargetTimer;
-        private Character currentTarget; 
-        const float aiFindTargetInterval = 5.0f;
+        private ISpatialEntity currentTarget;
+        private const float CrewAiFindTargetMaxInterval = 3.0f;
+        private const float CrewAIFindTargetMinInverval = 0.2f;
 
         private int currentLoaderIndex;
 
@@ -73,6 +74,8 @@ namespace Barotrauma.Items.Components
 
         private List<LightComponent> lightComponents;
 
+        private readonly bool isSlowTurret;
+
         public float Rotation
         {
             get { return rotation; }
@@ -320,33 +323,36 @@ namespace Barotrauma.Items.Components
         [Serialize(false, IsPropertySaveable.Yes, description:"Should the turret operate automatically using AI targeting? Comes with some optional random movement that can be adjusted below."), Editable]
         public bool AutoOperate { get; set; }
 
-        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How much the turret should adjust the aim off the target randomly instead of tracking the target perfectly?"), Editable]
-        public float RandomAimAmount { get; private set; }
+        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How much the turret should adjust the aim off the target randomly instead of tracking the target perfectly? In Degrees."), Editable]
+        public float RandomAimAmount { get; set; }
 
-        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How often the turret should adjust the aim randomly instead of tracking the target perfectly?"), Editable]
-        public float RandomAimMinTime { get; private set; }
+        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How often the turret should adjust the aim randomly instead of tracking the target perfectly? Minimum wait time, in seconds."), Editable]
+        public float RandomAimMinTime { get; set; }
 
-        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How often the turret should adjust the aim randomly instead of tracking the target perfectly?"), Editable]
-        public float RandomAimMaxTime { get; private set; }
+        [Serialize(0f, IsPropertySaveable.Yes, description: "[Auto Operate] How often the turret should adjust the aim randomly instead of tracking the target perfectly? Maximum wait time, in seconds."), Editable]
+        public float RandomAimMaxTime { get; set; }
 
         [Serialize(false, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret move randomly while idle?"), Editable]
         public bool RandomMovement { get; set; }
 
-        [Serialize(false, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret always aim at targets without delay?"), Editable]
-        public bool IgnoreAimDelay { get; set; }
+        [Serialize(false, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret have a delay while targeting targets or always aim prefectly?"), Editable]
+        public bool AimDelay { get; set; }
 
-        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target characters?"), Editable]
+        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target characters in general?"), Editable]
         public bool TargetCharacters { get; set; }
 
-        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target monsters?"), Editable]
+        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target all monsters?"), Editable]
         public bool TargetMonsters { get; set; }
 
-        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target humans (or pets)"), Editable]
+        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target all humans (or creatures in the same group, like pets)?"), Editable]
         public bool TargetHumans { get; set; }
 
         [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target other submarines?"), Editable]
         public bool TargetSubmarines { get; set; }
 
+        [Serialize(true, IsPropertySaveable.Yes, description: "[Auto Operate] Should the turret target items?"), Editable]
+        public bool TargetItems { get; set; }
+
         [Serialize("", IsPropertySaveable.Yes, description: "[Auto Operate] Group or SpeciesName that the AI ignores when the turret is operated automatically."), Editable]
         public Identifier FriendlyTag { get; private set; }
 
@@ -379,6 +385,7 @@ namespace Barotrauma.Items.Components
             }
             item.IsShootable = true;
             item.RequireAimToUse = false;
+            isSlowTurret = item.HasTag("slowturret");
             InitProjSpecific(element);
         }
 
@@ -940,7 +947,7 @@ namespace Barotrauma.Items.Components
         }
 
         private float waitTimer;
-        private float disorderTimer;
+        private float randomAimTimer;
 
         private float prevTargetRotation;
         private float updateTimer;
@@ -950,10 +957,6 @@ namespace Barotrauma.Items.Components
         {
             IsActive = true;
 
-            bool targetCharacters = TargetCharacters || TargetHumans || TargetMonsters;
-            bool targetHumans = TargetCharacters && TargetHumans;
-            bool targetMonsters = TargetCharacters && TargetMonsters;
-
             if (friendlyTag.IsEmpty)
             {
                 friendlyTag = FriendlyTag;
@@ -977,7 +980,7 @@ namespace Barotrauma.Items.Components
                 updateTimer -= deltaTime;
             }
 
-            if (!IgnoreAimDelay && waitTimer > 0)
+            if (AimDelay && waitTimer > 0)
             {
                 waitTimer -= deltaTime;
                 return;
@@ -987,30 +990,34 @@ namespace Barotrauma.Items.Components
             float shootDistance = AIRange;
             ISpatialEntity target = null;
             float closestDist = shootDistance * shootDistance;
-            if (targetCharacters)
+            if (TargetCharacters)
             {
                 foreach (var character in Character.CharacterList)
                 {
-                    if (character == null || character.Removed || character.IsDead) { continue; }
-                    if (!friendlyTag.IsEmpty && (character.SpeciesName.Equals(friendlyTag) || character.Group.Equals(friendlyTag))) { continue; }
-                    bool isHuman = character.IsHuman || character.Group == CharacterPrefab.HumanSpeciesName;
-                    if (isHuman)
-                    {
-                        if (!targetHumans)
-                        {
-                            // Don't target humans if not defined to.
-                            continue;
-                        }
-                    }
-                    else if (!targetMonsters)
-                    {
-                        // Don't target other creatures if not defined to.
-                        continue;
-                    }
+                    if (!IsValidTarget(character)) { continue; }
+                    float priority = isSlowTurret ? character.Params.AISlowTurretPriority : character.Params.AITurretPriority;
+                    if (priority <= 0) { continue; }
+                    if (!IsValidTargetForAutoOperate(character, friendlyTag)) { continue; }
                     float dist = Vector2.DistanceSquared(character.WorldPosition, item.WorldPosition);
                     if (dist > closestDist) { continue; }
+                    if (!CheckTurretAngle(character.WorldPosition)) { continue; }
                     target = character;
-                    closestDist = dist;
+                    closestDist = dist / priority;
+                }
+            }
+            if (TargetItems)
+            {
+                foreach (Item targetItem in Item.ItemList)
+                {
+                    if (!IsValidTarget(targetItem)) { continue; }
+                    float priority = isSlowTurret ? targetItem.Prefab.AISlowTurretPriority : targetItem.Prefab.AITurretPriority;
+                    if (priority <= 0) { continue; }
+                    float dist = Vector2.DistanceSquared(item.WorldPosition, targetItem.WorldPosition);
+                    if (dist > closestDist) { continue; }
+                    if (dist > shootDistance * shootDistance) { continue; }
+                    if (!CheckTurretAngle(targetItem.WorldPosition)) { continue; }
+                    target = targetItem;
+                    closestDist = dist / priority;
                 }
             }
             if (TargetSubmarines)
@@ -1020,8 +1027,11 @@ namespace Barotrauma.Items.Components
                     closestDist = maxDistance * maxDistance;
                     foreach (Submarine sub in Submarine.Loaded)
                     {
-                        if (sub.Info.Type != SubmarineType.Player) { continue; }
                         if (sub == Item.Submarine) { continue; }
+                        if (item.Submarine != null)
+                        {
+                            if (Character.IsOnFriendlyTeam(item.Submarine.TeamID, sub.TeamID)) { continue; }
+                        }
                         float dist = Vector2.DistanceSquared(sub.WorldPosition, item.WorldPosition);
                         if (dist > closestDist) { continue; }
                         closestSub = sub;
@@ -1035,6 +1045,7 @@ namespace Barotrauma.Items.Components
                             if (!closestSub.IsEntityFoundOnThisSub(hull, true)) { continue; }
                             float dist = Vector2.DistanceSquared(hull.WorldPosition, item.WorldPosition);
                             if (dist > closestDist) { continue; }
+                            // Don't check the angle, because it doesn't work on Thalamus spike. The angle check wouldn't be very important here anyway.
                             target = hull;
                             closestDist = dist;
                         }
@@ -1051,22 +1062,23 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
-            if (!IgnoreAimDelay)
+            if (AimDelay)
             {
                 if (RandomAimAmount > 0)
                 {
-                    if (disorderTimer < 0)
+                    if (randomAimTimer < 0)
                     {
-                        // Random disorder
-                        disorderTimer = Rand.Range(RandomAimMinTime, RandomAimMaxTime);
+                        // Random disorder or other flaw in the targeting.
+                        randomAimTimer = Rand.Range(RandomAimMinTime, RandomAimMaxTime);
                         waitTimer = Rand.Range(0.25f, 1f);
-                        targetRotation = MathUtils.WrapAngleTwoPi(targetRotation += Rand.Range(-RandomAimAmount, RandomAimAmount));
+                        float randomAim = MathHelper.ToRadians(RandomAimAmount);
+                        targetRotation = MathUtils.WrapAngleTwoPi(targetRotation += Rand.Range(-randomAim, randomAim));
                         updatePending = true;
                         return;
                     }
                     else
                     {
-                        disorderTimer -= deltaTime;
+                        randomAimTimer -= deltaTime;
                     }
                 }
             }
@@ -1264,18 +1276,19 @@ namespace Barotrauma.Items.Components
             bool hadCurrentTarget = currentTarget != null;
             if (hadCurrentTarget)
             {
-                if (currentTarget.Removed || currentTarget.IsDead)
+                if (!IsValidTarget(currentTarget))
                 {
                     currentTarget = null;
+                    aiFindTargetTimer = CrewAIFindTargetMinInverval;
                 }
             }
-
-            if (aiFindTargetTimer <= 0.0f || currentTarget == null)
+            if (aiFindTargetTimer <= 0.0f)
             {
                 foreach (Character enemy in Character.CharacterList)
                 {
-                    // Ignore dead, friendly, and those that are inside the same sub
-                    if (enemy.IsDead || !enemy.Enabled) { continue; } 
+                    if (!IsValidTarget(enemy)) { continue; }
+                    float priority = isSlowTurret ? enemy.Params.AISlowTurretPriority : enemy.Params.AITurretPriority;
+                    if (priority <= 0) { continue; }
                     if (character.Submarine != null)
                     {
                         if (enemy.Submarine == character.Submarine) { continue; }
@@ -1292,30 +1305,53 @@ namespace Barotrauma.Items.Components
                         // We shouldn't check the angle when a long creature is traveling outside of the shooting range, because doing so would not allow us to shoot the limbs that might be close enough to shoot at.
                         if (!CheckTurretAngle(enemy.WorldPosition)) { continue; }
                     }
+                    targetPos = enemy.WorldPosition;
                     closestEnemy = enemy;
-                    closestDistance = dist;                
+                    closestDistance = dist / priority;
+                    currentTarget = closestEnemy;
                 }
-                currentTarget = closestEnemy;
-                aiFindTargetTimer = aiFindTargetInterval;
-            }
-            else
-            {
-                closestEnemy = currentTarget;
-            }
-
-            if (closestEnemy != null)
-            {
-                targetPos = closestEnemy.WorldPosition;
-                //if the enemy is inside another sub, aim at the room they're in to make it less obvious that the enemy "knows" exactly where the target is
-                if (closestEnemy.Submarine != null && closestEnemy.CurrentHull != null && closestEnemy.Submarine != item.Submarine && !closestEnemy.CanSeeTarget(Item))
+                foreach (Item targetItem in Item.ItemList)
                 {
-                    targetPos = closestEnemy.CurrentHull.WorldPosition;
+                    if (!IsValidTarget(targetItem)) { continue; }
+                    float priority = isSlowTurret ? targetItem.Prefab.AISlowTurretPriority : targetItem.Prefab.AITurretPriority;
+                    if (priority <= 0) { continue; }
+                    float dist = Vector2.DistanceSquared(item.WorldPosition, targetItem.WorldPosition);
+                    if (dist > closestDistance) { continue; }
+                    if (dist > shootDistance * shootDistance) { continue; }
+                    if (!CheckTurretAngle(targetItem.WorldPosition)) { continue; }
+                    targetPos = targetItem.WorldPosition;
+                    closestDistance = dist / priority;
+                    // Override the target character so that we can target the item instead.
+                    closestEnemy = null;
+                    currentTarget = targetItem;
+                }
+                if (currentTarget == null)
+                {
+                    aiFindTargetTimer = CrewAIFindTargetMinInverval;
+                }
+                else
+                {
+                    aiFindTargetTimer = CrewAiFindTargetMaxInterval;
+                }
+            }
+            else if (currentTarget != null)
+            {
+                targetPos = currentTarget.WorldPosition;
+            }
+            bool iceSpireSpotted = false;
+            // Adjust the target character position (limb or submarine)
+            if (currentTarget is Character targetCharacter)
+            {
+                //if the enemy is inside another sub, aim at the room they're in to make it less obvious that the enemy "knows" exactly where the target is
+                if (targetCharacter.Submarine != null && targetCharacter.CurrentHull != null && targetCharacter.Submarine != item.Submarine && !targetCharacter.CanSeeTarget(Item))
+                {
+                    targetPos = targetCharacter.CurrentHull.WorldPosition;
                 }
                 else
                 {
                     // Target the closest limb. Doesn't make much difference with smaller creatures, but enables the bots to shoot longer abyss creatures like the endworm. Otherwise they just target the main body = head.
                     float closestDist = closestDistance;
-                    foreach (Limb limb in closestEnemy.AnimController.Limbs)
+                    foreach (Limb limb in targetCharacter.AnimController.Limbs)
                     {
                         if (limb.IsSevered) { continue; }
                         if (limb.Hidden) { continue; }
@@ -1329,13 +1365,14 @@ namespace Barotrauma.Items.Components
                     }
                     if (closestDist > shootDistance * shootDistance)
                     {
-                        // Not close enough to shoot
+                        // Not close enough to shoot.
+                        currentTarget = null;
                         closestEnemy = null;
                         targetPos = null;
                     }
                 }
             }
-            else if (item.Submarine != null && Level.Loaded != null)
+            else if (targetPos == null && item.Submarine != null && Level.Loaded != null)
             {
                 // Check ice spires
                 shootDistance = AIRange * item.OffsetOnSelectedMultiplier;
@@ -1345,50 +1382,49 @@ namespace Barotrauma.Items.Components
                     if (wall is not DestructibleLevelWall destructibleWall || destructibleWall.Destroyed) { continue; }
                     foreach (var cell in wall.Cells)
                     {
-                        if (cell.DoesDamage)
+                        if (!cell.DoesDamage) { continue; }
+                        foreach (var edge in cell.Edges)
                         {
-                            foreach (var edge in cell.Edges)
+                            Vector2 p1 = edge.Point1 + cell.Translation;
+                            Vector2 p2 = edge.Point2 + cell.Translation;
+                            Vector2 closestPoint = MathUtils.GetClosestPointOnLineSegment(p1, p2, item.WorldPosition);
+                            if (!CheckTurretAngle(closestPoint))
                             {
-                                Vector2 p1 = edge.Point1 + cell.Translation;
-                                Vector2 p2 = edge.Point2 + cell.Translation;
-                                Vector2 closestPoint = MathUtils.GetClosestPointOnLineSegment(p1, p2, item.WorldPosition);
-                                if (!CheckTurretAngle(closestPoint))
+                                // The closest point can't be targeted -> get a point directly in front of the turret
+                                Vector2 barrelDir = new Vector2((float)Math.Cos(rotation), -(float)Math.Sin(rotation));
+                                if (MathUtils.GetLineIntersection(p1, p2, item.WorldPosition, item.WorldPosition + barrelDir * shootDistance, out Vector2 intersection))
                                 {
-                                    // The closest point can't be targeted -> get a point directly in front of the turret
-                                    Vector2 barrelDir = new Vector2((float)Math.Cos(rotation), -(float)Math.Sin(rotation));
-                                    if (MathUtils.GetLineIntersection(p1, p2, item.WorldPosition, item.WorldPosition + barrelDir * shootDistance, out Vector2 intersection))
-                                    {
-                                        closestPoint = intersection;
-                                        if (!CheckTurretAngle(closestPoint)) { continue; }
-                                    }
-                                    else
-                                    {
-                                        continue;
-                                    }
+                                    closestPoint = intersection;
+                                    if (!CheckTurretAngle(closestPoint)) { continue; }
                                 }
-                                float dist = Vector2.Distance(closestPoint, item.WorldPosition);
-
-                                //add one px to make sure the visibility raycast doesn't miss the cell due to the end position being right at the edge of the cell
-                                closestPoint += (closestPoint - item.WorldPosition) / Math.Max(dist, 1);
-
-                                if (dist > AIRange + 1000) { continue; }
-                                float dot = 0;
-                                if (!MathUtils.NearlyEqual(item.Submarine.Velocity, Vector2.Zero))
+                                else
                                 {
-                                    dot = Vector2.Dot(Vector2.Normalize(item.Submarine.Velocity), Vector2.Normalize(closestPoint - item.Submarine.WorldPosition));
-                                }
-                                float minAngle = 0.5f;
-                                if (dot < minAngle && dist > 1000)
-                                {
-                                    // The sub is not moving towards the target and it's not very close to the turret either -> ignore
                                     continue;
                                 }
-                                // Allow targeting farther when heading towards the spire (up to 1000 px)
-                                dist -= MathHelper.Lerp(0, 1000, MathUtils.InverseLerp(minAngle, 1, dot));
-                                if (dist > closestDistance) { continue; }
-                                targetPos = closestPoint;
-                                closestDistance = dist;
                             }
+                            float dist = Vector2.Distance(closestPoint, item.WorldPosition);
+
+                            //add one px to make sure the visibility raycast doesn't miss the cell due to the end position being right at the edge of the cell
+                            closestPoint += (closestPoint - item.WorldPosition) / Math.Max(dist, 1);
+
+                            if (dist > AIRange + 1000) { continue; }
+                            float dot = 0;
+                            if (!MathUtils.NearlyEqual(item.Submarine.Velocity, Vector2.Zero))
+                            {
+                                dot = Vector2.Dot(Vector2.Normalize(item.Submarine.Velocity), Vector2.Normalize(closestPoint - item.Submarine.WorldPosition));
+                            }
+                            float minAngle = 0.5f;
+                            if (dot < minAngle && dist > 1000)
+                            {
+                                // The sub is not moving towards the target and it's not very close to the turret either -> ignore
+                                continue;
+                            }
+                            // Allow targeting farther when heading towards the spire (up to 1000 px)
+                            dist -= MathHelper.Lerp(0, 1000, MathUtils.InverseLerp(minAngle, 1, dot));
+                            if (dist > closestDistance) { continue; }
+                            targetPos = closestPoint;
+                            closestDistance = dist;
+                            iceSpireSpotted = true;
                         }
                     }
                 }
@@ -1404,13 +1440,13 @@ namespace Barotrauma.Items.Components
                 {
                     if (character.AIController.SelectedAiTarget == null && !hadCurrentTarget)
                     {
-                        if (CreatureMetrics.Instance.RecentlyEncountered.Contains(closestEnemy.SpeciesName) || closestEnemy.IsHuman)
+                        if (CreatureMetrics.RecentlyEncountered.Contains(closestEnemy.SpeciesName) || closestEnemy.IsHuman)
                         {
                             character.Speak(TextManager.Get("DialogNewTargetSpotted").Value,
                                 identifier: "newtargetspotted".ToIdentifier(),
                                 minDurationBetweenSimilar: 30.0f);
                         }
-                        else if (CreatureMetrics.Instance.Encountered.Contains(closestEnemy.SpeciesName))
+                        else if (CreatureMetrics.Encountered.Contains(closestEnemy.SpeciesName))
                         {
                             character.Speak(TextManager.GetWithVariable("DialogIdentifiedTargetSpotted", "[speciesname]", closestEnemy.DisplayName).Value,
                                 identifier: "identifiedtargetspotted".ToIdentifier(),
@@ -1423,17 +1459,17 @@ namespace Barotrauma.Items.Components
                                 minDurationBetweenSimilar: 5.0f);
                         }
                     }
-                    else if (!CreatureMetrics.Instance.Encountered.Contains(closestEnemy.SpeciesName))
+                    else if (!CreatureMetrics.Encountered.Contains(closestEnemy.SpeciesName))
                     {
                         character.Speak(TextManager.Get("DialogUnidentifiedTargetSpotted").Value,
                             identifier: "unidentifiedtargetspotted".ToIdentifier(),
                             minDurationBetweenSimilar: 5.0f);
                     }
-                    character.AddEncounter(closestEnemy);
+                    CreatureMetrics.AddEncounter(closestEnemy.SpeciesName);
                 }
                 character.AIController.SelectTarget(closestEnemy.AiTarget);
             }
-            else if (closestEnemy == null && character.IsOnPlayerTeam)
+            else if (iceSpireSpotted && character.IsOnPlayerTeam)
             {
                 character.Speak(TextManager.Get("DialogIceSpireSpotted").Value,
                     identifier: "icespirespotted".ToIdentifier(),
@@ -1496,6 +1532,54 @@ namespace Barotrauma.Items.Components
             return 0;
         }
 
+        // Not exahustive, but helps to get rid of some code duplication
+        private static bool IsValidTarget(ISpatialEntity target)
+        {
+            if (target == null) { return false; }
+            if (target is Character targetCharacter)
+            {
+                if (!targetCharacter.Enabled || targetCharacter.Removed || targetCharacter.IsDead || targetCharacter.AITurretPriority <= 0)
+                {
+                    return false;
+                }
+            }
+            else if (target is Item targetItem)
+            {
+                if (targetItem.Removed || targetItem.Condition <= 0 || !targetItem.Prefab.IsAITurretTarget || targetItem.Prefab.AITurretPriority <= 0 || targetItem.HiddenInGame)
+                {
+                    return false;
+                }
+                if (targetItem.Submarine != null)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool IsValidTargetForAutoOperate(Character target, Identifier friendlyTag)
+        {
+            if (!friendlyTag.IsEmpty)
+            {
+                if (target.SpeciesName.Equals(friendlyTag) || target.Group.Equals(friendlyTag)) { return false; }
+            }
+            bool isHuman = target.IsHuman || target.Group == CharacterPrefab.HumanSpeciesName;
+            if (isHuman)
+            {
+                if (item.Submarine != null)
+                {
+                    // Check that the target is not in the friendly team, e.g. pirate or a hostile player sub (PvP).
+                    return !target.IsOnFriendlyTeam(item.Submarine.TeamID) && TargetHumans;
+                }
+                return TargetHumans;
+            }
+            else
+            {
+                // Shouldn't check the team here, because all the enemies are in the same team (None).
+                return TargetMonsters;
+            }
+        }
+
         private bool CanShoot(Body targetBody, Character user = null, Identifier friendlyTag = default, bool targetSubmarines = true)
         {
             if (targetBody == null) { return false; }
@@ -1508,7 +1592,7 @@ namespace Barotrauma.Items.Components
             {
                 targetCharacter = limb.character;
             }
-            if (targetCharacter != null)
+            if (targetCharacter != null && !targetCharacter.Removed)
             {
                 if (user != null)
                 {
@@ -1517,27 +1601,25 @@ namespace Barotrauma.Items.Components
                         return false;
                     }
                 }
-                if (!friendlyTag.IsEmpty)
+                else if (!IsValidTargetForAutoOperate(targetCharacter, friendlyTag))
                 {
-                    if (targetCharacter.SpeciesName.Equals(friendlyTag) || targetCharacter.Group.Equals(friendlyTag))
-                    {
-                        return false;
-                    }
+                    // Note that Thalamus runs this even when AutoOperate is false.
+                    return false;
                 }
             }
             else
             {
                 if (targetBody.UserData is ISpatialEntity e)
                 {
-                    if (e is Structure s && s.Indestructible) { return false; }
-                    Submarine sub = e.Submarine ?? e as Submarine;
+                    if (e is Structure { Indestructible: true }) { return false; }
                     if (!targetSubmarines && e is Submarine) { return false; }
-                    if (sub == null) { return false; }
+                    Submarine sub = e.Submarine ?? e as Submarine;
+                    if (sub == null) { return true; }
                     if (sub == Item.Submarine) { return false; }
                     if (sub.Info.IsOutpost || sub.Info.IsWreck || sub.Info.IsBeacon) { return false; }
                     if (sub.TeamID == Item.Submarine.TeamID) { return false; }
                 }
-                else if (!(targetBody.UserData is Voronoi2.VoronoiCell cell && cell.IsDestructible))
+                else if (targetBody.UserData is not Voronoi2.VoronoiCell { IsDestructible: true })
                 {
                     // Hit something else, probably a level wall
                     return false;
@@ -1548,7 +1630,7 @@ namespace Barotrauma.Items.Components
 
         private Body CheckLineOfSight(Vector2 start, Vector2 end)
         {
-            var collisionCategories = Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel;
+            var collisionCategories = Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel | Physics.CollisionProjectile;
             Body pickedBody = Submarine.PickBody(start, end, null, collisionCategories, allowInsideFixture: true,
                customPredicate: (Fixture f) =>
                {

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Wearable.cs

@@ -44,7 +44,16 @@ namespace Barotrauma
         }
         public LimbType Limb { get; private set; }
         public bool HideLimb { get; private set; }
-        public bool HideOtherWearables { get; private set; }
+
+        public enum ObscuringMode
+        {
+            None,
+            Hide,
+            AlphaClip
+        }
+        public ObscuringMode ObscureOtherWearables { get; private set; }
+        public bool HideOtherWearables => ObscureOtherWearables == ObscuringMode.Hide;
+        public bool AlphaClipOtherWearables => ObscureOtherWearables == ObscuringMode.AlphaClip;
         public bool CanBeHiddenByOtherWearables { get; private set; }
         public List<WearableType> HideWearablesOfType { get; private set; }
         public bool InheritLimbDepth { get; private set; }
@@ -130,7 +139,7 @@ namespace Barotrauma
                 case WearableType.Husk:
                 case WearableType.Herpes:
                     Limb = LimbType.Head;
-                    HideOtherWearables = false;
+                    ObscureOtherWearables = ObscuringMode.None;
                     InheritLimbDepth = true;
                     InheritScale = true;
                     InheritOrigin = true;
@@ -202,7 +211,16 @@ namespace Barotrauma
             Sprite = new Sprite(SourceElement, file: SpritePath);
             Limb = (LimbType)Enum.Parse(typeof(LimbType), SourceElement.GetAttributeString("limb", "Head"), true);
             HideLimb = SourceElement.GetAttributeBool("hidelimb", false);
-            HideOtherWearables = SourceElement.GetAttributeBool("hideotherwearables", false);
+
+            foreach (var mode in Enum.GetValues<ObscuringMode>())
+            {
+                if (mode == ObscuringMode.None) { continue; }
+                if (SourceElement.GetAttributeBool($"{mode}OtherWearables", false))
+                {
+                    ObscureOtherWearables = mode;
+                }
+            }
+
             CanBeHiddenByOtherWearables = SourceElement.GetAttributeBool("canbehiddenbyotherwearables", true);
             InheritLimbDepth = SourceElement.GetAttributeBool("inheritlimbdepth", true);
             var scale = SourceElement.GetAttribute("inheritscale");
@@ -509,7 +527,7 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
-            if (picker.Removed)
+            if (picker == null || picker.Removed)
             {
                 IsActive = false;
                 return;
@@ -519,7 +537,7 @@ namespace Barotrauma.Items.Components
             if (item.GetComponent<Holdable>() is not { IsActive: true })
             {
                 item.SetTransform(picker.SimPosition, 0.0f);
-            }            
+            }
             item.ApplyStatusEffects(ActionType.OnWearing, deltaTime, picker);
 
 #if CLIENT

Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs

@@ -141,7 +141,18 @@ namespace Barotrauma
                     }
                 }
                 if (items.Contains(item)) { return; }
-                items.Add(item);
+
+                //keep lowest-condition items at the top of the stack
+                int index = 0;
+                for (int i = 0; i < items.Count; i++)
+                {
+                    if (items[i].Condition > item.Condition)
+                    {
+                        break;
+                    }
+                    index++;
+                }
+                items.Insert(index, item);
             }
 
             /// <summary>
@@ -585,6 +596,8 @@ namespace Barotrauma
                 item.body.Enabled = false;
                 item.body.BodyType = FarseerPhysics.BodyType.Dynamic;
                 item.SetTransform(item.SimPosition, rotation: 0.0f, findNewHull: false);
+                //update to refresh the interpolated draw rotation and position (update doesn't run on disabled bodies)
+                item.body.Update();
             }
             
 #if SERVER

Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs

@@ -99,7 +99,18 @@ namespace Barotrauma
         private bool hasComponentsToDraw;
 
         public PhysicsBody body;
-        private float waterDragCoefficient;
+        private readonly float originalWaterDragCoefficient;
+        private float? overrideWaterDragCoefficient;
+        public float WaterDragCoefficient
+        {
+            get => overrideWaterDragCoefficient ?? originalWaterDragCoefficient;
+            set => overrideWaterDragCoefficient = value;
+        }
+
+        /// <summary>
+        /// Removes the override value -> falls back to using the original value defined in the xml.
+        /// </summary>
+        public void ResetWaterDragCoefficient() => overrideWaterDragCoefficient = null;
 
         public readonly XElement StaticBodyConfig;
 
@@ -900,7 +911,7 @@ namespace Barotrauma
             defaultRect = newRect;
             rect = newRect;
 
-            condition = MaxCondition =  Prefab.Health;
+            condition = MaxCondition = prevCondition = Prefab.Health;
             ConditionPercentage = 100.0f;
            
             lastSentCondition = condition;
@@ -990,6 +1001,7 @@ namespace Barotrauma
                     case "infectedsprite":
                     case "damagedinfectedsprite":
                     case "swappableitem":
+                    case "skillrequirementhint":
                         break;
                     case "staticbody":
                         StaticBodyConfig = subElement;
@@ -1002,13 +1014,6 @@ namespace Barotrauma
                         if (ic == null) break;
 
                         AddComponent(ic);
-
-                        if (ic is IDrawableComponent && ic.Drawable)
-                        {
-                            drawableComponents.Add(ic as IDrawableComponent);
-                            hasComponentsToDraw = true;
-                        }
-                        if (ic is Repairable) repairables.Add((Repairable)ic);
                         break;
                 }
             }
@@ -1023,6 +1028,14 @@ namespace Barotrauma
                     }
                 }
 
+                if (ic is Repairable repairable) { repairables.Add(repairable); }
+
+                if (ic is IDrawableComponent && ic.Drawable)
+                {
+                    drawableComponents.Add(ic as IDrawableComponent);
+                    hasComponentsToDraw = true;
+                }
+
                 if (ic.statusEffectLists == null) { continue; }
                 if (ic.InheritStatusEffects)
                 {
@@ -1057,8 +1070,7 @@ namespace Barotrauma
             if (body != null)
             {
                 body.Submarine = submarine;
-                waterDragCoefficient = bodyElement.GetAttributeFloat("waterdragcoefficient", 
-                    GetComponent<Projectile>() != null || GetComponent<Throwable>() != null ? 0.1f : 1.0f);
+                originalWaterDragCoefficient = bodyElement.GetAttributeFloat("waterdragcoefficient", 5.0f);
             }
 
             //cache connections into a dictionary for faster lookups
@@ -1655,7 +1667,7 @@ namespace Barotrauma
 
                     if (effect.TargetSlot > -1)
                     {
-                        if (OwnInventory.FindIndex(containedItem) != effect.TargetSlot) { continue; }
+                        if (!OwnInventory.GetItemsAt(effect.TargetSlot).Contains(containedItem)) { continue; }
                     }
 
                     hasTargets = true;
@@ -1733,7 +1745,7 @@ namespace Barotrauma
         {
             if (Indestructible || InvulnerableToDamage) { return new AttackResult(); }
 
-            float damageAmount = attack.GetItemDamage(deltaTime);
+            float damageAmount = attack.GetItemDamage(deltaTime, Prefab.ItemDamageMultiplier);
             Condition -= damageAmount;
 
             if (damageAmount >= Prefab.OnDamagedThreshold)
@@ -1761,6 +1773,7 @@ namespace Barotrauma
 
             RecalculateConditionValues();
 
+            bool wasPreviousConditionChanged = false;
             if (condition == 0.0f && prevCondition > 0.0f)
             {
                 //Flag connections to be updated as device is broken
@@ -1773,6 +1786,8 @@ namespace Barotrauma
                 }
                 if (Screen.Selected == GameMain.SubEditorScreen) { return; }
 #endif
+                // Have to set the previous condition here or OnBroken status effects that reduce the condition will keep triggering the status effects, resulting in a stack overflow.
+                SetPreviousCondition();
                 ApplyStatusEffects(ActionType.OnBroken, 1.0f, null);
             }
             else if (condition > 0.0f && prevCondition <= 0.0f)
@@ -1803,9 +1818,18 @@ namespace Barotrauma
                 }
             }
 
-            LastConditionChange = condition - prevCondition;
-            ConditionLastUpdated = Timing.TotalTime;
-            prevCondition = condition;
+            if (!wasPreviousConditionChanged)
+            {
+                SetPreviousCondition();
+            }
+
+            void SetPreviousCondition()
+            {
+                LastConditionChange = condition - prevCondition;
+                ConditionLastUpdated = Timing.TotalTime;
+                prevCondition = condition;
+                wasPreviousConditionChanged = true;
+            }
 
             static void flagChangedConnections(Dictionary<string, Connection> connections)
             {
@@ -1991,8 +2015,7 @@ namespace Barotrauma
             if (needsWaterCheck)
             {
                 bool wasInWater = inWater;
-                inWater = IsInWater();
-                bool waterProof = WaterProof;
+                inWater = IsInWater() && !WaterProof;
                 if (inWater)
                 {
                     //the item has gone through the surface of the water
@@ -2007,15 +2030,19 @@ namespace Barotrauma
                     }
 
                     Item container = this.Container;
-                    while (!waterProof && container != null)
+                    while (container != null)
                     {
-                        waterProof = container.WaterProof;
+                        if (container.WaterProof)
+                        {
+                            inWater = false;
+                            break;
+                        }
                         container = container.Container;
                     }
                 }
                 if (hasWaterStatusEffects && condition > 0.0f)
                 {
-                    ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+                    ApplyStatusEffects(inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
                 }
             }
             else
@@ -2141,7 +2168,7 @@ namespace Barotrauma
                 Vector2 frontVel = body.FarseerBody.GetLinearVelocityFromLocalPoint(localFront);
 
                 float speed = frontVel.Length();
-                float drag = speed * speed * waterDragCoefficient * volume * Physics.NeutralDensity;
+                float drag = speed * speed * WaterDragCoefficient * volume * Physics.NeutralDensity;
                 //very small drag on active projectiles to prevent affecting their trajectories much
                 if (body.FarseerBody.IsBullet) { drag *= 0.1f; }
                 Vector2 dragVec = -frontVel / speed * drag;
@@ -2711,7 +2738,7 @@ namespace Barotrauma
                 return;
             }
 
-            if (condition == 0.0f) { return; }
+            if (condition <= 0.0f) { return; }
         
             bool remove = false;
 
@@ -2728,7 +2755,7 @@ namespace Barotrauma
 #if CLIENT
                     ic.PlaySound(ActionType.OnUse, character); 
 #endif
-                    ic.ApplyStatusEffects(ActionType.OnUse, deltaTime, character, targetLimb, useTarget: targetLimb?.character, user: character);
+                    ic.ApplyStatusEffects(ActionType.OnUse, deltaTime, character, targetLimb, useTarget: character, user: character);
 
                     if (ic.DeleteOnUse) { remove = true; }
                 }
@@ -2742,7 +2769,7 @@ namespace Barotrauma
 
         public void SecondaryUse(float deltaTime, Character character = null)
         {
-            if (condition == 0.0f) { return; }
+            if (condition <= 0.0f) { return; }
 
             bool remove = false;
 
@@ -2778,6 +2805,13 @@ namespace Barotrauma
             if (!UseInHealthInterface) { return; }
 
 #if CLIENT
+            if (user == Character.Controlled)
+            {
+                if (HealingCooldown.IsOnCooldown) { return; }
+
+                HealingCooldown.PutOnCooldown();
+            }
+
             if (GameMain.Client != null)
             {
                 GameMain.Client.CreateEntityEvent(this, new TreatmentEventData(character, targetLimb));
@@ -2798,13 +2832,13 @@ namespace Barotrauma
 #endif
                 ic.WasUsed = true;
 
-                ic.ApplyStatusEffects(conditionalActionType, 1.0f, character, targetLimb, useTarget: targetLimb?.character, user: user);
-                ic.ApplyStatusEffects(ActionType.OnUse, 1.0f, character, targetLimb, useTarget: targetLimb?.character, user: user);
+                ic.ApplyStatusEffects(conditionalActionType, 1.0f, character, targetLimb, useTarget: character, user: user);
+                ic.ApplyStatusEffects(ActionType.OnUse, 1.0f, character, targetLimb, useTarget: character, user: user);
 
                 if (GameMain.NetworkMember is { IsServer: true })
                 {
-                    GameMain.NetworkMember.CreateEntityEvent(this, new ApplyStatusEffectEventData(conditionalActionType, ic, character, targetLimb));
-                    GameMain.NetworkMember.CreateEntityEvent(this, new ApplyStatusEffectEventData(ActionType.OnUse, ic, character, targetLimb));
+                    GameMain.NetworkMember.CreateEntityEvent(this, new ApplyStatusEffectEventData(conditionalActionType, ic, character, targetLimb, useTarget: character));
+                    GameMain.NetworkMember.CreateEntityEvent(this, new ApplyStatusEffectEventData(ActionType.OnUse, ic, character, targetLimb, useTarget: character));
                 }
 
                 if (ic.DeleteOnUse) { remove = true; }

Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs

@@ -1,16 +1,33 @@
-using Barotrauma.IO;
+using Barotrauma.Extensions;
+using Barotrauma.IO;
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Barotrauma.Extensions;
 using System.Security.Cryptography;
 using System.Xml.Linq;
 
 namespace Barotrauma
 {
+    readonly struct SkillRequirementHint
+    {
+        public readonly Identifier Skill;
+        public readonly float Level;
+        public readonly LocalizedString SkillName;
+
+        public LocalizedString GetFormattedText(int skillLevel, string levelColorTag) => 
+            $"{SkillName} {Level} (‖color:{levelColorTag}‖{skillLevel}‖color:end‖)";
+
+        public SkillRequirementHint(ContentXElement element)
+        {
+            Skill = element.GetAttributeIdentifier("identifier", Identifier.Empty);
+            Level = element.GetAttributeFloat("level", 0);
+            SkillName = TextManager.Get("skillname." + Skill);
+        }
+    }
+
     readonly struct DeconstructItem
     {
         public readonly Identifier ItemIdentifier;
@@ -443,6 +460,8 @@ namespace Barotrauma
         //Containers (by identifiers or tags) that this item should be placed in. These are preferences, which are not enforced.
         public ImmutableArray<PreferredContainer> PreferredContainers { get; private set; }
 
+        public ImmutableArray<SkillRequirementHint> SkillRequirementHints { get; private set; }
+
         public SwappableItem SwappableItem
         {
             get;
@@ -568,9 +587,11 @@ namespace Barotrauma
 
         public ImmutableDictionary<Identifier, FixedQuantityResourceInfo> LevelQuantity { get; private set; }
 
-        public bool CanSpriteFlipX { get; private set; }
+        private bool canSpriteFlipX;
+        public override bool CanSpriteFlipX => canSpriteFlipX;
 
-        public bool CanSpriteFlipY { get; private set; }
+        private bool canSpriteFlipY;
+        public override bool CanSpriteFlipY => canSpriteFlipY;
 
         /// <summary>
         /// Can the item be chosen as extra cargo in multiplayer. If not set, the item is available if it can be bought from outposts in the campaign.
@@ -658,6 +679,9 @@ namespace Barotrauma
         [Serialize(1f, IsPropertySaveable.No)]
         public float ExplosionDamageMultiplier { get; private set; }
 
+        [Serialize(1f, IsPropertySaveable.No)]
+        public float ItemDamageMultiplier { get; private set; }
+
         [Serialize(false, IsPropertySaveable.No)]
         public bool DamagedByProjectiles { get; private set; }
 
@@ -767,6 +791,21 @@ namespace Barotrauma
         [Serialize(true, IsPropertySaveable.No)]
         public bool ShowHealthBar { get; private set; }
 
+        [Serialize(1f, IsPropertySaveable.No, description: "How much the bots prioritize this item when they seek for items. For example, bots prioritize less exosuit than the other diving suits. Defaults to 1. Note that there's also a specific CombatPriority for items that can be used as weapons.")]
+        public float BotPriority { get; private set; }
+
+        [Serialize(true, IsPropertySaveable.No)]
+        public bool ShowNameInHealthBar { get; private set; }
+
+        [Serialize(false, IsPropertySaveable.No, description:"Should the bots shoot at this item with turret or not? Disabled by default.")]
+        public bool IsAITurretTarget { get; private set; }
+
+        [Serialize(1.0f, IsPropertySaveable.No, description: "How much the bots prioritize shooting this item with turrets? Defaults to 1. Distance to the target affects the decision making.")]
+        public float AITurretPriority { get; private set; }
+
+        [Serialize(1.0f, IsPropertySaveable.No, description: "How much the bots prioritize shooting this item with slow turrets, like railguns? Defaults to 1. Not used if AITurretPriority is 0. Distance to the target affects the decision making.")]
+        public float AISlowTurretPriority { get; private set; }
+
         protected override Identifier DetermineIdentifier(XElement element)
         {
             Identifier identifier = base.DetermineIdentifier(element);
@@ -869,6 +908,15 @@ namespace Barotrauma
             SerializableProperty.DeserializeProperties(this, ConfigElement);
 
             LoadDescription(ConfigElement);
+            var skillRequirementHints = new List<SkillRequirementHint>();
+            foreach (var skillRequirementHintElement in ConfigElement.GetChildElements("SkillRequirementHint"))
+            {
+                skillRequirementHints.Add(new SkillRequirementHint(skillRequirementHintElement));
+            }
+            if (skillRequirementHints.Any())
+            {
+                SkillRequirementHints = skillRequirementHints.ToImmutableArray();
+            }
 
             var allowDroppingOnSwapWith = ConfigElement.GetAttributeIdentifierArray("allowdroppingonswapwith", Array.Empty<Identifier>());
             AllowDroppingOnSwapWith = allowDroppingOnSwapWith.ToImmutableHashSet();
@@ -884,8 +932,8 @@ namespace Barotrauma
                     case "sprite":
                         string spriteFolder = GetTexturePath(subElement, variantOf);
 
-                        CanSpriteFlipX = subElement.GetAttributeBool("canflipx", true);
-                        CanSpriteFlipY = subElement.GetAttributeBool("canflipy", true);
+                        canSpriteFlipX = subElement.GetAttributeBool("canflipx", true);
+                        canSpriteFlipY = subElement.GetAttributeBool("canflipy", true);
 
                         sprite = new Sprite(subElement, spriteFolder, lazyLoad: true);
                         if (subElement.GetAttribute("sourcerect") == null &&
@@ -936,14 +984,20 @@ namespace Barotrauma
                         AllowDeconstruct = true;
                         RandomDeconstructionOutput = subElement.GetAttributeBool("chooserandom", false);
                         RandomDeconstructionOutputAmount = subElement.GetAttributeInt("amount", 1);
-                        foreach (XElement deconstructItem in subElement.Elements())
+                        foreach (XElement itemElement in subElement.Elements())
                         {
-                            if (deconstructItem.Attribute("name") != null)
+                            if (itemElement.Attribute("name") != null)
                             {
                                 DebugConsole.ThrowError($"Error in item config \"{ToString()}\" - use item identifiers instead of names to configure the deconstruct items.");
                                 continue;
                             }
-                            deconstructItems.Add(new DeconstructItem(deconstructItem, Identifier));
+                            var deconstructItem = new DeconstructItem(itemElement, Identifier);
+                            if (deconstructItem.ItemIdentifier.IsEmpty)
+                            {
+                                DebugConsole.ThrowError($"Error in item config \"{ToString()}\" - deconstruction output contains an item with no identifier.");
+                                continue;
+                            }
+                            deconstructItems.Add(deconstructItem);
                         }
                         RandomDeconstructionOutputAmount = Math.Min(RandomDeconstructionOutputAmount, deconstructItems.Count);
                         break;
@@ -1336,11 +1390,43 @@ namespace Barotrauma
         }
 
         public Identifier VariantOf { get; }
-        
+        public ItemPrefab ParentPrefab { get; set; }
+
         public void InheritFrom(ItemPrefab parent)
         {
-            ConfigElement = originalElement.CreateVariantXML(parent.ConfigElement).FromPackage(ConfigElement.ContentPackage);
+            ConfigElement = originalElement.CreateVariantXML(parent.ConfigElement, CheckXML).FromPackage(ConfigElement.ContentPackage);
             ParseConfigElement(parent);
+
+            void CheckXML(XElement originalElement, XElement variantElement, XElement result)
+            {
+                if (result == null) { return; }
+                if (result.Name.ToIdentifier() == "RequiredItem" &&
+                    result.Parent?.Name.ToIdentifier() == "Fabricate")
+                {
+                    int originalAmount = originalElement.GetAttributeInt("amount", 1);
+                    Identifier originalIdentifier = originalElement.GetAttributeIdentifier("identifier", Identifier.Empty);
+                    if (variantElement == null)
+                    {
+                        //if the variant defines some fabrication requirements, we probably don't want to inherit anything extra from the base item?
+                        if (this.originalElement.GetChildElement("Fabricate")?.GetChildElement("RequiredItem") != null)
+                        {
+                            DebugConsole.AddWarning($"Potential error in item variant \"{Identifier}\": " +
+                                $"the item inherits the fabrication requirement of x{originalAmount} \"{originalIdentifier}\"  from the base item \"{parent.Identifier}\". " +
+                                $"If this is not intentional, you can use empty <RequiredItem /> elements in the item variant to remove any excess inherited fabrication requirements.");
+                        }
+                        return;
+                    }
+
+                    Identifier resultIdentifier = result.GetAttributeIdentifier("identifier", Identifier.Empty);
+                    if (originalAmount > 1 && variantElement.GetAttribute("amount") == null)
+                    {
+                        DebugConsole.AddWarning($"Potential error in item variant \"{Identifier}\": " +
+                            $"the base item \"{parent.Identifier}\" requires x{originalAmount} \"{originalIdentifier}\" to fabricate. " +
+                            $"The variant only overrides the required item, not the amount, resulting in a requirement of x{originalAmount} \"{resultIdentifier}\". "+
+                            "Specify the amount in the variant to fix this.");
+                    }
+                }
+            }
         }
 
         public override string ToString()

Barotrauma/BarotraumaShared/SharedSource/Items/RelatedItem.cs

@@ -66,7 +66,7 @@ namespace Barotrauma
         /// <summary>
         /// Only affects when ItemContainer.hideItems is false. Doesn't override the value.
         /// </summary>
-        public bool? Hide;
+        public bool Hide;
 
         public float Rotation;
 
@@ -224,9 +224,9 @@ namespace Barotrauma
                 new XAttribute("rotation", Rotation),
                 new XAttribute("setactive", SetActive));
 
-            if (Hide.HasValue)
+            if (Hide)
             {
-                element.Add(new XAttribute(nameof(Hide), Hide.Value));
+                element.Add(new XAttribute(nameof(Hide), true));
             }
             if (ItemPos.HasValue)
             {

Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs

@@ -18,9 +18,9 @@ namespace Barotrauma
 
         public const ushort ReservedIDStart = ushort.MaxValue - 3;
 
-        public const ushort MaxEntityCount = ushort.MaxValue - 2; //ushort.MaxValue - 2 because 0 and ushort.MaxValue are reserved values
+        public const ushort MaxEntityCount = ushort.MaxValue - 4; //ushort.MaxValue - 4 because the 4 values above are reserved values
 
-        private static Dictionary<ushort, Entity> dictionary = new Dictionary<ushort, Entity>();
+        private static readonly Dictionary<ushort, Entity> dictionary = new Dictionary<ushort, Entity>();
         public static IReadOnlyCollection<Entity> GetEntities()
         {
             return dictionary.Values;
@@ -85,6 +85,28 @@ namespace Barotrauma
             this.Submarine = submarine;
             spawnTime = Timing.TotalTime;
 
+            if (dictionary.Count >= MaxEntityCount)
+            {
+                Dictionary<Identifier, int> entityCounts = new Dictionary<Identifier, int>();
+                foreach (var entity in dictionary)
+                {
+                    if (entity.Value is MapEntity me)
+                    {
+                        if (entityCounts.ContainsKey(me.Prefab.Identifier))
+                        {
+                            entityCounts[me.Prefab.Identifier]++;
+                        }
+                        else
+                        {
+                            entityCounts[me.Prefab.Identifier] = 1;
+                        }
+                    }
+                }
+                string errorMsg = $"Maximum amount of entities ({MaxEntityCount}) exceeded! Largest numbers of entities: " +
+                  string.Join(", ", entityCounts.OrderByDescending(kvp => kvp.Value).Take(10).Select(kvp => $"{kvp.Key}: {kvp.Value}"));
+                throw new Exception(errorMsg);
+            }
+
             //give a unique ID
             ID = DetermineID(id, submarine);
 

Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs

@@ -127,6 +127,7 @@ namespace Barotrauma
                 hull.AddDecal(decal, worldPosition, decalSize, isNetworkEvent: false);
             }
 
+            Attack.DamageMultiplier = 1.0f;
             float displayRange = Attack.Range;
             if (damageSource is Item sourceItem)
             {
@@ -192,6 +193,12 @@ namespace Barotrauma
                         item.Condition -= item.MaxCondition * EmpStrength * distFactor;
                     }
 
+                    var lightComponent = item.GetComponent<LightComponent>();
+                    if (lightComponent != null)
+                    {
+                        lightComponent.TemporaryFlickerTimer = Math.Min(EmpStrength * distFactor, 10.0f);
+                    }
+
                     //discharge batteries
                     var powerContainer = item.GetComponent<PowerContainer>();
                     if (powerContainer != null)
@@ -264,7 +271,7 @@ namespace Barotrauma
                     if (item.Prefab.DamagedByExplosions && !item.Indestructible)
                     {
                         float distFactor = 1.0f - dist / displayRange;
-                        float damageAmount = Attack.GetItemDamage(1.0f) * item.Prefab.ExplosionDamageMultiplier;
+                        float damageAmount = Attack.GetItemDamage(1.0f, item.Prefab.ExplosionDamageMultiplier);
 
                         Vector2 explosionPos = worldPosition;
                         if (item.Submarine != null) { explosionPos -= item.Submarine.Position; }
@@ -352,7 +359,7 @@ namespace Barotrauma
                         if (affliction.DivideByLimbCount)
                         {
                             float limbCountFactor = distFactors.Count;
-                            if (affliction.Prefab.LimbSpecific && affliction.Prefab.AfflictionType == "damage")
+                            if (affliction.Prefab.LimbSpecific && affliction.Prefab.AfflictionType == AfflictionPrefab.DamageType)
                             {
                                 // Shouldn't go above 15, or the damage can be unexpectedly low -> doesn't break armor
                                 // Effectively this makes large explosions more effective against large creatures (because more limbs are affected), but I don't think that's necessarily a bad thing.

Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs

@@ -4,6 +4,7 @@ using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -51,7 +52,6 @@ namespace Barotrauma
         //can ambient light get through the gap even if it's not open
         public bool PassAmbientLight;
 
-
         //a collider outside the gap (for example an ice wall next to the sub)
         //used by ragdolls to prevent them from ending up inside colliders when teleporting out of the sub
         private Body outsideCollisionBlocker;
@@ -63,8 +63,43 @@ namespace Barotrauma
             set
             {
                 if (float.IsNaN(value)) { return; }
-                if (value > open) { openedTimer = 1.0f; }
+                if (value > open)
+                {
+                    openedTimer = 1.0f;
+                }
+                if (connectedDoor == null && !IsHorizontal && linkedTo.Any(e => e is Hull))
+                {
+                    if (value > open && value >= 1.0f)
+                    {
+                        InformWaypointsAboutGapState(this, open: true);
+                    }
+                    else if (value < open && open >= 1.0f)
+                    {
+                        InformWaypointsAboutGapState(this, open: false);
+                    }
+                }
                 open = MathHelper.Clamp(value, 0.0f, 1.0f);
+
+                static void InformWaypointsAboutGapState(Gap gap, bool open)
+                {
+                    foreach (var wp in WayPoint.WayPointList)
+                    {
+                        if (IsWaypointRightAboveGap(gap, wp))
+                        {
+                            wp.OnGapStateChanged(open, gap);
+                        }
+                    }
+                }
+
+                static bool IsWaypointRightAboveGap(Gap gap, WayPoint wp)
+                {
+                    if (wp.SpawnType != SpawnType.Path) { return false; }
+                    if (!gap.linkedTo.Contains(wp.CurrentHull)) { return false; }
+                    if (wp.Position.Y < gap.Rect.Top) { return false; }
+                    if (wp.Position.X > gap.Rect.Right) { return false; }
+                    if (wp.Position.X < gap.Rect.Left) { return false; }
+                    return true;
+                }
             }
         }
 

Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs

@@ -1083,7 +1083,7 @@ namespace Barotrauma
                 if (g.ConnectedDoor != null && !g.ConnectedDoor.IsBroken)
                 {
                     //gap blocked if the door is not open or the predicted state is not open
-                    if ((!g.ConnectedDoor.IsOpen && !g.ConnectedDoor.IsBroken) || (g.ConnectedDoor.PredictedState.HasValue && !g.ConnectedDoor.PredictedState.Value))
+                    if ((g.ConnectedDoor.IsClosed && !g.ConnectedDoor.IsBroken) || (g.ConnectedDoor.PredictedState.HasValue && !g.ConnectedDoor.PredictedState.Value))
                     {
                         if (g.ConnectedDoor.OpenState < 0.1f)
                         {

Barotrauma/BarotraumaShared/SharedSource/Map/IDamageable.cs

@@ -9,7 +9,7 @@ namespace Barotrauma
         Vector2 WorldPosition { get; }
         float Health { get; }
         
-        AttackResult AddDamage(Character attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound=true);
+        AttackResult AddDamage(Character attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound = true);
         
         
         public readonly struct AttackEventData

Barotrauma/BarotraumaShared/SharedSource/Map/ItemAssemblyPrefab.cs

@@ -50,6 +50,12 @@ namespace Barotrauma
             Description = TextManager.Get($"EntityDescription.{Identifier}");
             Tags = Enumerable.Empty<Identifier>().ToImmutableHashSet();
 
+            string description = element.GetAttributeString("description", string.Empty);
+            if (!description.IsNullOrEmpty())
+            {
+                Description = Description.Fallback(description);
+            }
+
             List<ushort> containedItemIDs = new List<ushort>();
             foreach (XElement entityElement in element.Elements())
             {

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs

@@ -1700,14 +1700,22 @@ namespace Barotrauma
             foreach (VoronoiCell cell in closeCells)
             {
                 bool tooClose = false;
-                foreach (GraphEdge edge in cell.Edges)
-                {                    
-                    if (Vector2.DistanceSquared(edge.Point1, position) < minDistSqr ||
-                        Vector2.DistanceSquared(edge.Point2, position) < minDistSqr ||
-                        MathUtils.LineSegmentToPointDistanceSquared(edge.Point1.ToPoint(), edge.Point2.ToPoint(), position.ToPoint()) < minDistSqr)
+
+                if (cell.IsPointInsideAABB(position, margin: minDistance))
+                {
+                    tooClose = true;
+                }
+                else
+                {
+                    foreach (GraphEdge edge in cell.Edges)
                     {
-                        tooClose = true;
-                        break;
+                        if (Vector2.DistanceSquared(edge.Point1, position) < minDistSqr ||
+                            Vector2.DistanceSquared(edge.Point2, position) < minDistSqr ||
+                            MathUtils.LineSegmentToPointDistanceSquared(edge.Point1.ToPoint(), edge.Point2.ToPoint(), position.ToPoint()) < minDistSqr)
+                        {
+                            tooClose = true;
+                            break;
+                        }
                     }
                 }
                 if (tooClose) { tooCloseCells.Add(cell); }
@@ -3247,7 +3255,8 @@ namespace Barotrauma
             {
                 suitablePositions.RemoveAll(p => !filter(p));
             }
-            if (positionType.HasFlag(PositionType.MainPath) || positionType.HasFlag(PositionType.SidePath))
+            if (positionType.HasFlag(PositionType.MainPath) || positionType.HasFlag(PositionType.SidePath) || positionType.HasFlag(PositionType.Abyss) || 
+                positionType.HasFlag(PositionType.Cave) || positionType.HasFlag(PositionType.AbyssCave))
             {
                 suitablePositions.RemoveAll(p => IsPositionInsideWall(p.Position.ToVector2()));
             }
@@ -3412,8 +3421,7 @@ namespace Barotrauma
                     bool closeEnough = false;
                     foreach (VoronoiCell cell in wall.Cells)
                     {
-                        if (Math.Abs(cell.Center.X - worldPos.X) < (searchDepth + 1) * GridCellSize && 
-                            Math.Abs(cell.Center.Y - worldPos.Y) < (searchDepth + 1) * GridCellSize)
+                        if (cell.IsPointInsideAABB(worldPos, margin: (searchDepth + 1) * GridCellSize / 2))
                         { 
                             closeEnough = true;
                             break;