(bcb06cc5c) Unstable v0.9.9.0

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

@@ -25,7 +25,7 @@ namespace Barotrauma
         /// <summary>
         /// How long does it take for the ai target to fade out if not kept alive.
         /// </summary>
-        public float FadeOutTime { get; private set; } = 1;
+        public float FadeOutTime { get; private set; } = 2;
 
         public bool Static { get; private set; }
         public bool StaticSound { get; private set; }
@@ -92,7 +92,7 @@ namespace Barotrauma
         public string SonarLabel;
         public string SonarIconIdentifier;
 
-        public bool Enabled = true;
+        public bool Enabled => SoundRange > 0 || SightRange > 0;
 
         public float MinSoundRange, MinSightRange;
         public float MaxSoundRange = 100000, MaxSightRange = 100000;
@@ -177,7 +177,8 @@ namespace Barotrauma
                 StaticSight = true;
             }
             SonarDisruption     = element.GetAttributeFloat("sonardisruption", 0.0f);
-            SonarLabel          = element.GetAttributeString("sonarlabel", "");
+            string label        = element.GetAttributeString("sonarlabel", "");
+            SonarLabel          = TextManager.Get(label, returnNull: true) ?? label;
             SonarIconIdentifier = element.GetAttributeString("sonaricon", "");
             string typeString   = element.GetAttributeString("type", "Any");
             if (Enum.TryParse(typeString, out TargetType t))
@@ -195,7 +196,7 @@ namespace Barotrauma
 
         public void Update(float deltaTime)
         {
-            if (!Static && FadeOutTime > 0)
+            if (Enabled && !Static && FadeOutTime > 0)
             {
                 // The aitarget goes silent/invisible if the components don't keep it active
                 if (!StaticSight)

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

@@ -89,9 +89,6 @@ namespace Barotrauma
         private readonly float memoryFadeTime = 0.5f;
         private readonly float avoidTime = 3;
 
-        //Has the character been attacked since the last Update.
-        private bool wasAttacked;
-
         private float avoidTimer;
 
         public LatchOntoAI LatchOntoAI { get; private set; }
@@ -234,13 +231,6 @@ namespace Barotrauma
         
         public override void Update(float deltaTime)
         {
-            if (wasAttacked)
-            {
-                LatchOntoAI?.DeattachFromBody();
-                Character.AnimController.ReleaseStuckLimbs();
-                wasAttacked = false;
-            }
-
             if (DisableEnemyAI) { return; }
 
             base.Update(deltaTime);
@@ -305,7 +295,8 @@ namespace Barotrauma
                 FadeMemories(updateMemoriesInverval);
                 updateMemoriesTimer = updateMemoriesInverval;
             }
-            if (Character.HealthPercentage <= FleeHealthThreshold)
+            if (Character.HealthPercentage <= FleeHealthThreshold && SelectedAiTarget != null && 
+                SelectedAiTarget.Entity is Character target && (target.IsPlayer || IsBeingChasedBy(target)))
             {
                 State = AIState.Flee;
                 wallTarget = null;
@@ -384,9 +375,9 @@ namespace Barotrauma
                         State = AIState.Idle;
                         return;
                     }
-                    float distance = Vector2.DistanceSquared(WorldPosition, SelectedAiTarget.WorldPosition);
+                    float squaredDistance = Vector2.DistanceSquared(WorldPosition, SelectedAiTarget.WorldPosition);
                     var attackLimb = GetAttackLimb(SelectedAiTarget.WorldPosition);
-                    if (attackLimb != null && distance <= Math.Pow(attackLimb.attack.Range, 2))
+                    if (attackLimb != null && squaredDistance <= Math.Pow(attackLimb.attack.Range, 2))
                     {
                         run = true;
                         if (State == AIState.Avoid)
@@ -402,17 +393,18 @@ namespace Barotrauma
                     {
                         bool isBeingChased = IsBeingChased;
                         float reactDistance = !isBeingChased && selectedTargetingParams != null && selectedTargetingParams.ReactDistance > 0 ? selectedTargetingParams.ReactDistance : GetPerceivingRange(SelectedAiTarget);
-                        if (distance <= Math.Pow(reactDistance + escapeMargin, 2))
+                        if (squaredDistance <= Math.Pow(reactDistance + escapeMargin, 2))
                         {
                             float halfReactDistance = reactDistance / 2;
-                            if (State == AIState.Aggressive || State == AIState.PassiveAggressive && distance < Math.Pow(halfReactDistance, 2))
+                            float attackDistance = selectedTargetingParams != null && selectedTargetingParams.AttackDistance > 0 ? selectedTargetingParams.AttackDistance : halfReactDistance;
+                            if (State == AIState.Aggressive || State == AIState.PassiveAggressive && squaredDistance < Math.Pow(attackDistance, 2))
                             {
                                 run = true;
                                 UpdateAttack(deltaTime);
                             }
                             else
                             {
-                                run = isBeingChased ? true : distance < Math.Pow(halfReactDistance, 2);
+                                run = isBeingChased ? true : squaredDistance < Math.Pow(halfReactDistance, 2);
                                 if (escapeMargin <= 0)
                                 {
                                     escapeMargin = halfReactDistance;
@@ -440,13 +432,14 @@ namespace Barotrauma
                 SwarmBehavior.Refresh();
                 SwarmBehavior.UpdateSteering(deltaTime);
             }
-            float speed = Character.AnimController.GetCurrentSpeed(run);
+            float speed = Character.AnimController.GetCurrentSpeed(run && Character.CanRun);
+            steeringManager.Update(speed);
+            Character.AnimController.TargetMovement = Character.ApplyMovementLimits(Steering, State == AIState.Idle && Character.AnimController.InWater ? Steering.Length() : speed);
             if (Character.CurrentHull != null && Character.AnimController.InWater)
             {
                 // Halve the swimming speed inside the sub
-                speed /= 2;
+                Character.AnimController.TargetMovement *= 0.5f;
             }
-            steeringManager.Update(speed);
         }
 
         #region Idle
@@ -577,7 +570,7 @@ namespace Barotrauma
                 else if (SelectedAiTarget?.Entity is Character targetCharacter && targetCharacter.CurrentHull == Character.CurrentHull)
                 {
                     // Steer away from the target if in the same room
-                    Vector2 escapeDir = Vector2.Normalize(SelectedAiTarget != null ? WorldPosition - SelectedAiTarget.WorldPosition : Character.GetTargetMovement());
+                    Vector2 escapeDir = Vector2.Normalize(SelectedAiTarget != null ? WorldPosition - SelectedAiTarget.WorldPosition : Character.AnimController.TargetMovement);
                     if (!MathUtils.IsValid(escapeDir)) escapeDir = Vector2.UnitY;
                     SteeringManager.SteeringManual(deltaTime, escapeDir);
                 }
@@ -615,7 +608,7 @@ namespace Barotrauma
             {
                 escapeTarget = null;
                 allGapsSearched = false;
-                Vector2 escapeDir = Vector2.Normalize(SelectedAiTarget != null ? WorldPosition - SelectedAiTarget.WorldPosition : Character.GetTargetMovement());
+                Vector2 escapeDir = Vector2.Normalize(SelectedAiTarget != null ? WorldPosition - SelectedAiTarget.WorldPosition : Character.AnimController.TargetMovement);
                 if (!MathUtils.IsValid(escapeDir)) escapeDir = Vector2.UnitY;
                 SteeringManager.SteeringManual(deltaTime, escapeDir);
                 if (Character.CurrentHull == null)
@@ -758,6 +751,10 @@ namespace Barotrauma
             bool pursue = false;
             if (IsCoolDownRunning)
             {
+                if (AttackingLimb.attack.CoolDownTimer >= AttackingLimb.attack.CoolDown + AttackingLimb.attack.CurrentRandomCoolDown - AttackingLimb.attack.AfterAttackDelay)
+                {
+                    return;
+                }
                 switch (AttackingLimb.attack.AfterAttack)
                 {
                     case AIBehaviorAfterAttack.Pursue:
@@ -1017,58 +1014,63 @@ namespace Barotrauma
                 return;
             }
 
-            Vector2 offset = Character.SimPosition - steeringLimb.SimPosition;
-            // Offset so that we don't overshoot the movement
-            Vector2 steerPos = attackSimPos + offset;
-
-            if (SteeringManager is IndoorsSteeringManager pathSteering)
+            if (AttackingLimb != null && AttackingLimb.attack.Retreat)
             {
-                if (pathSteering.CurrentPath != null)
+                UpdateFallBack(attackWorldPos, deltaTime, false);
+            }
+            else
+            {
+                Vector2 offset = Character.SimPosition - steeringLimb.SimPosition;
+                // Offset so that we don't overshoot the movement
+                Vector2 steerPos = attackSimPos + offset;
+                if (SteeringManager is IndoorsSteeringManager pathSteering)
                 {
-                    // Attack doors
-                    if (canAttackSub)
+                    if (pathSteering.CurrentPath != null)
                     {
-                        // If the target is in the same hull, there shouldn't be any doors blocking the path
-                        if (targetCharacter == null || targetCharacter.CurrentHull != Character.CurrentHull)
+                        // Attack doors
+                        if (canAttackSub)
                         {
-                            var door = pathSteering.CurrentPath.CurrentNode?.ConnectedDoor ?? pathSteering.CurrentPath.NextNode?.ConnectedDoor;
-                            if (door != null && !door.IsOpen)
+                            // If the target is in the same hull, there shouldn't be any doors blocking the path
+                            if (targetCharacter == null || targetCharacter.CurrentHull != Character.CurrentHull)
                             {
-                                if (door.Item.AiTarget != null && SelectedAiTarget != door.Item.AiTarget)
+                                var door = pathSteering.CurrentPath.CurrentNode?.ConnectedDoor ?? pathSteering.CurrentPath.NextNode?.ConnectedDoor;
+                                if (door != null && !door.IsOpen)
                                 {
-                                    SelectTarget(door.Item.AiTarget, selectedTargetMemory.Priority);
-                                    return;
+                                    if (door.Item.AiTarget != null && SelectedAiTarget != door.Item.AiTarget)
+                                    {
+                                        SelectTarget(door.Item.AiTarget, selectedTargetMemory.Priority);
+                                        return;
+                                    }
                                 }
                             }
                         }
-                    }
-                    // Steer towards the target if in the same room and swimming
-                    if ((Character.AnimController.InWater || pursue) && targetCharacter != null && VisibleHulls.Contains(targetCharacter.CurrentHull))
-                    {
-                        SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(attackSimPos - steeringLimb.SimPosition));
+                        // Steer towards the target if in the same room and swimming
+                        if ((Character.AnimController.InWater || pursue) && targetCharacter != null && VisibleHulls.Contains(targetCharacter.CurrentHull))
+                        {
+                            SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(attackSimPos - steeringLimb.SimPosition));
+                        }
+                        else
+                        {
+                            SteeringManager.SteeringSeek(steerPos, 2);
+                            // Switch to Idle when cannot reach the target and if cannot damage the walls
+                            if ((!canAttackSub || wallTarget == null) && !pathSteering.IsPathDirty && pathSteering.CurrentPath.Unreachable)
+                            {
+                                State = AIState.Idle;
+                                return;
+                            }
+                        }
                     }
                     else
                     {
-                        SteeringManager.SteeringSeek(steerPos, 2);
-                        // Switch to Idle when cannot reach the target and if cannot damage the walls
-                        if ((!canAttackSub || wallTarget == null) && !pathSteering.IsPathDirty && pathSteering.CurrentPath.Unreachable)
-                        {
-                            State = AIState.Idle;
-                            return;
-                        }
+                        SteeringManager.SteeringSeek(steerPos, 5);
                     }
                 }
                 else
                 {
-                    SteeringManager.SteeringSeek(steerPos, 5);
+                    SteeringManager.SteeringSeek(steerPos, 10);
+                    SteeringManager.SteeringAvoid(deltaTime, lookAheadDistance: avoidLookAheadDistance, weight: 15);
                 }
             }
-            else
-            {
-                SteeringManager.SteeringSeek(steerPos, 10);
-                SteeringManager.SteeringAvoid(deltaTime, lookAheadDistance: avoidLookAheadDistance, weight: 15);
-            }
-
             if (canAttack)
             {
                 if (!UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance, attackTargetLimb))
@@ -1110,31 +1112,11 @@ namespace Barotrauma
             return false;
         }
 
-        private bool CanAttack(Entity target)
-        {
-            if (target == null) { return false; }
-            if (target is Character c)
-            {
-                if (Character.CurrentHull == null && c.CurrentHull != null || Character.CurrentHull != null && c.CurrentHull == null)
-                {
-                    return false;
-                }
-            }
-            else if (target is Item i && i.GetComponent<Door>() == null)
-            {
-                if (Character.CurrentHull == null && i.CurrentHull != null || Character.CurrentHull != null && i.CurrentHull == null)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
         private Limb GetAttackLimb(Vector2 attackWorldPos, Limb ignoredLimb = null)
         {
             var currentContexts = Character.GetAttackContexts();
             Entity target = wallTarget != null ? wallTarget.Structure : SelectedAiTarget?.Entity;
-            if (!CanAttack(target)) { return null; }
+            if (target == null) { return null; }
             Limb selectedLimb = null;
             float currentPriority = -1;
             foreach (Limb limb in Character.AnimController.Limbs)
@@ -1174,14 +1156,18 @@ namespace Barotrauma
         {
             wallTarget = null;
             if (SelectedAiTarget == null) { return; }
+            if (SelectedAiTarget.Entity == null) { return; }
             //check if there's a wall between the target and the Character   
             Vector2 rayStart = SimPosition;
             Vector2 rayEnd = SelectedAiTarget.SimPosition;
-            bool offset = SelectedAiTarget.Entity.Submarine != null && Character.Submarine == null;
-            if (offset)
+            if (SelectedAiTarget.Entity.Submarine != null && Character.Submarine == null)
             {
                 rayStart -= SelectedAiTarget.Entity.Submarine.SimPosition;
             }
+            else if (SelectedAiTarget.Entity.Submarine == null && Character.Submarine != null)
+            {
+                rayEnd -= Character.Submarine.SimPosition;
+            }
             Body closestBody = Submarine.CheckVisibility(rayStart, rayEnd, ignoreSubs: true, ignoreSensors: CanEnterSubmarine, ignoreDisabledWalls: CanEnterSubmarine);
             if (Submarine.LastPickedFraction != 1.0f && closestBody != null)
             {
@@ -1259,9 +1245,16 @@ namespace Barotrauma
             float reactionTime = Rand.Range(0.1f, 0.3f);
             updateTargetsTimer = Math.Min(updateTargetsTimer, reactionTime);
 
-            wasAttacked = true;
-
+            bool wasLatched = IsLatchedOnSub;
+            Character.AnimController.ReleaseStuckLimbs();
+            LatchOntoAI?.DeattachFromBody();
             if (attacker == null || attacker.AiTarget == null) { return; }
+            if (wasLatched)
+            {
+                avoidTimer = avoidTime * Rand.Range(0.75f, 1.25f);
+                SelectTarget(attacker.AiTarget);
+                return;
+            }
 
             if (State == AIState.Flee)
             {
@@ -1272,22 +1265,30 @@ namespace Barotrauma
             if (attackResult.Damage > 0.0f)
             {
                 bool canAttack = attacker.Submarine == Character.Submarine && canAttackCharacters || attacker.Submarine != null && canAttackSub;
-                if (Character.Params.AI.AttackWhenProvoked)
+                if (Character.Params.AI.AttackWhenProvoked && canAttack)
                 {
-                    if (canAttack)
+                    if (attacker.IsHusk)
+                    {
+                        ChangeTargetState("husk", AIState.Attack, 100);
+                    }
+                    else
                     {
                         ChangeTargetState(attacker, AIState.Attack, 100);
                     }
                 }
                 else if (!AIParams.HasTag(attacker.SpeciesName))
                 {
-                    if (attacker.AIController is EnemyAIController enemyAI)
+                    if (attacker.IsHusk)
+                    {
+                        ChangeTargetState("husk", canAttack ? AIState.Attack : AIState.Escape, 100);
+                    }
+                    else if (attacker.AIController is EnemyAIController enemyAI)
                     {
                         if (enemyAI.CombatStrength > CombatStrength)
                         {
                             if (!AIParams.HasTag("stronger"))
                             {
-                                ChangeTargetState(attacker, AIState.Escape, 100);
+                                ChangeTargetState(attacker, canAttack ? AIState.Attack : AIState.Escape, 100);
                             }
                         }
                         else if (enemyAI.CombatStrength < CombatStrength)
@@ -1305,7 +1306,14 @@ namespace Barotrauma
                     }
                     else
                     {
-                        ChangeTargetState(attacker, AIState.Escape, 100);
+                        ChangeTargetState(attacker, canAttack ? AIState.Attack : AIState.Escape, 100);
+                    }
+                }
+                else if (canAttack && attacker.IsHuman && AIParams.TryGetTarget(attacker.SpeciesName, out CharacterParams.TargetParams targetingParams))
+                {
+                    if (targetingParams.State == AIState.Aggressive)
+                    {
+                        ChangeTargetState(attacker, AIState.Attack, 100);
                     }
                 }
             }
@@ -1502,7 +1510,7 @@ namespace Barotrauma
                 if (aiTarget.Type == AITarget.TargetType.HumanOnly) { continue; }
                 if (!TargetOutposts)
                 {
-                    if (aiTarget.Entity.Submarine != null && aiTarget.Entity.Submarine.IsOutpost) { continue; }
+                    if (aiTarget.Entity.Submarine != null && aiTarget.Entity.Submarine.Info.IsOutpost) { continue; }
                 }
                 Character targetCharacter = aiTarget.Entity as Character;
                 //ignore the aitarget if it is the Character itself
@@ -1512,29 +1520,6 @@ namespace Barotrauma
                 string targetingTag = null;
                 if (targetCharacter != null)
                 {
-                    if (targetCharacter.Submarine != Character.Submarine)
-                    {
-                        // In a different sub or the target is outside when we are inside or vice versa.
-                        if (State == AIState.Avoid && State == AIState.Escape & State == AIState.Flee)
-                        {
-                            // If we are escaping, let's not ignore the target entirely, because there can be a gaps where we or they can go freely
-                            if (targetCharacter.Submarine != null)
-                            {
-                                // Target is inside -> reduce the priority
-                                valueModifier *= 0.5f;
-                                if (Character.Submarine != null)
-                                {
-                                    // Both inside different submarines -> can ignore safely
-                                    continue;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            // Don't attack targets that are not in the same submarine
-                            continue;
-                        }
-                    }
                     if (targetCharacter.IsDead)
                     {
                         targetingTag = "dead";
@@ -1550,38 +1535,47 @@ namespace Barotrauma
                             // Ignore targets that are in the same group (treat them like they were of the same species)
                             continue;
                         }
-                        if (enemy.CombatStrength > CombatStrength)
+                        if (targetCharacter.IsHusk && AIParams.HasTag("husk"))
                         {
-                            targetingTag = "stronger";
+                            targetingTag = "husk";
                         }
-                        else if (enemy.CombatStrength < CombatStrength)
+                        else
                         {
-                            targetingTag = "weaker";
-                        }
-                        if (targetingTag == "stronger" && (State == AIState.Avoid || State == AIState.Escape || State == AIState.Flee))
-                        {
-                            if (SelectedAiTarget == aiTarget)
+                            if (enemy.CombatStrength > CombatStrength)
                             {
-                                // Freightened -> hold on to the target
-                                valueModifier *= 2;
+                                targetingTag = "stronger";
                             }
-                            if (IsBeingChasedBy(targetCharacter))
+                            else if (enemy.CombatStrength < CombatStrength)
                             {
-                                valueModifier *= 2;
+                                targetingTag = "weaker";
                             }
-                            if (Character.CurrentHull != null && !VisibleHulls.Contains(targetCharacter.CurrentHull))
+                            if (targetingTag == "stronger" && (State == AIState.Avoid || State == AIState.Escape || State == AIState.Flee))
                             {
-                                // Inside but in a different room
-                                valueModifier /= 2;
+                                if (SelectedAiTarget == aiTarget)
+                                {
+                                    // Freightened -> hold on to the target
+                                    valueModifier *= 2;
+                                }
+                                if (IsBeingChasedBy(targetCharacter))
+                                {
+                                    valueModifier *= 2;
+                                }
+                                if (Character.CurrentHull != null && !VisibleHulls.Contains(targetCharacter.CurrentHull))
+                                {
+                                    // Inside but in a different room
+                                    valueModifier /= 2;
+                                }
                             }
                         }
                     }
                 }
                 else if (aiTarget.Entity != null)
                 {
+                    // Ignore all structures and items inside wrecks
+                    if (aiTarget.Entity.Submarine != null && aiTarget.Entity.Submarine.Info.IsWreck) { continue; }
                     // Ignore the target if it's a room and the character is already inside a sub
                     if (character.CurrentHull != null && aiTarget.Entity is Hull) { continue; }
-                    
+
                     Door door = null;
                     if (aiTarget.Entity is Item item)
                     {
@@ -1619,15 +1613,13 @@ namespace Barotrauma
                         {
                             continue;
                         }
-                        if (character.CurrentHull != null)
+                        bool isCharacterOutside = s.Submarine == null || character.CurrentHull == null;
+                        bool targetInnerWalls = AIParams.TargetInnerWalls;
+                        if (!isCharacterOutside && !targetInnerWalls)
                         {
                             // Ignore walls when inside (walltargets still work)
                             continue;
                         }
-                        if (s.Submarine == null)
-                        {
-                            continue;
-                        }
                         valueModifier = 1;
                         if (!Character.AnimController.CanEnterSubmarine && IsWallDisabled(s))
                         {
@@ -1640,30 +1632,37 @@ namespace Barotrauma
                             bool leadsInside = !section.gap.IsRoomToRoom && section.gap.FlowTargetHull != null;
                             if (Character.AnimController.CanEnterSubmarine)
                             {
-                                if (CanPassThroughHole(s, i))
+                                if (isCharacterOutside)
                                 {
-                                    valueModifier *= leadsInside ? (AggressiveBoarding ? 5 : 1) : 0;
+                                    if (CanPassThroughHole(s, i))
+                                    {
+                                        valueModifier *= leadsInside ? (AggressiveBoarding ? 5 : 1) : (targetInnerWalls ? 1 : 0);
+                                    }
+                                    else
+                                    {
+                                        // Ignore holes that cannot be passed through if cannot attack items/structures. Holes that are big enough should be targeted, so that we can get in
+                                        if (!canAttackSub)
+                                        {
+                                            continue;
+                                        }
+                                        if (AggressiveBoarding && leadsInside)
+                                        {
+                                            // Up to 100% priority increase for every gap in the wall when an aggressive boarder is outside
+                                            valueModifier *= 1 + section.gap.Open;
+                                        }
+                                    }
                                 }
-                                else
+                                else if (!canAttackSub || CanPassThroughHole(s, i))
                                 {
-                                    // Ignore holes that cannot be passed through if cannot attack items/structures. Holes that are big enough should be targeted, so that we can get in
-                                    if (!canAttackSub)
-                                    {
-                                        valueModifier = 0;
-                                        break;
-                                    }
-                                    if (AggressiveBoarding)
-                                    {
-                                        // Up to 100% priority increase for every gap in the wall
-                                        valueModifier *= 1 + section.gap.Open;
-                                    }
+                                    // Already inside -> ignore holes in the walls and ignore walls if cannot attack the sub.
+                                    continue;
                                 }
                             }
-                            else if (!leadsInside)
+                            else if (!leadsInside || !canAttackSub)
                             {
-                                // Ignore inner walls
-                                valueModifier = 0;
-                                break;
+                                // Can't get in, ignore inner walls
+                                // Also ignore all walls if cannot attack the sub
+                                continue;
                             }
                         }
                     }
@@ -1746,6 +1745,53 @@ namespace Barotrauma
 
                 if (valueModifier > targetValue)
                 {
+                    // Don't target items that we own. 
+                    // This is a rare case, and almost entirely related to Humanhusks, so let's check it last to reduce unnecessary checks (although the check shouldn't be expensive)
+                    if (aiTarget.Entity is Item i && i.IsOwnedBy(character)) { continue; }
+                    if (targetCharacter != null)
+                    {
+                        if (targetCharacter.Submarine != Character.Submarine)
+                        {
+                            if (targetCharacter.Submarine != null)
+                            {
+                                // Target is inside -> reduce the priority
+                                valueModifier *= 0.5f;
+                                if (Character.Submarine != null)
+                                {
+                                    // Both inside different submarines -> can ignore safely
+                                    continue;
+                                }
+                            }
+                            else if (Character.CurrentHull != null)
+                            {
+                                // Target outside, but we are inside -> Check if we can get to the target.
+                                // Only check if we are not already targeting the character.
+                                // If we are, keep the target (unless we choose another).
+                                if (SelectedAiTarget?.Entity != targetCharacter)
+                                {
+                                    foreach (var gap in Character.CurrentHull.ConnectedGaps)
+                                    {
+                                        var door = gap.ConnectedDoor;
+                                        if (door == null || !door.IsOpen)
+                                        {
+                                            var wall = gap.ConnectedWall;
+                                            if (wall != null)
+                                            {
+                                                for (int j = 0; j < wall.Sections.Length; j++)
+                                                {
+                                                    WallSection section = wall.Sections[j];
+                                                    if (!CanPassThroughHole(wall, j) && section?.gap != null)
+                                                    {
+                                                        continue;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                     newTarget = aiTarget;
                     selectedTargetMemory = targetMemory;
                     targetValue = valueModifier;
@@ -1867,6 +1913,39 @@ namespace Barotrauma
         private readonly Dictionary<string, CharacterParams.TargetParams> modifiedParams = new Dictionary<string, CharacterParams.TargetParams>();
         private readonly Dictionary<string, CharacterParams.TargetParams> tempParams = new Dictionary<string, CharacterParams.TargetParams>();
 
+        private void ChangeParams(string tag, AIState state, float? priority = null, bool onlyExisting = false)
+        {
+            if (!AIParams.TryGetTarget(tag, out CharacterParams.TargetParams targetParams))
+            {
+                if (!onlyExisting && !tempParams.ContainsKey(tag))
+                {
+                    if (AIParams.TryAddNewTarget(tag, state, priority ?? 100, out targetParams))
+                    {
+                        tempParams.Add(tag, targetParams);
+                    }
+                }
+            }
+            if (targetParams != null)
+            {
+                if (priority.HasValue)
+                {
+                    targetParams.Priority = priority.Value;
+                }
+                targetParams.State = state;
+                if (!modifiedParams.ContainsKey(tag))
+                {
+                    modifiedParams.Add(tag, targetParams);
+                }
+            }
+        }
+
+        private void ChangeTargetState(string tag, AIState state, float? priority = null)
+        {
+            isStateChanged = true;
+            SetStateResetTimer();
+            ChangeParams(tag, state, priority);
+        }
+
         /// <summary>
         /// Temporarily changes the predefined state for a target. Eg. Idle -> Attack.
         /// </summary>
@@ -1874,50 +1953,27 @@ namespace Barotrauma
         {
             isStateChanged = true;
             SetStateResetTimer();
-            ChangeParams(target.SpeciesName);
-            // Target also items, because if we are blind and the target doesn't move, we can only perceive the target when it uses items
-            if (state == AIState.Attack || state == AIState.Escape)
+            ChangeParams(target.SpeciesName, state, priority);
+            if (target.IsHuman)
             {
-                ChangeParams("weapon");
-                ChangeParams("tool");
-            }
-            if (state == AIState.Attack)
-            {
-                // If the target is shooting from the submarine, we might not perceive it because it doesn't move.
-                // --> Target the submarine too.
-                if (target.Submarine != null && canAttackSub)
+                // Target also items, because if we are blind and the target doesn't move, we can only perceive the target when it uses items
+                if (state == AIState.Attack || state == AIState.Escape)
                 {
-                    ChangeParams("room");
-                    ChangeParams("wall");
-                    ChangeParams("door");
+                    ChangeParams("weapon", state, priority);
+                    ChangeParams("tool", state, priority);
                 }
-                ChangeParams("provocative", onlyExisting: true);
-                ChangeParams("light", onlyExisting: true);
-            }
-
-            void ChangeParams(string tag, bool onlyExisting = false)
-            {
-                if (!AIParams.TryGetTarget(tag, out CharacterParams.TargetParams targetParams))
+                if (state == AIState.Attack)
                 {
-                    if (!onlyExisting && !tempParams.ContainsKey(tag))
+                    // If the target is shooting from the submarine, we might not perceive it because it doesn't move.
+                    // --> Target the submarine too.
+                    if (target.Submarine != null && canAttackSub)
                     {
-                        if (AIParams.TryAddNewTarget(tag, state, priority ?? 100, out targetParams))
-                        {
-                            tempParams.Add(tag, targetParams);
-                        }
-                    }
-                }
-                if (targetParams != null)
-                {
-                    if (priority.HasValue)
-                    {
-                        targetParams.Priority = priority.Value;
-                    }
-                    targetParams.State = state;
-                    if (!modifiedParams.ContainsKey(tag))
-                    {
-                        modifiedParams.Add(tag, targetParams);
+                        ChangeParams("room", state, priority);
+                        ChangeParams("wall", state, priority);
+                        ChangeParams("door", state, priority);
                     }
+                    ChangeParams("provocative", state, priority, onlyExisting: true);
+                    ChangeParams("light", state, priority, onlyExisting: true);
                 }
             }
         }

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

@@ -74,7 +74,7 @@ namespace Barotrauma
 
         public override void Update(float deltaTime)
         {
-            if (DisableCrewAI || Character.IsUnconscious || Character.Removed) { return; }
+            if (DisableCrewAI || Character.IsIncapacitated || Character.Removed) { return; }
             base.Update(deltaTime);
 
             if (unreachableClearTimer > 0)
@@ -139,7 +139,10 @@ namespace Barotrauma
                 }
                 if (Character.SpeechImpediment < 100.0f)
                 {
-                    ReportProblems();
+                    if (Character.Submarine != null && Character.Submarine.TeamID == Character.TeamID && !Character.Submarine.Info.IsWreck)
+                    {
+                        ReportProblems();
+                    }
                     UpdateSpeaking();
                 }
                 UnequipUnnecessaryItems();
@@ -170,12 +173,7 @@ namespace Barotrauma
                     }
                 }
             }
-            if (run)
-            {
-                run = !AnimController.Crouching && !AnimController.IsMovingBackwards;
-            }
-            float currentSpeed = Character.AnimController.GetCurrentSpeed(run);
-            steeringManager.Update(currentSpeed);
+            steeringManager.Update(Character.AnimController.GetCurrentSpeed(run && Character.CanRun));
 
             bool ignorePlatforms = Character.AnimController.TargetMovement.Y < -0.5f &&
                 (-Character.AnimController.TargetMovement.Y > Math.Abs(Character.AnimController.TargetMovement.X));
@@ -209,17 +207,6 @@ namespace Barotrauma
                 targetMovement = new Vector2(Character.AnimController.TargetMovement.X, MathHelper.Clamp(Character.AnimController.TargetMovement.Y, -1.0f, 1.0f));
             }
 
-            float maxSpeed = Character.ApplyTemporarySpeedLimits(currentSpeed);
-            targetMovement.X = MathHelper.Clamp(targetMovement.X, -maxSpeed, maxSpeed);
-            targetMovement.Y = MathHelper.Clamp(targetMovement.Y, -maxSpeed, maxSpeed);
-
-            //apply speed multiplier if 
-            //  a. it's boosting the movement speed and the character is trying to move fast (= running)
-            //  b. it's a debuff that decreases movement speed
-            float speedMultiplier = Character.SpeedMultiplier;
-            if (run || speedMultiplier <= 0.0f) targetMovement *= speedMultiplier;
-            Character.ResetSpeedMultiplier();   // Reset, items will set the value before the next update
-
             if (Character.AnimController.InWater && targetMovement.LengthSquared() < 0.000001f)
             {
                 bool isAiming = false;
@@ -243,7 +230,7 @@ namespace Barotrauma
                 }
             }
 
-            Character.AnimController.TargetMovement = targetMovement;
+            Character.AnimController.TargetMovement = Character.ApplyMovementLimits(targetMovement, AnimController.GetCurrentSpeed(run));
 
             flipTimer -= deltaTime;
             if (flipTimer <= 0.0f)
@@ -323,7 +310,7 @@ namespace Barotrauma
                         || ObjectiveManager.IsCurrentObjective<AIObjectiveFindSafety>() 
                         || ObjectiveManager.CurrentObjective.GetSubObjectivesRecursive(true).Any(o => o.KeepDivingGearOn);
                     bool removeDivingSuit = !Character.AnimController.HeadInWater && oxygenLow;
-                    AIObjectiveGoTo gotoObjective = ObjectiveManager.CurrentOrder as AIObjectiveGoTo;
+                    AIObjectiveGoTo gotoObjective = ObjectiveManager.GetActiveObjective<AIObjectiveGoTo>();
                     if (!removeDivingSuit)
                     {
                         bool targetHasNoSuit = gotoObjective != null && gotoObjective.mimic && !HasDivingSuit(gotoObjective.Target as Character);
@@ -536,14 +523,16 @@ namespace Barotrauma
             Hull targetHull = null;
             if (Character.CurrentHull != null)
             {
+                bool isFighting = ObjectiveManager.HasActiveObjective<AIObjectiveCombat>();
+                bool isFleeing = ObjectiveManager.HasActiveObjective<AIObjectiveFindSafety>();
                 foreach (var hull in VisibleHulls)
                 {
-                    foreach (Character c in Character.CharacterList)
+                    foreach (Character target in Character.CharacterList)
                     {
-                        if (c.CurrentHull != hull || !c.Enabled) { continue; }
-                        if (AIObjectiveFightIntruders.IsValidTarget(c, Character))
+                        if (target.CurrentHull != hull || !target.Enabled) { continue; }
+                        if (AIObjectiveFightIntruders.IsValidTarget(target, Character))
                         {
-                            if (AddTargets<AIObjectiveFightIntruders, Character>(Character, c) && newOrder == null)
+                            if (AddTargets<AIObjectiveFightIntruders, Character>(Character, target) && newOrder == null)
                             {
                                 var orderPrefab = Order.GetPrefab("reportintruders");
                                 newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
@@ -560,42 +549,48 @@ namespace Barotrauma
                             targetHull = hull;
                         }
                     }
-                    foreach (Character c in Character.CharacterList)
+                    if (!isFighting)
                     {
-                        if (c.CurrentHull != hull) { continue; }
-                        if (AIObjectiveRescueAll.IsValidTarget(c, Character))
+                        foreach (var gap in hull.ConnectedGaps)
                         {
-                            if (AddTargets<AIObjectiveRescueAll, Character>(c, Character) && newOrder == null && !ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
+                            if (AIObjectiveFixLeaks.IsValidTarget(gap, Character))
                             {
-                                var orderPrefab = Order.GetPrefab("requestfirstaid");
-                                newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
-                                targetHull = hull;
+                                if (AddTargets<AIObjectiveFixLeaks, Gap>(Character, gap) && newOrder == null && !gap.IsRoomToRoom)
+                                {
+                                    var orderPrefab = Order.GetPrefab("reportbreach");
+                                    newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
+                                    targetHull = hull;
+                                }
                             }
                         }
-                    }
-                    foreach (var gap in hull.ConnectedGaps)
-                    {
-                        if (AIObjectiveFixLeaks.IsValidTarget(gap, Character))
+                        if (!isFleeing)
                         {
-                            if (AddTargets<AIObjectiveFixLeaks, Gap>(Character, gap) && newOrder == null && !gap.IsRoomToRoom)
+                            foreach (Character target in Character.CharacterList)
                             {
-                                var orderPrefab = Order.GetPrefab("reportbreach");
-                                newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
-                                targetHull = hull;
+                                if (target.CurrentHull != hull) { continue; }
+                                if (AIObjectiveRescueAll.IsValidTarget(target, Character))
+                                {
+                                    if (AddTargets<AIObjectiveRescueAll, Character>(Character, target) && newOrder == null && !ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
+                                    {
+                                        var orderPrefab = Order.GetPrefab("requestfirstaid");
+                                        newOrder = new Order(orderPrefab, hull, null, orderGiver: Character);
+                                        targetHull = hull;
+                                    }
+                                }
                             }
-                        }
-                    }
-                    foreach (Item item in Item.ItemList)
-                    {
-                        if (item.CurrentHull != hull) { continue; }
-                        if (AIObjectiveRepairItems.IsValidTarget(item, Character))
-                        {
-                            if (item.Repairables.All(r => item.ConditionPercentage > r.AIRepairThreshold)) { continue; }
-                            if (AddTargets<AIObjectiveRepairItems, Item>(Character, item) && newOrder == null && !ObjectiveManager.HasActiveObjective<AIObjectiveRepairItem>())
+                            foreach (Item item in Item.ItemList)
                             {
-                                var orderPrefab = Order.GetPrefab("reportbrokendevices");
-                                newOrder = new Order(orderPrefab, hull, item.Repairables?.FirstOrDefault(), orderGiver: Character);
-                                targetHull = hull;
+                                if (item.CurrentHull != hull) { continue; }
+                                if (AIObjectiveRepairItems.IsValidTarget(item, Character))
+                                {
+                                    if (item.Repairables.All(r => item.ConditionPercentage > r.AIRepairThreshold)) { continue; }
+                                    if (AddTargets<AIObjectiveRepairItems, Item>(Character, item) && newOrder == null && !ObjectiveManager.HasActiveObjective<AIObjectiveRepairItem>())
+                                    {
+                                        var orderPrefab = Order.GetPrefab("reportbrokendevices");
+                                        newOrder = new Order(orderPrefab, hull, item.Repairables?.FirstOrDefault(), orderGiver: Character);
+                                        targetHull = hull;
+                                    }
+                                }
                             }
                         }
                     }
@@ -650,7 +645,7 @@ namespace Barotrauma
                     // Should not cancel any existing ai objectives (so that if the character attacked you and then helped, we still would want to retaliate).
                     return;
                 }
-                if (!attacker.IsRemotePlayer && Character.Controlled != attacker && attacker.AIController != null && attacker.AIController.Enabled)
+                if (!attacker.IsPlayer && attacker.AIController != null && attacker.AIController.Enabled)
                 {
                     // Don't retaliate on damage done by friendly ai, because we know that it's accidental
                     AddCombatObjective(AIObjectiveCombat.CombatMode.Retreat, Rand.Range(0.5f, 1f, Rand.RandSync.Unsynced));
@@ -664,9 +659,8 @@ namespace Barotrauma
                     }
                     else
                     {
-                        float currentVitality = Character.CharacterHealth.Vitality;
-                        float dmgPercentage = damage / currentVitality * 100;
-                        if (dmgPercentage < currentVitality / 10)
+                        float dmgPercentage = MathUtils.Percentage(damage, Character.CharacterHealth.Vitality);
+                        if (dmgPercentage < 10)
                         {
                             // Don't retaliate on minor (accidental) dmg done by characters that are in the same team
                             AddCombatObjective(AIObjectiveCombat.CombatMode.Retreat, Rand.Range(0.5f, 1f, Rand.RandSync.Unsynced));
@@ -711,7 +705,6 @@ namespace Barotrauma
 
         public void SetOrder(Order order, string option, Character orderGiver, bool speak = true)
         {
-            SetOrderProjSpecific(order, option);
             CurrentOrderOption = option;
             CurrentOrder = order;
             objectiveManager.SetOrder(order, option, orderGiver);
@@ -752,8 +745,6 @@ namespace Barotrauma
             }
         }
 
-        partial void SetOrderProjSpecific(Order order, string option);
-
         public override void SelectTarget(AITarget target)
         {
             SelectedAiTarget = target;
@@ -806,11 +797,11 @@ namespace Barotrauma
         /// </summary>
         public static bool HasDivingMask(Character character, float conditionPercentage = 0) => HasItem(character, "divingmask", "oxygensource", conditionPercentage);
 
-        public static bool HasItem(Character character, string identifier, string containedTag, float conditionPercentage = 0)
+        public static bool HasItem(Character character, string tagOrIdentifier, string containedTag = null, float conditionPercentage = 0)
         {
             if (character == null) { return false; }
             if (character.Inventory == null) { return false; }
-            var item = character.Inventory.FindItemByIdentifier(identifier) ?? character.Inventory.FindItemByTag(identifier);
+            var item = character.Inventory.FindItemByIdentifier(tagOrIdentifier) ?? character.Inventory.FindItemByTag(tagOrIdentifier);
             return item != null &&
                 item.ConditionPercentage > conditionPercentage &&
                 character.HasEquippedItem(item) &&
@@ -934,7 +925,7 @@ namespace Barotrauma
                 visibleHulls = VisibleHulls;
             }
             // TODO: should we calculate the visible hulls for each hull? -> could be a bit heavy.
-            bool ignoreFire = ObjectiveManager.IsCurrentObjective<AIObjectiveExtinguishFires>() || objectiveManager.HasActiveObjective<AIObjectiveExtinguishFire>();
+            bool ignoreFire = objectiveManager.HasActiveObjective<AIObjectiveExtinguishFire>();
             bool ignoreWater = HasDivingSuit(character);
             bool ignoreOxygen = ignoreWater || HasDivingMask(character);
             bool ignoreEnemies = ObjectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>();
@@ -1022,15 +1013,23 @@ namespace Barotrauma
             return false;
         }
 
-        public static int CountCrew(Character character, Func<HumanAIController, bool> predicate = null)
+        public static int CountCrew(Character character, Func<HumanAIController, bool> predicate = null, bool onlyActive = true, bool onlyBots = false)
         {
             if (character == null) { return 0; }
             int count = 0;
-            foreach (var c in Character.CharacterList)
+            foreach (var other in Character.CharacterList)
             {
-                if (FilterCrewMember(character, c))
+                if (onlyActive && !IsActive(other))
                 {
-                    if (predicate == null || predicate(c.AIController as HumanAIController))
+                    continue;
+                }
+                if (onlyBots && other.IsPlayer)
+                {
+                    continue;
+                }
+                if (FilterCrewMember(character, other))
+                {
+                    if (predicate == null || predicate(other.AIController as HumanAIController))
                     {
                         count++;
                     }
@@ -1053,12 +1052,61 @@ namespace Barotrauma
 
         private static bool FilterCrewMember(Character self, Character other) => other != null && !other.IsDead && !other.Removed && other.AIController is HumanAIController humanAi && humanAi.IsFriendly(self);
 
+        public static bool IsItemOperatedByAnother(Character character, ItemComponent target, out Character operatingCharacter)
+        {
+            operatingCharacter = null;
+            foreach (var c in Character.CharacterList)
+            {
+                if (character != null)
+                {
+                    if (c == character) { continue; }
+                    if (!IsFriendly(character, c)) { continue; }
+                }
+                if (c.SelectedConstruction != target.Item) { continue; }
+                operatingCharacter = c;
+                // If the other character is player, don't try to operate
+                if (c.IsRemotePlayer || Character.Controlled == c) { return true; }
+                if (c.AIController is HumanAIController controllingHumanAi)
+                {
+                    // If the other character is ordered to operate the item, let him do it
+                    if (controllingHumanAi.ObjectiveManager.IsCurrentOrder<AIObjectiveOperateItem>())
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        if (character == null)
+                        {
+                            return true;
+                        }
+                        else if (target is Steering)
+                        {
+                            // Steering is hard-coded -> cannot use the required skills collection defined in the xml
+                            return character.GetSkillLevel("helm") <= c.GetSkillLevel("helm");
+                        }
+                        else
+                        {
+                            return target.DegreeOfSuccess(character) <= target.DegreeOfSuccess(c);
+                        }
+                    }
+                }
+                else
+                {
+                    // Shouldn't go here, unless we allow non-humans to operate items
+                    return false;
+                }
+
+            }
+            return false;
+        }
+
         #region Wrappers
         public bool IsFriendly(Character other) => IsFriendly(Character, other);
         public void DoForEachCrewMember(Action<HumanAIController> action) => DoForEachCrewMember(Character, action);
         public bool IsTrueForAnyCrewMember(Func<HumanAIController, bool> predicate) => IsTrueForAnyCrewMember(Character, predicate);
         public bool IsTrueForAllCrewMembers(Func<HumanAIController, bool> predicate) => IsTrueForAllCrewMembers(Character, predicate);
-        public int CountCrew(Func<HumanAIController, bool> predicate = null) => CountCrew(Character, predicate);
+        public int CountCrew(Func<HumanAIController, bool> predicate = null, bool onlyActive = true, bool onlyBots = false) => CountCrew(Character, predicate, onlyActive, onlyBots);
+        public bool IsItemOperatedByAnother(ItemComponent target, out Character operatingCharacter) => IsItemOperatedByAnother(Character, target, out operatingCharacter);
         #endregion
     }
 }

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

@@ -134,7 +134,7 @@ namespace Barotrauma
 
         private Vector2 CalculateSteeringSeek(Vector2 target, float weight, Func<PathNode, bool> startNodeFilter = null, Func<PathNode, bool> endNodeFilter = null, Func<PathNode, bool> nodeFilter = null)
         {
-            bool needsNewPath = character.Params.PathFinderPriority > 0.5f && (currentPath == null || currentPath.Unreachable || currentPath.NextNode == null || Vector2.DistanceSquared(target, currentTarget) > 1);
+            bool needsNewPath = character.Params.PathFinderPriority > 0.5f && (currentPath == null || currentPath.Unreachable || currentPath.Finished || Vector2.DistanceSquared(target, currentTarget) > 1);
             //find a new path if one hasn't been found yet or the target is different from the current target
             if (needsNewPath || findPathTimer < -1.0f)
             {
@@ -308,7 +308,7 @@ namespace Barotrauma
                     currentPath.SkipToNextNode();
                 }
             }
-            else
+            else if (!IsNextLadderSameAsCurrent)
             {
                 Vector2 colliderBottom = character.AnimController.GetColliderBottom();
                 Vector2 colliderSize = collider.GetSize();
@@ -530,7 +530,6 @@ namespace Barotrauma
             if (node.Waypoint != null && node.Waypoint.CurrentHull != null)
             {
                 var hull = node.Waypoint.CurrentHull;
-
                 if (hull.FireSources.Count > 0)
                 {
                     foreach (FireSource fs in hull.FireSources)
@@ -538,9 +537,14 @@ namespace Barotrauma
                         penalty += fs.Size.X * 10.0f;
                     }
                 }
-
-                if (character.NeedsAir && hull.WaterVolume / hull.Rect.Width > 100.0f) penalty += 500.0f;
-                if (character.PressureProtection < 10.0f && hull.WaterVolume > hull.Volume) penalty += 1000.0f;
+                if (character.NeedsAir && hull.WaterVolume / hull.Rect.Width > 100.0f)
+                {
+                    penalty += 500.0f;
+                }
+                if (character.PressureProtection < 10.0f && hull.WaterVolume > hull.Volume)
+                {
+                    penalty += 1000.0f;
+                }
             }
 
             return penalty;

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

@@ -253,7 +253,7 @@ namespace Barotrauma
 
             jointDir = attachLimb.Dir;
 
-            Vector2 transformedLocalAttachPos = localAttachPos * attachLimb.character.AnimController.RagdollParams.LimbScale;
+            Vector2 transformedLocalAttachPos = localAttachPos * attachLimb.Scale * attachLimb.Params.Ragdoll.LimbScale;
             if (jointDir < 0.0f) transformedLocalAttachPos.X = -transformedLocalAttachPos.X;
 
             //transformedLocalAttachPos = Vector2.Transform(transformedLocalAttachPos, Matrix.CreateRotationZ(attachLimb.Rotation));

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

@@ -136,9 +136,10 @@ namespace Barotrauma
             string allowedJobsStr = element.GetAttributeString("allowedjobs", "");
             foreach (string allowedJobIdentifier in allowedJobsStr.Split(','))
             {
-                if (JobPrefab.Prefabs.ContainsKey(allowedJobIdentifier.ToLowerInvariant()))
+                string key = allowedJobIdentifier.ToLowerInvariant();
+                if (JobPrefab.Prefabs.ContainsKey(key))
                 {
-                    AllowedJobs.Add(JobPrefab.Prefabs[allowedJobIdentifier.ToLowerInvariant()]);
+                    AllowedJobs.Add(JobPrefab.Prefabs[key]);
                 }
             }
 

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

@@ -32,6 +32,18 @@ namespace Barotrauma
         public virtual bool UnequipItems => false;
 
         protected readonly List<AIObjective> subObjectives = new List<AIObjective>();
+        private float _cumulatedDevotion;
+        protected float CumulatedDevotion
+        {
+            get { return _cumulatedDevotion; }
+            set { _cumulatedDevotion = MathHelper.Clamp(value, 0, MaxDevotion); }
+        }
+
+        protected virtual float MaxDevotion => 10;
+
+        /// <summary>
+        /// Final priority value after all calculations.
+        /// </summary>
         public float Priority { get; set; }
         public float PriorityModifier { get; private set; } = 1;
         public readonly Character character;
@@ -59,6 +71,7 @@ namespace Barotrauma
         /// </summary>
         public virtual bool IsLoop { get; set; }
         public IEnumerable<AIObjective> SubObjectives => subObjectives;
+        public AIObjective CurrentSubObjective => subObjectives.FirstOrDefault();
 
         private readonly List<AIObjective> all = new List<AIObjective>();
         public IEnumerable<AIObjective> GetSubObjectivesRecursive(bool includingSelf = false)
@@ -86,7 +99,7 @@ namespace Barotrauma
 
         public AIObjective GetActiveObjective()
         {
-            var subObjective = SubObjectives.FirstOrDefault();
+            var subObjective = CurrentSubObjective;
             return subObjective == null ? this : subObjective.GetActiveObjective();
         }
 
@@ -157,7 +170,8 @@ namespace Barotrauma
         {
             if (!AllowSubObjectiveSorting) { return; }
             if (subObjectives.None()) { return; }
-            subObjectives.Sort((x, y) => y.GetPriority().CompareTo(x.GetPriority()));
+            subObjectives.ForEach(so => so.GetPriority());
+            subObjectives.Sort((x, y) => y.Priority.CompareTo(x.Priority));
             if (ConcurrentObjectives)
             {
                 subObjectives.ForEach(so => so.SortSubObjectives());
@@ -168,7 +182,23 @@ namespace Barotrauma
             }
         }
 
-        public virtual float GetPriority() => Priority * PriorityModifier;
+        /// <summary>
+        /// Call this only when the priority needs to be recalculated. Use the cached Priority property when you don't need to recalculate.
+        /// </summary>
+        public virtual float GetPriority()
+        {
+            Priority = CumulatedDevotion * PriorityModifier;
+            return Priority;
+        }
+
+        private void UpdateDevotion(float deltaTime)
+        {
+            var currentObjective = objectiveManager.CurrentObjective;
+            if (currentObjective != null && (currentObjective == this || currentObjective.subObjectives.Any(so => so == this)))
+            {
+                CumulatedDevotion += Devotion * PriorityModifier * deltaTime;
+            }
+        }
 
         public virtual bool IsDuplicate<T>(T otherObjective) where T : AIObjective => otherObjective.Option == Option;
 
@@ -180,14 +210,7 @@ namespace Barotrauma
             }
             else if (objectiveManager.WaitTimer <= 0)
             {
-                if (objectiveManager.CurrentObjective != null)
-                {
-                    if (objectiveManager.CurrentObjective == this || objectiveManager.CurrentObjective.subObjectives.Any(so => so == this))
-                    {
-                        Priority += Devotion * PriorityModifier * deltaTime;
-                    }
-                }
-                Priority = MathHelper.Clamp(Priority, 0, 100);
+                UpdateDevotion(deltaTime);
             }
             subObjectives.ForEach(so => so.Update(deltaTime));
         }
@@ -264,6 +287,7 @@ namespace Barotrauma
 
         public virtual void OnDeselected()
         {
+            CumulatedDevotion = 0;
             Deselected?.Invoke();
         }
 
@@ -282,6 +306,7 @@ namespace Barotrauma
             isCompleted = false;
             hasBeenChecked = false;
             _abandon = false;
+            CumulatedDevotion = 0;
         }
 
         protected abstract void Act(float deltaTime);

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

@@ -100,7 +100,11 @@ namespace Barotrauma
             }
         }
 
-        public override float GetPriority() => (Enemy != null && (Enemy.Removed || Enemy.IsDead)) ? 0 : Math.Min(100 * PriorityModifier, 100);
+        public override float GetPriority()
+        {
+            Priority = (Enemy != null && (Enemy.Removed || Enemy.IsDead)) ? 0 : Math.Min(100 * PriorityModifier, 100);
+            return Priority;
+        }
 
         public override void Update(float deltaTime)
         {
@@ -139,18 +143,18 @@ namespace Barotrauma
             }
             if (seekAmmunition == null)
             {
-                if (TryArm() && Enemy != null && !Enemy.Removed)
+                if (Mode != CombatMode.Retreat && TryArm() && Enemy != null && !Enemy.Removed)
                 {
                     OperateWeapon(deltaTime);
                 }
                 if (!HoldPosition && seekAmmunition == null)
                 {
-                    Move();
+                    Move(deltaTime);
                 }
             }
         }
 
-        private void Move()
+        private void Move(float deltaTime)
         {
             switch (Mode)
             {
@@ -159,7 +163,7 @@ namespace Barotrauma
                     break;
                 case CombatMode.Defensive:
                 case CombatMode.Retreat:
-                    Retreat();
+                    Retreat(deltaTime);
                     break;
                 default:
                     throw new NotImplementedException();
@@ -407,7 +411,10 @@ namespace Barotrauma
             return true;
         }
 
-        private void Retreat()
+        private float findHullTimer;
+        private readonly float findHullInterval = 1.0f;
+
+        private void Retreat(float deltaTime)
         {
             RemoveSubObjective(ref followTargetObjective);
             RemoveSubObjective(ref seekAmmunition);
@@ -417,7 +424,15 @@ namespace Barotrauma
             }
             if (retreatTarget == null || (retreatObjective != null && !retreatObjective.CanBeCompleted))
             {
-                retreatTarget = findSafety.FindBestHull(HumanAIController.VisibleHulls);
+                if (findHullTimer > 0)
+                {
+                    findHullTimer -= deltaTime;
+                }
+                else
+                {
+                    retreatTarget = findSafety.FindBestHull(HumanAIController.VisibleHulls);
+                    findHullTimer = findHullInterval * Rand.Range(0.9f, 1.1f);
+                }
             }
             if (retreatTarget != null && character.CurrentHull != retreatTarget)
             {

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

@@ -74,15 +74,6 @@ namespace Barotrauma
             }
         }
 
-        public override float GetPriority()
-        {
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority;
-            }
-            return 1.0f;
-        }
-
         private bool CheckItem(Item i) => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id)) && i.ConditionPercentage > ConditionLevel;
 
         protected override void Act(float deltaTime)

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

@@ -54,15 +54,6 @@ namespace Barotrauma
 
         protected override bool Check() => IsCompleted;
 
-        public override float GetPriority()
-        {
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority;
-            }
-            return 1.0f;
-        }
-
         protected override void Act(float deltaTime)
         {
             Item itemToDecontain = targetItem ?? sourceContainer.Inventory.FindItem(i => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id)), recursive: false);

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

@@ -1,5 +1,4 @@
 using Barotrauma.Items.Components;
-using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Linq;
@@ -29,32 +28,44 @@ namespace Barotrauma
         public override float GetPriority()
         {
             if (!objectiveManager.IsCurrentOrder<AIObjectiveExtinguishFires>() 
-                && Character.CharacterList.Any(c => c.CurrentHull == targetHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return 0; }
-            float yDist = Math.Abs(character.WorldPosition.Y - 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));
-            if (targetHull == character.CurrentHull)
+                && Character.CharacterList.Any(c => c.CurrentHull == targetHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
             {
-                distanceFactor = 1;
+                Priority = 0;
             }
-            float severity = AIObjectiveExtinguishFires.GetFireSeverity(targetHull);
-            float severityFactor = MathHelper.Lerp(0, 1, severity / 100);
-            float devotion = Math.Min(Priority, 10) / 100;
-            return MathHelper.Lerp(0, 100, MathHelper.Clamp(devotion + severityFactor * distanceFactor, 0, 1));
+            else
+            {
+                float yDist = Math.Abs(character.WorldPosition.Y - 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));
+                if (targetHull == character.CurrentHull)
+                {
+                    distanceFactor = 1;
+                }
+                float severity = AIObjectiveExtinguishFires.GetFireSeverity(targetHull);
+                float severityFactor = MathHelper.Lerp(0, 1, severity / 100);
+                float devotion = CumulatedDevotion / 100;
+                Priority = MathHelper.Lerp(0, 100, MathHelper.Clamp(devotion + (severityFactor * distanceFactor * PriorityModifier), 0, 1));
+            }
+            return Priority;
         }
 
         protected override bool Check() => targetHull.FireSources.None();
 
+        private float sinTime;
         protected override void Act(float deltaTime)
         {
-            var extinguisherItem = character.Inventory.FindItemByIdentifier("extinguisher") ?? character.Inventory.FindItemByTag("extinguisher");
+            var extinguisherItem = character.Inventory.FindItemByIdentifier("fireextinguisher") ?? character.Inventory.FindItemByTag("fireextinguisher");
             if (extinguisherItem == null || extinguisherItem.Condition <= 0.0f || !character.HasEquippedItem(extinguisherItem))
             {
                 TryAddSubObjective(ref getExtinguisherObjective, () =>
                 {
                     character.Speak(TextManager.Get("DialogFindExtinguisher"), null, 2.0f, "findextinguisher", 30.0f);
-                    return new AIObjectiveGetItem(character, "extinguisher", objectiveManager, equip: true);
+                    return new AIObjectiveGetItem(character, "fireextinguisher", objectiveManager, equip: true)
+                    {
+                        // If the item is inside an unsafe hull, decrease the priority
+                        GetItemPriority = i => HumanAIController.UnsafeHulls.Contains(i.CurrentHull) ? 0.1f : 1
+                    };
                 });
             }
             else
@@ -79,8 +90,12 @@ namespace Barotrauma
                         {
                             useExtinquisherTimer = 0.0f;
                         }
+                        // Aim
                         character.CursorPosition = fs.Position;
-                        if (extinguisher.Item.RequireAimToUse)
+                        Vector2 fromCharacterToFireSource = fs.WorldPosition - character.WorldPosition;
+                        float dist = fromCharacterToFireSource.Length();
+                        character.CursorPosition += VectorExtensions.Forward(extinguisherItem.body.TransformedRotation + (float)Math.Sin(sinTime) / 2, dist / 2);
+                        if (extinguisherItem.RequireAimToUse)
                         {
                             bool isOperatingButtons = false;
                             if (SteeringManager == PathSteering)
@@ -95,8 +110,9 @@ namespace Barotrauma
                             {
                                 character.SetInput(InputType.Aim, false, true);
                             }
+                            sinTime += deltaTime * 10;
                         }
-                        character.SetInput(extinguisher.Item.IsShootable ? InputType.Shoot : InputType.Use, false, true);
+                        character.SetInput(extinguisherItem.IsShootable ? InputType.Shoot : InputType.Use, false, true);
                         extinguisher.Use(deltaTime, character);
                         if (!targetHull.FireSources.Contains(fs))
                         {
@@ -110,7 +126,7 @@ namespace Barotrauma
                     if (move)
                     {
                         //go to the first firesource
-                        TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(fs, character, objectiveManager)
+                        TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(fs, character, objectiveManager, closeEnough: extinguisher.Range / 2)
                         {
                             DialogueIdentifier = "dialogcannotreachfire",
                             TargetName = fs.Hull.DisplayName

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

@@ -9,7 +9,6 @@ namespace Barotrauma
     {
         public override string DebugTag => "extinguish fires";
         public override bool ForceRun => true;
-        public override bool IgnoreUnsafeHulls => true;
 
         public AIObjectiveExtinguishFires(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) { }
 

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

@@ -9,7 +9,6 @@ namespace Barotrauma
         public override string DebugTag => $"find diving gear ({gearTag})";
         public override bool ForceRun => true;
         public override bool KeepDivingGearOn => true;
-        public override bool IgnoreUnsafeHulls => true;
 
         private readonly string gearTag;
         private readonly string fallbackTag;

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

@@ -33,6 +33,8 @@ namespace Barotrauma
 
         private bool resetPriority;
 
+        public override float GetPriority() => Priority;
+
         public override void Update(float deltaTime)
         {
             if (resetPriority)
@@ -252,7 +254,7 @@ namespace Barotrauma
                 else
                 {
                     // Outside
-                    if (hull.RoomName != null && hull.RoomName.ToLowerInvariant().Contains("airlock"))
+                    if (hull.RoomName != null && hull.RoomName.Contains("airlock", StringComparison.OrdinalIgnoreCase))
                     {
                         hullSafety = 100;
                     }

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

@@ -29,16 +29,23 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
-            if (Leak.Removed || Leak.Open <= 0) { return 0; }
-            float xDist = Math.Abs(character.WorldPosition.X - Leak.WorldPosition.X);
-            float yDist = Math.Abs(character.WorldPosition.Y - Leak.WorldPosition.Y);
-            // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally).
-            // If the target is close, ignore the distance factor alltogether so that we keep fixing the leaks that are nearby.
-            float distanceFactor = xDist < 200 && yDist < 100 ? 1 : MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, xDist + yDist * 3.0f));
-            float severity = AIObjectiveFixLeaks.GetLeakSeverity(Leak) / 100;
-            float max = Math.Min((AIObjectiveManager.OrderPriority - 1), 90);
-            float devotion = Math.Min(Priority, 10) / 100;
-            return MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + severity * distanceFactor * PriorityModifier, 0, 1));
+            if (Leak.Removed || Leak.Open <= 0)
+            {
+                Priority = 0;
+            }
+            else
+            {
+                float xDist = Math.Abs(character.WorldPosition.X - Leak.WorldPosition.X);
+                float yDist = Math.Abs(character.WorldPosition.Y - Leak.WorldPosition.Y);
+                // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally).
+                // If the target is close, ignore the distance factor alltogether so that we keep fixing the leaks that are nearby.
+                float distanceFactor = xDist < 200 && yDist < 100 ? 1 : MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, xDist + yDist * 3.0f));
+                float severity = AIObjectiveFixLeaks.GetLeakSeverity(Leak) / 100;
+                float max = Math.Min((AIObjectiveManager.OrderPriority - 1), 90);
+                float devotion = CumulatedDevotion / 100;
+                Priority = MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + (severity * distanceFactor * PriorityModifier), 0, 1));
+            }
+            return Priority;
         }
 
         protected override void Act(float deltaTime)

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

@@ -11,7 +11,6 @@ namespace Barotrauma
         public override string DebugTag => "fix leaks";
         public override bool ForceRun => true;
         public override bool KeepDivingGearOn => true;
-        public override bool IgnoreUnsafeHulls => true;
 
         public AIObjectiveFixLeaks(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) : base(character, objectiveManager, priorityModifier) { }
 
@@ -36,7 +35,7 @@ namespace Barotrauma
 
         protected override float TargetEvaluation()
         {
-            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveFixLeaks>());
+            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveFixLeaks>(), onlyBots: true);
             int totalLeaks = Targets.Count();
             if (totalLeaks == 0) { return 0; }
             int secondaryLeaks = Targets.Count(l => l.IsRoomToRoom);
@@ -44,13 +43,13 @@ namespace Barotrauma
             bool anyFixers = otherFixers > 0;
             if (objectiveManager.CurrentOrder == this)
             {
-                float ratio = anyFixers ? totalLeaks / otherFixers : 1;
+                float ratio = anyFixers ? totalLeaks / (float)otherFixers : 1;
                 return Targets.Sum(t => GetLeakSeverity(t)) * ratio;
             }
             else
             {
                 float ratio = leaks == 0 ? 1 : anyFixers ? leaks / otherFixers : 1;
-                if (anyFixers && (ratio <= 1 || otherFixers > 5 || otherFixers / HumanAIController.CountCrew() > 0.75f))
+                if (anyFixers && (ratio <= 1 || otherFixers > 5 || otherFixers / (float)HumanAIController.CountCrew(onlyBots: true) > 0.75f))
                 {
                     // Enough fixers
                     return 0;

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

@@ -31,15 +31,6 @@ namespace Barotrauma
 
         public bool AllowToFindDivingGear { get; set; } = true;
 
-        public override float GetPriority()
-        {
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority;
-            }
-            return 1.0f;
-        }
-
         public AIObjectiveGetItem(Character character, Item targetItem, AIObjectiveManager objectiveManager, bool equip = true, float priorityModifier = 1) 
             : base(character, objectiveManager, priorityModifier)
         {

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

@@ -51,14 +51,19 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
-            if (followControlledCharacter && Character.Controlled == null) { return 0.0f; }
-            if (Target is Entity e && e.Removed) { return 0.0f; }
-            if (IgnoreIfTargetDead && Target is Character character && character.IsDead) { return 0.0f; }                     
-            if (objectiveManager.CurrentOrder == this)
+            if (followControlledCharacter && Character.Controlled == null)
             {
-                return AIObjectiveManager.OrderPriority;
+                Priority = 0;
             }
-            return 1.0f;
+            if (Target is Entity e && e.Removed)
+            {
+                Priority = 0;
+            }
+            if (IgnoreIfTargetDead && Target is Character character && character.IsDead)
+            {
+                Priority = 0;
+            }
+            return objectiveManager.CurrentOrder == this ? AIObjectiveManager.OrderPriority : Priority;
         }
 
         public AIObjectiveGoTo(ISpatialEntity target, Character character, AIObjectiveManager objectiveManager, bool repeat = false, bool getDivingGearIfNeeded = true, float priorityModifier = 1, float closeEnough = 0) 

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

@@ -45,20 +45,17 @@ namespace Barotrauma
         private float randomUpdateInterval = 5;
         public float Random { get; private set; }
 
-        public void SetRandom()
+        public void CalculatePriority()
         {
             Random = Rand.Range(0.5f, 1.5f);
             randomTimer = randomUpdateInterval;
-        }
-
-        public override float GetPriority()
-        {
             float max = Math.Min(Math.Min(AIObjectiveManager.RunPriority, AIObjectiveManager.OrderPriority) - 1, 100);
             float initiative = character.GetSkillLevel("initiative");
             Priority = MathHelper.Lerp(1, max, MathUtils.InverseLerp(100, 0, initiative * Random));
-            return Priority;
         }
 
+        public override float GetPriority() => Priority;
+
         public override void Update(float deltaTime)
         {
             if (objectiveManager.CurrentObjective == this)
@@ -69,7 +66,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    SetRandom();
+                    CalculatePriority();
                 }
             }
         }
@@ -182,7 +179,7 @@ namespace Barotrauma
             if (!character.IsClimbing)
             {
                 if (SteeringManager != PathSteering || (PathSteering.CurrentPath != null &&
-                    (PathSteering.CurrentPath.NextNode == null || PathSteering.CurrentPath.Unreachable || PathSteering.CurrentPath.HasOutdoorsNodes)))
+                    (PathSteering.CurrentPath.Finished || PathSteering.CurrentPath.Unreachable || PathSteering.CurrentPath.HasOutdoorsNodes)))
                 {
                     Wander(deltaTime);
                     return;
@@ -264,9 +261,9 @@ namespace Barotrauma
         public static bool IsForbidden(Hull hull)
         {
             if (hull == null) { return true; }
-            string hullName = hull.RoomName?.ToLowerInvariant();
+            string hullName = hull.RoomName;
             if (hullName == null) { return false; }
-            return hullName.Contains("ballast") || hullName.Contains("airlock");
+            return hullName.Contains("ballast", StringComparison.OrdinalIgnoreCase) || hullName.Contains("airlock", StringComparison.OrdinalIgnoreCase);
         }
     }
 }

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

@@ -45,6 +45,7 @@ namespace Barotrauma
         public override bool CanBeCompleted => true;
         public override bool AbandonWhenCannotCompleteSubjectives => false;
         public override bool AllowSubObjectiveSorting => true;
+        public virtual bool InverseTargetEvaluation => false;
 
         public override bool IsLoop { get => true; set => throw new System.Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); }
 
@@ -107,21 +108,46 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
-            if (character.LockHands) { return 0; }
-            if (character.Submarine == null) { return 0; }
-            if (Targets.None()) { return 0; }
-            // Allow the target value to be more than 100.
-            float targetValue = TargetEvaluation();
-            // If the target value is less than 1% of the max value, let's just treat it as zero.
-            if (targetValue < 1) { return 0; }
-            if (objectiveManager.CurrentOrder == this)
+            if (character.LockHands || character.Submarine == null || Targets.None())
             {
-                return AIObjectiveManager.OrderPriority;
+                Priority = 0;
             }
-            float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
-            float devotion = MathHelper.Min(10, Priority);
-            float value = MathHelper.Clamp((devotion + targetValue * PriorityModifier) / 100, 0, 1);
-            return MathHelper.Lerp(0, max, value);
+            else
+            {
+                // Allow the target value to be more than 100.
+                float targetValue = TargetEvaluation();
+                if (InverseTargetEvaluation)
+                {
+                    targetValue = 100 - targetValue;
+                }
+                var currentSubObjective = CurrentSubObjective;
+                if (currentSubObjective != null && currentSubObjective.Priority > targetValue)
+                {
+                    // If the priority is higher than the target value, let's just use it.
+                    // The priority calculation is more precise, but it takes into account things like distances,
+                    // so it's better not to use it if it's lower than the rougher targetValue.
+                    targetValue = Priority;
+                }
+                // If the target value is less than 1% of the max value, let's just treat it as zero.
+                if (targetValue < 1)
+                {
+                    Priority = 0;
+                }
+                else
+                {
+                    if (objectiveManager.CurrentOrder == this)
+                    {
+                        Priority = AIObjectiveManager.OrderPriority;
+                    }
+                    else
+                    {
+                        float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
+                        float value = MathHelper.Clamp((CumulatedDevotion + (targetValue * PriorityModifier)) / 100, 0, 1);
+                        Priority = MathHelper.Lerp(0, max, value);
+                    }
+                }
+            }
+            return Priority;
         }
 
         protected void UpdateTargets()

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

@@ -41,6 +41,15 @@ namespace Barotrauma
         public bool IsActiveObjective<T>() where T : AIObjective => GetActiveObjective() is T;
 
         public AIObjective GetActiveObjective() => CurrentObjective?.GetActiveObjective();
+        /// <summary>
+        /// Returns the last active objective of the specific type.
+        /// </summary>
+        public T GetActiveObjective<T>() where T : AIObjective => CurrentObjective?.GetSubObjectivesRecursive(includingSelf: true).LastOrDefault(so => so is T) as T;
+
+        /// <summary>
+        /// Returns all active objectives of the specific type. Creates a new collection -> don't use too frequently.
+        /// </summary>
+        public IEnumerable<T> GetActiveObjectives<T>() where T : AIObjective => CurrentObjective?.GetSubObjectivesRecursive(includingSelf: true).Where(so => so is T).Select(so => so as T);
 
         public bool HasActiveObjective<T>() where T : AIObjective => CurrentObjective is T || CurrentObjective != null && CurrentObjective.GetSubObjectivesRecursive().Any(so => so is T);
 
@@ -146,7 +155,7 @@ namespace Barotrauma
         {
             var previousObjective = CurrentObjective;
             var firstObjective = Objectives.FirstOrDefault();
-            if (CurrentOrder != null && firstObjective != null && CurrentOrder.GetPriority() > firstObjective.GetPriority())
+            if (CurrentOrder != null && firstObjective != null && CurrentOrder.Priority > firstObjective.Priority)
             {
                 CurrentObjective = CurrentOrder;
             }
@@ -158,14 +167,14 @@ namespace Barotrauma
             {
                 previousObjective?.OnDeselected();
                 CurrentObjective?.OnSelected();
-                GetObjective<AIObjectiveIdle>().SetRandom();
+                GetObjective<AIObjectiveIdle>().CalculatePriority();
             }
             return CurrentObjective;
         }
 
         public float GetCurrentPriority()
         {
-            return CurrentObjective == null ? 0.0f : CurrentObjective.GetPriority();
+            return CurrentObjective == null ? 0.0f : CurrentObjective.Priority;
         }
 
         public void UpdateObjectives(float deltaTime)
@@ -205,7 +214,8 @@ namespace Barotrauma
         {
             if (Objectives.Any())
             {
-                Objectives.Sort((x, y) => y.GetPriority().CompareTo(x.GetPriority()));
+                Objectives.ForEach(o => o.GetPriority());
+                Objectives.Sort((x, y) => y.Priority.CompareTo(x.Priority));
             }
             GetCurrentObjective()?.SortSubObjectives();
         }
@@ -297,7 +307,7 @@ namespace Barotrauma
                     {
                         IsLoop = true,
                         // Don't override unless it's an order by a player
-                        Override = orderGiver != null && (orderGiver == Character.Controlled || orderGiver.IsRemotePlayer)
+                        Override = orderGiver != null && orderGiver.IsPlayer
                     };
                     break;
                 default:
@@ -306,7 +316,7 @@ namespace Barotrauma
                     {
                         IsLoop = true,
                         // Don't override unless it's an order by a player
-                        Override = orderGiver != null && (orderGiver == Character.Controlled || orderGiver.IsRemotePlayer)
+                        Override = orderGiver != null && orderGiver.IsPlayer
                     };
                     break;
             }

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

@@ -3,6 +3,7 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -31,19 +32,33 @@ namespace Barotrauma
 
         public override float GetPriority()
         {
-            if (component.Item.ConditionPercentage <= 0) { return 0; }
-            if (objectiveManager.CurrentOrder == this)
+            if (component.Item.ConditionPercentage <= 0)
             {
-                return AIObjectiveManager.OrderPriority;
+                Priority = 0;
             }
-            if (component.Item.CurrentHull == null) { return 0; }
-            if (component.Item.CurrentHull.FireSources.Count > 0) { return 0; }
-            if (IsOperatedByAnother(GetTarget())) { return 0; }
-            if (Character.CharacterList.Any(c => c.CurrentHull == component.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return 0; }
-            float devotion = MathHelper.Min(10, Priority);
-            float value = devotion + AIObjectiveManager.OrderPriority * PriorityModifier;
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1), 90);
-            return MathHelper.Clamp(value, 0, max);
+            else
+            {
+                if (objectiveManager.CurrentOrder == this)
+                {
+                    Priority = AIObjectiveManager.OrderPriority;
+                }
+
+                if (component.Item.CurrentHull == null || component.Item.CurrentHull.FireSources.Any() || HumanAIController.IsItemOperatedByAnother(GetTarget(), out _))
+                {
+                    Priority = 0;
+                }
+                else if (Character.CharacterList.Any(c => c.CurrentHull == component.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
+                {
+                    Priority = 0;
+                }
+                else
+                {
+                    float value = CumulatedDevotion + (AIObjectiveManager.OrderPriority * PriorityModifier);
+                    float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1), 90);
+                    Priority = MathHelper.Clamp(value, 0, max);
+                }
+            }
+            return Priority;
         }
 
         public AIObjectiveOperateItem(ItemComponent item, Character character, AIObjectiveManager objectiveManager, string option, bool requireEquip, Entity operateTarget = null, bool useController = false, float priorityModifier = 1) 
@@ -62,45 +77,6 @@ namespace Barotrauma
             }
         }
 
-        private bool IsOperatedByAnother(ItemComponent target)
-        {
-            foreach (var c in Character.CharacterList)
-            {
-                if (c == character) { continue; }
-                if (!HumanAIController.IsFriendly(c)) { continue; }
-                if (c.SelectedConstruction != target.Item) { continue; }
-                // If the other character is player, don't try to operate
-                if (c.IsRemotePlayer || Character.Controlled == c) { return true; }
-                if (c.AIController is HumanAIController humanAi)
-                {
-                    // If the other character is ordered to operate the item, let him do it
-                    if (humanAi.ObjectiveManager.IsCurrentOrder<AIObjectiveOperateItem>())
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        if (target is Steering)
-                        {
-                            // Steering is hard-coded -> cannot use the required skills collection defined in the xml
-                            return character.GetSkillLevel("helm") <= c.GetSkillLevel("helm");
-                        }
-                        else
-                        {
-                            return target.DegreeOfSuccess(character) <= target.DegreeOfSuccess(c);
-                        }
-                    }
-                }
-                else
-                {
-                    // Shouldn't go here, unless we allow non-humans to operate items
-                    return false;
-                }
-
-            }
-            return false;
-        }
-
         protected override void Act(float deltaTime)
         {
             if (character.LockHands)
@@ -116,7 +92,7 @@ namespace Barotrauma
                 return;
             }
             // Don't allow to operate an item that someone with a better skills already operates, unless this is an order
-            if (objectiveManager.CurrentOrder != this && IsOperatedByAnother(target))
+            if (objectiveManager.CurrentOrder != this && HumanAIController.IsItemOperatedByAnother(target, out _))
             {
                 // Don't abandon
                 return;

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

@@ -12,7 +12,6 @@ namespace Barotrauma
         public override string DebugTag => "pump water";
         public override bool KeepDivingGearOn => true;
         public override bool UnequipItems => true;
-        public override bool IgnoreUnsafeHulls => true;
 
         private IEnumerable<Pump> pumpList;
 

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

@@ -30,21 +30,28 @@ namespace Barotrauma
         {
             // TODO: priority list?
             // Ignore items that are being repaired by someone else.
-            if (Item.Repairables.Any(r => r.CurrentFixer != null && r.CurrentFixer != character)) { return 0; }
-            float yDist = Math.Abs(character.WorldPosition.Y - Item.WorldPosition.Y);
-            yDist = yDist > 100 ? yDist * 5 : 0;
-            float dist = Math.Abs(character.WorldPosition.X - Item.WorldPosition.X) + yDist;
-            float distanceFactor = MathHelper.Lerp(1, 0.25f, MathUtils.InverseLerp(0, 5000, dist));
-            if (Item.CurrentHull == character.CurrentHull)
+            if (Item.Repairables.Any(r => r.CurrentFixer != null && r.CurrentFixer != character))
             {
-                distanceFactor = 1;
+                Priority = 0;
             }
-            float damagePriority = MathHelper.Lerp(1, 0, Item.Condition / Item.MaxCondition);
-            float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
-            float isSelected = IsRepairing ? 50 : 0;
-            float devotion = (Math.Min(Priority, 10) + isSelected) / 100;
-            float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
-            return MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + damagePriority * distanceFactor * successFactor * PriorityModifier, 0, 1));
+            else
+            {
+                float yDist = Math.Abs(character.WorldPosition.Y - Item.WorldPosition.Y);
+                yDist = yDist > 100 ? yDist * 5 : 0;
+                float dist = Math.Abs(character.WorldPosition.X - Item.WorldPosition.X) + yDist;
+                float distanceFactor = MathHelper.Lerp(1, 0.25f, MathUtils.InverseLerp(0, 5000, dist));
+                if (Item.CurrentHull == character.CurrentHull)
+                {
+                    distanceFactor = 1;
+                }
+                float damagePriority = MathHelper.Lerp(1, 0, Item.Condition / Item.MaxCondition);
+                float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
+                float isSelected = IsRepairing ? 50 : 0;
+                float devotion = (CumulatedDevotion + isSelected) / 100;
+                float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
+                Priority = MathHelper.Lerp(0, max, MathHelper.Clamp(devotion + (damagePriority * distanceFactor * successFactor * PriorityModifier), 0, 1));
+            }
+            return Priority;
         }
 
         protected override bool Check()
@@ -158,7 +165,7 @@ namespace Barotrauma
                         }
                         repairable.StopRepairing(character);
                     }
-                    else
+                    else if (repairable.CurrentFixer != character)
                     {
                         repairable.StartRepairing(character, Repairable.FixActions.Repair);
                     }

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

@@ -81,18 +81,17 @@ namespace Barotrauma
                 // Don't stop fixing until done
                 return 100;
             }
-            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRepairItems>());
+            int otherFixers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRepairItems>(), onlyBots: true);
             int items = Targets.Count;
             bool anyFixers = otherFixers > 0;
-            float ratio = anyFixers ? items / otherFixers : 1;
-            var result = ratio;
+            float ratio = anyFixers ? items / (float)otherFixers : 1;
             if (objectiveManager.CurrentOrder == this)
             {
                 return Targets.Sum(t => 100 - t.ConditionPercentage) * ratio;
             }
             else
             {
-                if (anyFixers && (ratio <= 1 || otherFixers > 5 || otherFixers / HumanAIController.CountCrew() > 0.75f))
+                if (anyFixers && (ratio <= 1 || otherFixers > 5 || otherFixers / (float)HumanAIController.CountCrew(onlyBots: true) > 0.75f))
                 {
                     // Enough fixers
                     return 0;

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

@@ -14,7 +14,7 @@ namespace Barotrauma
 
         const float TreatmentDelay = 0.5f;
 
-        const float CloseEnoughToTreat = 150.0f;
+        const float CloseEnoughToTreat = 100.0f;
 
         private readonly Character targetCharacter;
 
@@ -22,6 +22,8 @@ namespace Barotrauma
         private AIObjectiveGetItem getItemObjective;
         private float treatmentTimer;
         private Hull safeHull;
+        private float findHullTimer;
+        private readonly float findHullInterval = 1.0f;
 
         public AIObjectiveRescue(Character character, Character targetCharacter, AIObjectiveManager objectiveManager, float priorityModifier = 1) 
             : base(character, objectiveManager, priorityModifier)
@@ -44,11 +46,20 @@ namespace Barotrauma
                 Abandon = true;
                 return;
             }
+            if (targetCharacter.SelectedBy != null && targetCharacter.SelectedBy != character)
+            {
+                var otherCharacter = character.SelectedBy;
+                if (otherCharacter != null)
+                {
+                    // Someone else is rescuing/holding the target.
+                    Abandon = otherCharacter.IsPlayer || character.GetSkillLevel("medical") < otherCharacter.GetSkillLevel("medical");
+                }
+            }
 
             if (targetCharacter != character)
             {
-                // Unconcious target is not in a safe place -> Move to a safe place first
-                if (targetCharacter.IsUnconscious && HumanAIController.GetHullSafety(targetCharacter.CurrentHull, targetCharacter) < HumanAIController.HULL_SAFETY_THRESHOLD)
+                // Incapacitated target is not in a safe place -> Move to a safe place first
+                if (targetCharacter.IsIncapacitated && HumanAIController.GetHullSafety(targetCharacter.CurrentHull, targetCharacter) < HumanAIController.HULL_SAFETY_THRESHOLD)
                 {
                     if (character.SelectedCharacter != targetCharacter)
                     {
@@ -67,7 +78,11 @@ namespace Barotrauma
                                 TargetName = targetCharacter.DisplayName
                             },
                                 onCompleted: () => RemoveSubObjective(ref goToObjective),
-                                onAbandon: () => RemoveSubObjective(ref goToObjective));
+                                onAbandon: () =>
+                                {
+                                    RemoveSubObjective(ref goToObjective);
+                                    Abandon = true;
+                                });
                         }
                         else
                         {
@@ -79,14 +94,26 @@ namespace Barotrauma
                         // Drag the character into safety
                         if (safeHull == null)
                         {
-                            safeHull = objectiveManager.GetObjective<AIObjectiveFindSafety>().FindBestHull(HumanAIController.VisibleHulls);
+                            if (findHullTimer > 0)
+                            {
+                                findHullTimer -= deltaTime;
+                            }
+                            else
+                            {
+                                safeHull = objectiveManager.GetObjective<AIObjectiveFindSafety>().FindBestHull(HumanAIController.VisibleHulls);
+                                findHullTimer = findHullInterval * Rand.Range(0.9f, 1.1f);
+                            }
                         }
-                        if (character.CurrentHull != safeHull)
+                        if (safeHull != null && character.CurrentHull != safeHull)
                         {
                             RemoveSubObjective(ref goToObjective);
                             TryAddSubObjective(ref goToObjective, () => new AIObjectiveGoTo(safeHull, character, objectiveManager),
                                 onCompleted: () => RemoveSubObjective(ref goToObjective),
-                                onAbandon: () => RemoveSubObjective(ref goToObjective));
+                                onAbandon: () =>
+                                {
+                                    RemoveSubObjective(ref goToObjective);
+                                    safeHull = character.CurrentHull;
+                                });
                         }
                     }
                 }
@@ -105,7 +132,11 @@ namespace Barotrauma
                     TargetName = targetCharacter.DisplayName
                 },
                     onCompleted: () => RemoveSubObjective(ref goToObjective),
-                    onAbandon: () => RemoveSubObjective(ref goToObjective));
+                    onAbandon: () =>
+                    {
+                        RemoveSubObjective(ref goToObjective);
+                        Abandon = true;
+                    });
             }
             else
             {
@@ -127,6 +158,11 @@ namespace Barotrauma
         private Dictionary<string, float> currentTreatmentSuitabilities = new Dictionary<string, float>();
         private void GiveTreatment(float deltaTime)
         {
+            if (!targetCharacter.IsPlayer)
+            {
+                // If the target is a bot, don't let it move
+                targetCharacter.AIController?.SteeringManager.Reset();
+            }
             if (treatmentTimer > 0.0f)
             {
                 treatmentTimer -= deltaTime;
@@ -137,9 +173,8 @@ namespace Barotrauma
             //find which treatments are the most suitable to treat the character's current condition
             targetCharacter.CharacterHealth.GetSuitableTreatments(currentTreatmentSuitabilities, normalize: false);
 
-            var allAfflictions = GetVitalityReducingAfflictions(targetCharacter).OrderByDescending(a => a.GetVitalityDecrease(targetCharacter.CharacterHealth));
             //check if we already have a suitable treatment for any of the afflictions
-            foreach (Affliction affliction in allAfflictions)
+            foreach (Affliction affliction in GetSortedAfflictions(targetCharacter))
             {
                 foreach (KeyValuePair<string, float> treatmentSuitability in affliction.Prefab.TreatmentSuitability)
                 {
@@ -200,10 +235,12 @@ namespace Barotrauma
                         onAbandon: () => RemoveSubObjective(ref getItemObjective));
                 }
             }
-            character.AnimController.Anim = AnimController.Animation.CPR;
+            if (character != targetCharacter)
+            {
+                character.AnimController.Anim = AnimController.Animation.CPR;
+            }
         }
 
-
         private void ApplyTreatment(Affliction affliction, Item item)
         {
             var targetLimb = targetCharacter.CharacterHealth.GetAfflictionLimb(affliction);
@@ -240,7 +277,7 @@ namespace Barotrauma
                 Abandon = true;
                 return false;
             }
-            bool isCompleted = AIObjectiveRescueAll.GetVitalityFactor(targetCharacter) > AIObjectiveRescueAll.GetVitalityThreshold(objectiveManager);
+            bool isCompleted = AIObjectiveRescueAll.GetVitalityFactor(targetCharacter) >= AIObjectiveRescueAll.GetVitalityThreshold(objectiveManager, character, targetCharacter);
             if (isCompleted && targetCharacter != character)
             {                
                 character.Speak(TextManager.GetWithVariable("DialogTargetHealed", "[targetname]", targetCharacter.Name),
@@ -253,20 +290,24 @@ namespace Barotrauma
         {
             if (targetCharacter == null || targetCharacter.CurrentHull == null || targetCharacter.Removed || targetCharacter.IsDead)
             {
-                return 0;
+                Priority = 0;
             }
-            // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally)
-            float dist = Math.Abs(character.WorldPosition.X - targetCharacter.WorldPosition.X) + Math.Abs(character.WorldPosition.Y - targetCharacter.WorldPosition.Y) * 2.0f;
-            float distanceFactor = MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, dist));
-            if (targetCharacter.CurrentHull == character.CurrentHull)
+            else
             {
-                distanceFactor = 1;
+                // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally)
+                float dist = Math.Abs(character.WorldPosition.X - targetCharacter.WorldPosition.X) + Math.Abs(character.WorldPosition.Y - targetCharacter.WorldPosition.Y) * 2.0f;
+                float distanceFactor = MathHelper.Lerp(1, 0.1f, MathUtils.InverseLerp(0, 5000, dist));
+                if (targetCharacter.CurrentHull == character.CurrentHull)
+                {
+                    distanceFactor = 1;
+                }
+                float vitalityFactor = 1 - AIObjectiveRescueAll.GetVitalityFactor(targetCharacter) / 100;
+                float devotion = CumulatedDevotion / 100;
+                Priority = MathHelper.Lerp(0, 100, MathHelper.Clamp(devotion + (vitalityFactor * distanceFactor * PriorityModifier), 0, 1));
             }
-            float vitalityFactor = AIObjectiveRescueAll.GetVitalityFactor(targetCharacter);
-            float devotion = Math.Min(Priority, 10) / 100;
-            return MathHelper.Lerp(0, 100, MathHelper.Clamp(devotion + vitalityFactor * distanceFactor, 0, 1));
+            return Priority;
         }
 
-        public static IEnumerable<Affliction> GetVitalityReducingAfflictions(Character character) => character.CharacterHealth.GetAllAfflictions(a => a.GetVitalityDecrease(character.CharacterHealth) > 0);
+        public static IEnumerable<Affliction> GetSortedAfflictions(Character character) => CharacterHealth.SortAfflictionsBySeverity(character.CharacterHealth.GetAllAfflictions());
     }
 }

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

@@ -8,11 +8,11 @@ namespace Barotrauma
     {
         public override string DebugTag => "rescue all";
         public override bool ForceRun => true;
-        public override bool IgnoreUnsafeHulls => true;
+        public override bool InverseTargetEvaluation => true;
 
         private const float vitalityThreshold = 80;
-        private const float vitalityThresholdForOrders = 95;
-        public static float GetVitalityThreshold(AIObjectiveManager manager)
+        private const float vitalityThresholdForOrders = 100;
+        public static float GetVitalityThreshold(AIObjectiveManager manager, Character character, Character target)
         {
             if (manager == null)
             {
@@ -20,7 +20,7 @@ namespace Barotrauma
             }
             else
             {
-                return manager.CurrentOrder is AIObjectiveRescueAll ? vitalityThresholdForOrders : vitalityThreshold;
+                return character == target || manager.CurrentOrder is AIObjectiveRescueAll ? vitalityThresholdForOrders : vitalityThreshold;
             }
         }
         
@@ -31,9 +31,50 @@ namespace Barotrauma
 
         protected override IEnumerable<Character> GetList() => Character.CharacterList;
 
-        protected override float TargetEvaluation() => Targets.Max(t => GetVitalityFactor(t));
+        protected override float TargetEvaluation()
+        {
+            int otherRescuers = HumanAIController.CountCrew(c => c != HumanAIController && c.ObjectiveManager.IsCurrentObjective<AIObjectiveRescueAll>(), onlyBots: true);
+            int targetCount = Targets.Count;
+            bool anyRescuers = otherRescuers > 0;
+            float ratio = anyRescuers ? targetCount / (float)otherRescuers : 1;
+            if (objectiveManager.CurrentOrder == this)
+            {
+                return Targets.Min(t => GetVitalityFactor(t)) / ratio;
+            }
+            else
+            {
+                float multiplier = 1;
+                if (anyRescuers)
+                {
+                    float mySkill = character.GetSkillLevel("medical");
+                    int betterRescuers = HumanAIController.CountCrew(c => c != HumanAIController && c.Character.Info.Job.GetSkillLevel("medical") >= mySkill, onlyBots: true);
+                    if (targetCount / (float)betterRescuers <= 1)
+                    {
+                        // Enough rescuers
+                        return 100;
+                    }
+                    else
+                    {
+                        bool foundOtherMedics = HumanAIController.IsTrueForAnyCrewMember(c => c != HumanAIController && c.Character.Info.Job.Prefab.Identifier == "medicaldoctor");
+                        if (foundOtherMedics)
+                        {
+                            if (character.Info.Job.Prefab.Identifier != "medicaldoctor")
+                            {
+                                // Double the vitality factor -> less likely to take action
+                                multiplier = 2;
+                            }
+                        }
+                    }
+                }
+                return Targets.Min(t => GetVitalityFactor(t)) / ratio * multiplier;
+            }
+        }
 
-        public static float GetVitalityFactor(Character character) => Math.Min(character.HealthPercentage - character.Bleeding - character.Bloodloss - Math.Min(character.Oxygen, 0), 100);
+        public static float GetVitalityFactor(Character character)
+        {
+            float vitality = character.HealthPercentage - character.Bleeding - character.Bloodloss + Math.Min(character.Oxygen, 0);
+            return Math.Clamp(vitality, 0, 100);
+        }
 
         protected override AIObjective ObjectiveConstructor(Character target)
             => new AIObjectiveRescue(character, target, objectiveManager, PriorityModifier);
@@ -47,16 +88,34 @@ namespace Barotrauma
             if (!HumanAIController.IsFriendly(character, target)) { return false; }
             if (character.AIController is HumanAIController humanAI)
             {
-                if (GetVitalityFactor(target) > GetVitalityThreshold(humanAI.ObjectiveManager)) { return false; }
+                if (GetVitalityFactor(target) >= GetVitalityThreshold(humanAI.ObjectiveManager, character, target)) { return false; }
+                if (!humanAI.ObjectiveManager.IsCurrentOrder<AIObjectiveRescueAll>())
+                {
+                    // Ignore unsafe hulls, unless ordered
+                    if (humanAI.UnsafeHulls.Contains(target.CurrentHull))
+                    {
+                        return false;
+                    }
+                }
             }
             else
             {
-                if (GetVitalityFactor(target) > vitalityThreshold) { return false; }
+                if (GetVitalityFactor(target) >= vitalityThreshold) { return false; }
             }
             if (target.Submarine == null || character.Submarine == null) { return false; }
             if (target.Submarine.TeamID != character.Submarine.TeamID) { return false; }
             if (target.CurrentHull == null) { return false; }
             if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            if (!target.IsPlayer && HumanAIController.IsActive(target) && target.AIController is HumanAIController targetAI)
+            {
+                // Ignore all concious targets that are currently fighting, fleeing or treating characters
+                if (targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveCombat>() || 
+                    targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveFindSafety>() ||
+                    targetAI.ObjectiveManager.HasActiveObjective<AIObjectiveRescue>())
+                {
+                    return false;
+                }
+            }
             // Don't go into rooms that have enemies
             if (Character.CharacterList.Any(c => c.CurrentHull == target.CurrentHull && !HumanAIController.IsFriendly(character, c) && HumanAIController.IsActive(c))) { return false; }
             return true;

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

@@ -291,7 +291,7 @@ namespace Barotrauma
             }
             for (int i = 0; i < AppropriateJobs.Length; i++)
             {
-                if (character.Info.Job.Prefab.Identifier.ToLowerInvariant() == AppropriateJobs[i].ToLowerInvariant()) { return true; }
+                if (character.Info.Job.Prefab.Identifier.Equals(AppropriateJobs[i], StringComparison.OrdinalIgnoreCase)) { return true; }
             }
             return false;
         }

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

@@ -0,0 +1,272 @@
+using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using Barotrauma.Networking;
+using System.Linq;
+using System;
+
+namespace Barotrauma
+{
+    class WreckAI : IServerSerializable
+    {
+        public Submarine Wreck { get; private set; }
+
+        public bool IsAlive { get; private set; }
+
+        private readonly List<Item> allItems;
+        private readonly List<Item> thalamusItems;
+        private readonly List<Turret> turrets = new List<Turret>();
+        private readonly List<WayPoint> wayPoints = new List<WayPoint>();
+        private readonly List<Hull> hulls = new List<Hull>();
+        private readonly List<Item> spawnOrgans = new List<Item>();
+        private readonly Item brain;
+
+        private bool initialCellsSpawned;
+
+        public readonly WreckAIConfig Config;
+
+        private bool IsClient => GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
+
+        public WreckAI(Submarine wreck, Item brain, List<Item> items = null)
+        {
+            Config = WreckAIConfig.GetRandom();
+            if (Config == null)
+            {
+                DebugConsole.ThrowError("WreckAI: No wreck AI config found!");
+                Kill();
+                return;
+            }
+            allItems = items ?? wreck.GetItems(false);
+            thalamusItems = allItems.FindAll(i => i.Prefab.Category == MapEntityCategory.Thalamus || i.HasTag("thalamus"));
+            foreach (Item item in allItems)
+            {
+                if (thalamusItems.Contains(item))
+                {
+                    // Ensure that thalamus items are visible
+                    item.HiddenInGame = false;
+                }
+                else
+                {
+                    // Load regular turrets
+                    var turret = item.GetComponent<Turret>();
+                    if (turret != null)
+                    {
+                        foreach (var linkedItem in item.GetLinkedEntities<Item>())
+                        {
+                            var container = linkedItem.GetComponent<ItemContainer>();
+                            if (container == null) { continue; }
+                            for (int i = 0; i < container.Inventory.Capacity; i++)
+                            {
+                                if (container.Inventory.Items[i] != null) { continue; }
+                                if (MapEntityPrefab.List.GetRandom(e => e is ItemPrefab i && container.CanBeContained(i) && 
+                                        Config.ForbiddenAmmunition.None(id => id.Equals(i.Identifier, StringComparison.OrdinalIgnoreCase)), Rand.RandSync.Server) is ItemPrefab ammoPrefab)
+                                {
+                                    Item ammo = new Item(ammoPrefab, container.Item.WorldPosition, wreck);
+                                    if (!container.Inventory.TryPutItem(ammo, i, allowSwapping: false, allowCombine: false, user: null, createNetworkEvent: false))
+                                    {
+                                        item.Remove();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            this.brain = brain;
+            Wreck = wreck;
+            foreach (var item in Wreck.GetItems(false))
+            {
+                var turret = item.GetComponent<Turret>();
+                if (turret != null)
+                {
+                    turrets.Add(turret);
+                }
+                if (item.HasTag("cellspawnorgan"))
+                {
+                    if (!spawnOrgans.Contains(item))
+                    {
+                        spawnOrgans.Add(item);
+                    }
+                }
+            }
+            wayPoints.AddRange(Wreck.GetWaypoints(false));
+            hulls.AddRange(Wreck.GetHulls(false));
+            IsAlive = true;
+        }
+
+        private readonly List<Item> destroyedOrgans = new List<Item>();
+        public void Update(float deltaTime)
+        {
+            if (!IsAlive || Wreck == null || Wreck.Removed)
+            {
+                cells.ForEach(c => c.OnDeath -= OnCellDeath);
+                return;
+            }
+            if (brain == null || brain.Removed || brain.Condition <= 0)
+            {
+                Kill();
+            }
+            destroyedOrgans.Clear();
+            foreach (var organ in spawnOrgans)
+            {
+                if (organ.Condition <= 0)
+                {
+                    destroyedOrgans.Add(organ);
+                }
+            }
+            destroyedOrgans.ForEach(o => spawnOrgans.Remove(o));
+
+            bool someoneNearby = false;
+            float minDist = Sonar.DefaultSonarRange * 2.0f;
+            foreach (Submarine submarine in Submarine.Loaded)
+            {
+                if (submarine.Info.Type != SubmarineInfo.SubmarineType.Player) { continue; }
+                if (Vector2.DistanceSquared(submarine.WorldPosition, Wreck.WorldPosition) < minDist * minDist)
+                {
+                    someoneNearby = true;
+                    break;
+                }
+            }
+            foreach (Character c in Character.CharacterList)
+            {
+                if (c != Character.Controlled && !c.IsRemotePlayer) { continue; }
+                if (Vector2.DistanceSquared(c.WorldPosition, Wreck.WorldPosition) < minDist * minDist)
+                {
+                    someoneNearby = true;
+                    break;
+                }
+            }
+            if (!someoneNearby) { return; }
+
+            OperateTurrets(deltaTime);
+            if (!IsClient)
+            {
+                if (!initialCellsSpawned) { SpawnInitialCells(); }
+                UpdateReinforcements(deltaTime);
+            }
+        }
+
+        private void SpawnInitialCells()
+        {
+            int brainRoomCells = Rand.Range(MinCellsPerBrainRoom, MaxCellsPerRoom);
+            if (brain.CurrentHull?.WaterPercentage >= MinWaterLevel)
+            {
+                for (int i = 0; i < brainRoomCells; i++)
+                {
+                    if (!TrySpawnCell(out _, brain.CurrentHull)) { break; }
+                }
+            }
+            int cellsInside = Rand.Range(MinCellsInside, MaxCellsInside);
+            for (int i = 0; i < cellsInside; i++)
+            {
+                if (!TrySpawnCell(out _)) { break; }
+            }
+            int cellsOutside = Rand.Range(MinCellsOutside, MaxCellsOutside);
+            // If we failed to spawn some of the cells in the brainroom/inside, spawn some extra cells outside.
+            cellsOutside = Math.Clamp(cellsOutside + brainRoomCells + cellsInside - cells.Count, cellsOutside, MaxCellsOutside);
+            for (int i = 0; i < cellsOutside; i++)
+            {
+                ISpatialEntity targetEntity = wayPoints.GetRandom(wp => wp.CurrentHull == null);
+                if (targetEntity == null) { break; }
+                if (!TrySpawnCell(out _, targetEntity)) { break; }
+            }
+            initialCellsSpawned = true;
+        }
+
+        public void Kill()
+        {
+            if (!IsClient)
+            {
+                brain.Condition = 0;
+            }
+            IsAlive = false;
+        }
+
+        // The client doesn't use these, so we don't have to sync them.
+        private readonly List<Character> cells = new List<Character>();
+        // Intentionally contains duplicates.
+        private readonly List<Hull> populatedHulls = new List<Hull>();
+        private float cellSpawnTimer;
+
+        private float CellSpawnTime => Config.CellSpawnTime;
+        private float CellSpawnRandomFactor => Config.CellSpawnRandomFactor;
+        private int MinCellsPerBrainRoom => Config.MinCellsPerBrainRoom;
+        private int MaxCellsPerRoom => Config.MaxCellsPerRoom;
+        private int MinCellsOutside => Config.MinCellsOutside;
+        private int MaxCellsOutside => Config.MaxCellsOutside;
+        private int MinCellsInside => Config.MinCellsInside;
+        private int MaxCellsInside => Config.MaxCellsInside;
+        private int MaxCellCount => Config.MaxCellCount;
+        private float MinWaterLevel => Config.MinWaterLevel;
+
+        void UpdateReinforcements(float deltaTime)
+        {
+            if (cells.Count >= MaxCellCount) { return; }
+            cellSpawnTimer -= deltaTime;
+            if (cellSpawnTimer < 0)
+            {
+                TrySpawnCell(out _, spawnOrgans.GetRandom());
+                cellSpawnTimer = CellSpawnTime * Rand.Range(CellSpawnRandomFactor, 1 + CellSpawnRandomFactor);
+            }
+        }
+
+        bool TrySpawnCell(out Character cell, ISpatialEntity targetEntity = null)
+        {
+            cell = null;
+            if (cells.Count >= MaxCellCount) { return false; }
+            if (targetEntity == null)
+            {
+                targetEntity = 
+                    wayPoints.GetRandom(wp => wp.CurrentHull != null && populatedHulls.Count(h => h == wp.CurrentHull) < MaxCellsPerRoom && wp.CurrentHull.WaterPercentage >= MinWaterLevel) ?? 
+                    hulls.GetRandom(h => populatedHulls.Count(h2 => h2 == h) < MaxCellsPerRoom && h.WaterPercentage >= MinWaterLevel) as ISpatialEntity;
+            }
+            if (targetEntity == null) { return false; }
+            if (targetEntity is Hull h)
+            {
+                populatedHulls.Add(h);
+            }
+            else if (targetEntity is WayPoint wp && wp.CurrentHull != null)
+            {
+                populatedHulls.Add(wp.CurrentHull);
+            }
+            // Don't add items in the list, because we want to be able to ignore the restrictions for spawner organs.
+            cell = Character.Create("Leucocyte", targetEntity.WorldPosition, ToolBox.RandomSeed(8), hasAi: true, createNetworkEvent: true);
+            cells.Add(cell);
+            cell.OnDeath += OnCellDeath;
+            cellSpawnTimer = CellSpawnTime * Rand.Range(CellSpawnRandomFactor, 1 + CellSpawnRandomFactor);
+            return true;
+        }
+        
+        void OperateTurrets(float deltaTime)
+        {
+            foreach (var turret in turrets)
+            {
+                // Never target other creatures than humans with the turrets.
+                turret.ThalamusOperate(deltaTime, 
+                    !turret.Item.HasTag("ignorecharacters"), 
+                    targetOtherCreatures: false, 
+                    !turret.Item.HasTag("ignoresubmarines"), 
+                    turret.Item.HasTag("ignoreaimdelay"));
+            }
+        }
+
+        void OnCellDeath(Character character, CauseOfDeath causeOfDeath)
+        {
+            cells.Remove(character);
+        }
+
+#if SERVER
+        public void ServerWrite(IWriteMessage msg, Client client, object[] extraData = null)
+        {
+            msg.Write(IsAlive);
+        }
+#endif
+#if CLIENT
+        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
+        {
+            IsAlive = msg.ReadBoolean();
+        }
+#endif
+    }
+}

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

@@ -0,0 +1,97 @@
+using Barotrauma.Extensions;
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+    class WreckAIConfig : ISerializableEntity
+    {
+        public string Name => "Wreck AI Config";
+
+        public Dictionary<string, SerializableProperty> SerializableProperties { get; private set; }
+
+        [Serialize(60f, false)]
+        public float CellSpawnTime { get; set; }
+
+        [Serialize(0.5f, false)]
+        public float CellSpawnRandomFactor { get; set; }
+
+        [Serialize(0, false)]
+        public int MinCellsPerBrainRoom { get; set; }
+
+        [Serialize(3, false)]
+        public int MaxCellsPerRoom { get; set; }
+
+        [Serialize(2, false)]
+        public int MinCellsOutside { get; set; }
+
+        [Serialize(5, false)]
+        public int MaxCellsOutside { get; set; }
+
+        [Serialize(3, false)]
+        public int MinCellsInside { get; set; }
+
+        [Serialize(10, false)]
+        public int MaxCellsInside { get; set; }
+
+        [Serialize(15, false)]
+        public int MaxCellCount { get; set; }
+
+        [Serialize(100f, false)]
+        public float MinWaterLevel { get; set; }
+
+        public readonly string[] ForbiddenAmmunition;
+
+        public static List<WreckAIConfig> List
+        {
+            get
+            {
+                if (paramsList == null)
+                {
+                    LoadAll();
+                }
+                return paramsList;
+            }
+        }
+
+        private static List<WreckAIConfig> paramsList;
+
+        public static WreckAIConfig GetRandom() => List.GetRandom(Rand.RandSync.Server);
+
+        public WreckAIConfig(XElement element)
+        {
+            SerializableProperties = SerializableProperty.DeserializeProperties(this, element);
+            ForbiddenAmmunition = XMLExtensions.GetAttributeStringArray(element, "ForbiddenAmmunition", new string[0], convertToLowerInvariant: true);
+        }
+
+        public static void LoadAll()
+        {
+            paramsList = new List<WreckAIConfig>();
+            var files = GameMain.Instance.GetFilesOfType(ContentType.WreckAIConfig);
+            if (files.None())
+            {
+                DebugConsole.ThrowError("Cannot find any Wreck AI config!");
+                return;
+            }
+            foreach (ContentFile file in files)
+            {
+                XDocument doc = XMLExtensions.TryLoadXml(file.Path);
+                if (doc == null) { continue; }
+                var mainElement = doc.Root;
+                if (mainElement.IsOverride())
+                {
+                    mainElement = doc.Root.FirstElement();
+                    paramsList.Clear();
+                    DebugConsole.NewMessage($"Overriding the wreck ai config with '{file.Path}'", Color.Yellow);
+                }
+                else if (paramsList.Any())
+                {
+                    DebugConsole.NewMessage($"Adding additional wreck ai config from file '{file.Path}'");
+                }
+                paramsList.Add(new WreckAIConfig(mainElement));
+            }
+        }
+    }
+}

Barotrauma/BarotraumaShared/SharedSource/Characters/AICharacter.cs

@@ -70,7 +70,7 @@ namespace Barotrauma
                 }
             }
 
-            if (IsDead || Vitality <= 0.0f || IsUnconscious || Stun > 0.0f) return;
+            if (IsDead || Vitality <= 0.0f|| Stun > 0.0f || IsIncapacitated) return;
             if (!aiController.Enabled) return;
             if (GameMain.NetworkMember != null && !GameMain.NetworkMember.IsServer) return;
             if (Controlled == this) return;

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

@@ -231,25 +231,12 @@ namespace Barotrauma
                 }
                 else
                 {
-                    Limb refLimb = GetLimb(LimbType.Head);
-                    float refAngle;
-                    if (refLimb == null)
+                    float rotation = MathHelper.WrapAngle(Collider.Rotation);
+                    rotation = MathHelper.ToDegrees(rotation);
+                    if (rotation < 0.0f)
                     {
-                        refAngle = CurrentAnimationParams.TorsoAngleInRadians;
-                        refLimb = GetLimb(LimbType.Torso);
+                        rotation += 360;
                     }
-                    else
-                    {
-                        refAngle = CurrentAnimationParams.HeadAngleInRadians;
-                    }
-
-                    float rotation = refLimb.Rotation;
-                    if (!float.IsNaN(refAngle)) { rotation -= refAngle * Dir; }
-
-                    rotation = MathHelper.ToDegrees(MathUtils.WrapAngleTwoPi(rotation));
-
-                    if (rotation < 0.0f) rotation += 360;
-
                     if (rotation > 20 && rotation < 160)
                     {
                         TargetDir = Direction.Left;
@@ -347,9 +334,23 @@ namespace Barotrauma
                     target.AnimController.Collider.MoveToPos(mouthPos, (float)(Math.Sin(eatTimer) + dragForce));
                 }
 
-                //pull the character's mouth to the target character (again with a fluctuating force)
-                float pullStrength = (float)(Math.Sin(eatTimer) * Math.Max(Math.Sin(eatTimer * 0.5f), 0.0f));
-                mouthLimb.body.ApplyForce(limbDiff * mouthLimb.Mass * 50.0f * pullStrength, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                if (InWater)
+                {
+                    //pull the character's mouth to the target character (again with a fluctuating force)
+                    float pullStrength = (float)(Math.Sin(eatTimer) * Math.Max(Math.Sin(eatTimer * 0.5f), 0.0f));
+                    mouthLimb.body.ApplyForce(limbDiff * mouthLimb.Mass * 50.0f * pullStrength, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                }
+                else
+                {
+                    float force = (float)Math.Sin(eatTimer * 100) * mouthLimb.Mass;
+                    mouthLimb.body.ApplyLinearImpulse(Vector2.UnitY * force * 2, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                    mouthLimb.body.ApplyTorque(-force * 50);
+                }
+                var jaw = GetLimb(LimbType.Jaw);
+                if (jaw != null)
+                {
+                    jaw.body.ApplyTorque(-(float)Math.Sin(eatTimer * 150) * jaw.Mass * 25);
+                }
 
                 character.ApplyStatusEffects(ActionType.OnEating, deltaTime);
 
@@ -439,7 +440,7 @@ namespace Barotrauma
 
             if (CurrentSwimParams.RotateTowardsMovement)
             {
-                Collider.SmoothRotate(movementAngle, CurrentSwimParams.SteerTorque);
+                Collider.SmoothRotate(movementAngle, CurrentSwimParams.SteerTorque * character.SpeedMultiplier);
                 if (TorsoAngle.HasValue)
                 {
                     Limb torso = GetLimb(LimbType.Torso);
@@ -491,11 +492,11 @@ namespace Barotrauma
                 }
                 if (mainLimb.type == LimbType.Head && HeadAngle.HasValue)
                 {
-                    Collider.SmoothRotate(HeadAngle.Value * Dir, CurrentSwimParams.SteerTorque);
+                    Collider.SmoothRotate(HeadAngle.Value * Dir, CurrentSwimParams.SteerTorque * character.SpeedMultiplier);
                 }
                 else if (mainLimb.type == LimbType.Torso && TorsoAngle.HasValue)
                 {
-                    Collider.SmoothRotate(TorsoAngle.Value * Dir, CurrentSwimParams.SteerTorque);
+                    Collider.SmoothRotate(TorsoAngle.Value * Dir, CurrentSwimParams.SteerTorque * character.SpeedMultiplier);
                 }
                 if (TorsoAngle.HasValue)
                 {
@@ -515,7 +516,7 @@ namespace Barotrauma
             }
 
             var waveLength = Math.Abs(CurrentSwimParams.WaveLength * RagdollParams.JointScale);
-            var waveAmplitude = Math.Abs(CurrentSwimParams.WaveAmplitude);
+            var waveAmplitude = Math.Abs(CurrentSwimParams.WaveAmplitude * character.SpeedMultiplier);
             if (waveLength > 0 && waveAmplitude > 0)
             {
                 WalkPos -= transformedMovement.Length() / Math.Abs(waveLength);
@@ -524,6 +525,10 @@ namespace Barotrauma
 
             foreach (var limb in Limbs)
             {
+                if (Math.Abs(limb.Params.ConstantTorque) > 0)
+                {
+                    limb.body.SmoothRotate(movementAngle + MathHelper.ToRadians(limb.Params.ConstantAngle) * Dir, limb.Params.ConstantTorque, wrapAngle: true);
+                }
                 switch (limb.type)
                 {
                     case LimbType.LeftFoot:
@@ -548,7 +553,7 @@ namespace Barotrauma
                 if (Limbs[i].SteerForce <= 0.0f) { continue; }
                 if (!Collider.PhysEnabled) { continue; }
                 Vector2 pullPos = Limbs[i].PullJointWorldAnchorA;
-                Limbs[i].body.ApplyForce(movement * Limbs[i].SteerForce * Limbs[i].Mass, pullPos);
+                Limbs[i].body.ApplyForce(movement * Limbs[i].SteerForce * Limbs[i].Mass * Math.Max(character.SpeedMultiplier, 1), pullPos);
             }
 
             Vector2 mainLimbDiff = mainLimb.PullJointWorldAnchorB - mainLimb.SimPosition;
@@ -665,6 +670,10 @@ namespace Barotrauma
 
             foreach (Limb limb in Limbs)
             {
+                if (Math.Abs(limb.Params.ConstantTorque) > 0)
+                {
+                    limb.body.SmoothRotate(movementAngle + MathHelper.ToRadians(limb.Params.ConstantAngle) * Dir, limb.Params.ConstantTorque, wrapAngle: true);
+                }
                 switch (limb.type)
                 {
                     case LimbType.LeftFoot:
@@ -729,7 +738,10 @@ namespace Barotrauma
                         break;
                     case LimbType.LeftLeg:
                     case LimbType.RightLeg:
-                        if (Math.Abs(CurrentGroundedParams.LegTorque) > 0.001f) limb.body.ApplyTorque(limb.Mass * CurrentGroundedParams.LegTorque * Dir);
+                        if (Math.Abs(CurrentGroundedParams.LegTorque) > 0)
+                        {
+                            limb.body.ApplyTorque(limb.Mass * CurrentGroundedParams.LegTorque * Dir);
+                        }
                         break;
                 }
             }

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

@@ -900,7 +900,7 @@ namespace Barotrauma
 
                 surfaceLimiter = ConvertUnits.ToDisplayUnits(Collider.SimPosition.Y + 0.4f) - surfacePos;
                 surfaceLimiter = Math.Max(1.0f, surfaceLimiter);
-                if (surfaceLimiter > 50.0f) return;
+                if (surfaceLimiter > 50.0f) { return; }
             }
 
             Limb leftHand = GetLimb(LimbType.LeftHand);
@@ -928,8 +928,7 @@ namespace Barotrauma
                 if (!aiming)
                 {
                     float newRotation = MathUtils.VectorToAngle(TargetMovement) - MathHelper.PiOver2;
-                    Collider.SmoothRotate(newRotation, 5.0f);
-                    //torso.body.SmoothRotate(newRotation);                
+                    Collider.SmoothRotate(newRotation, 5.0f * character.SpeedMultiplier);                
                 }
             }
             else
@@ -942,13 +941,13 @@ namespace Barotrauma
                     TargetMovement = new Vector2(0.0f, -0.1f);
 
                     float newRotation = MathUtils.VectorToAngle(diff);
-                    Collider.SmoothRotate(newRotation, 5.0f);
+                    Collider.SmoothRotate(newRotation, 5.0f * character.SpeedMultiplier);
                 }
             }
 
             torso.body.MoveToPos(Collider.SimPosition + new Vector2((float)Math.Sin(-Collider.Rotation), (float)Math.Cos(-Collider.Rotation)) * 0.4f, 5.0f);
 
-            if (TargetMovement == Vector2.Zero) return;
+            if (TargetMovement == Vector2.Zero) { return; }
 
             movement = MathUtils.SmoothStep(movement, TargetMovement, 0.3f);
 
@@ -1007,7 +1006,7 @@ namespace Barotrauma
 
             var waist = GetLimb(LimbType.Waist);
             footPos = waist == null ? Vector2.Zero : waist.SimPosition - new Vector2((float)Math.Sin(-Collider.Rotation), (float)Math.Cos(-Collider.Rotation)) * (upperLegLength + lowerLegLength);
-            Vector2 transformedFootPos = new Vector2((float)Math.Sin(legCyclePos / CurrentSwimParams.LegCycleLength) * CurrentSwimParams.LegMoveAmount * CurrentAnimationParams.CycleSpeed, 0.0f);
+            Vector2 transformedFootPos = new Vector2((float)Math.Sin(legCyclePos / CurrentSwimParams.LegCycleLength / character.SpeedMultiplier) * CurrentSwimParams.LegMoveAmount, 0.0f);
             transformedFootPos = Vector2.Transform(transformedFootPos, Matrix.CreateRotationZ(Collider.Rotation));
 
             if (rightFoot != null && !rightFoot.Disabled)
@@ -1061,7 +1060,7 @@ namespace Barotrauma
                 rightHandPos.X = (Dir == 1.0f) ? Math.Max(0.3f, rightHandPos.X) : Math.Min(-0.3f, rightHandPos.X);
                 rightHandPos = Vector2.Transform(rightHandPos, rotationMatrix);
 
-                HandIK(rightHand, handPos + rightHandPos, CurrentSwimParams.HandMoveStrength);
+                HandIK(rightHand, handPos + rightHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier);
             }
 
             if (leftHand != null && !leftHand.Disabled)
@@ -1070,7 +1069,7 @@ namespace Barotrauma
                 leftHandPos.X = (Dir == 1.0f) ? Math.Max(0.3f, leftHandPos.X) : Math.Min(-0.3f, leftHandPos.X);
                 leftHandPos = Vector2.Transform(leftHandPos, rotationMatrix);
 
-                HandIK(leftHand, handPos + leftHandPos, CurrentSwimParams.HandMoveStrength);
+                HandIK(leftHand, handPos + leftHandPos, CurrentSwimParams.HandMoveStrength * character.SpeedMultiplier);
             }
         }
 
@@ -1653,7 +1652,10 @@ namespace Barotrauma
         //TODO: refactor this method, it's way too convoluted
         public override void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle, float itemAngleRelativeToHoldAngle = 0.0f)
         {
-            if (character.IsUnconscious || character.Stun > 0.0f) aim = false;
+            if (character.Stun > 0.0f || character.IsIncapacitated)
+            {
+                aim = false;
+            }
 
             //calculate the handle positions
             Matrix itemTransfrom = Matrix.CreateRotationZ(item.body.Rotation);
@@ -1677,7 +1679,7 @@ namespace Barotrauma
 
             Holdable holdable = item.GetComponent<Holdable>();
 
-            if (!isClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero)
+            if (!isClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero && !character.IsIncapacitated)
             {
                 Vector2 mousePos = ConvertUnits.ToSimUnits(character.SmoothedCursorPosition);
 
@@ -1764,7 +1766,7 @@ namespace Barotrauma
 
             if (holdable.Pusher != null)
             {
-                if (character.IsUnconscious || character.Stun > 0.0f)
+                if (character.Stun > 0.0f || character.IsIncapacitated)
                 {
                     holdable.Pusher.Enabled = false;
                 }
@@ -1779,7 +1781,7 @@ namespace Barotrauma
                     else
                     {
                         holdable.Pusher.TargetPosition = currItemPos;
-                        holdable.Pusher.TargetRotation = character.IsUnconscious || character.Stun > 0.0f ? itemAngle : holdAngle * Dir;
+                        holdable.Pusher.TargetRotation = holdAngle * Dir;
 
                         holdable.Pusher.MoveToTargetPosition(true);
 
@@ -1929,7 +1931,7 @@ namespace Barotrauma
                 float sqrDist = Vector2.DistanceSquared(character.WorldPosition, handWorldPos);
                 if (sqrDist > MathUtils.Pow(ConvertUnits.ToDisplayUnits(upperArmLength + forearmLength), 2))
                 {
-                    TargetMovement = Vector2.Normalize(handWorldPos - character.WorldPosition) * GetCurrentSpeed(false);
+                    TargetMovement = Vector2.Normalize(handWorldPos - character.WorldPosition) * GetCurrentSpeed(false) * Math.Max(character.SpeedMultiplier, 1);
                 }
             }
 

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

@@ -97,8 +97,6 @@ namespace Barotrauma
 
         protected float strongestImpact;
 
-        protected double onFloorTimer;
-
         private float splashSoundTimer;
 
         //the movement speed of the ragdoll
@@ -383,7 +381,7 @@ namespace Barotrauma
                 }
             }
 
-            if (character.IsHusk)
+            if (character.IsHusk && character.Params.UseHuskAppendage)
             {
                 var characterPrefab = CharacterPrefab.FindByFilePath(character.ConfigPath);
                 if (characterPrefab?.XDocument != null)
@@ -732,14 +730,20 @@ namespace Barotrauma
             limbJoint.IsSevered = true;
             limbJoint.Enabled = false;
 
+            Vector2 limbDiff = limbJoint.LimbA.SimPosition - limbJoint.LimbB.SimPosition;
+            if (limbDiff.LengthSquared() < 0.0001f) { limbDiff = Rand.Vector(1.0f); }
+            limbDiff = Vector2.Normalize(limbDiff);
+            float mass = limbJoint.BodyA.Mass + limbJoint.BodyB.Mass;
+            limbJoint.LimbA.body.ApplyLinearImpulse(limbDiff * mass, (limbJoint.LimbA.SimPosition + limbJoint.LimbB.SimPosition) / 2.0f);
+            limbJoint.LimbB.body.ApplyLinearImpulse(-limbDiff * mass, (limbJoint.LimbA.SimPosition + limbJoint.LimbB.SimPosition) / 2.0f);
+
             List<Limb> connectedLimbs = new List<Limb>();
             List<LimbJoint> checkedJoints = new List<LimbJoint>();
 
             GetConnectedLimbs(connectedLimbs, checkedJoints, MainLimb);
             foreach (Limb limb in Limbs)
             {
-                if (connectedLimbs.Contains(limb)) continue;
-
+                if (connectedLimbs.Contains(limb)) { continue; }
                 limb.IsSevered = true;
             }
 
@@ -1626,14 +1630,14 @@ namespace Barotrauma
             float sin = (float)Math.Sin(mouthLimb.Rotation);
             Vector2 bodySize = mouthLimb.body.GetSize();
             Vector2 offset = new Vector2(mouthLimb.MouthPos.X * bodySize.X / 2, mouthLimb.MouthPos.Y * bodySize.Y / 2);
-            return mouthLimb.SimPosition + new Vector2(offset.X * cos - offset.Y * sin, offset.X * sin + offset.Y * cos) * RagdollParams.LimbScale;
+            return mouthLimb.SimPosition + new Vector2(offset.X * cos - offset.Y * sin, offset.X * sin + offset.Y * cos) * mouthLimb.Scale * RagdollParams.LimbScale;
         }
 
         public Vector2 GetColliderBottom()
         {
             float offset = 0.0f;
 
-            if (!character.IsUnconscious && !character.IsDead && character.Stun <= 0.0f)
+            if (!character.IsDead && character.Stun <= 0.0f && !character.IsIncapacitated)
             {
                 offset = -ColliderHeightFromFloor;
             }

Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs

@@ -13,11 +13,12 @@ namespace Barotrauma
 
     public enum AttackContext
     {
-        NotDefined,
+        Any,
         Water,
         Ground,
         Inside,
-        Outside
+        Outside,
+        NotDefined
     }
 
     public enum AttackTarget
@@ -72,13 +73,13 @@ namespace Barotrauma
 
     partial class Attack : ISerializableEntity
     {
-        [Serialize(AttackContext.NotDefined, true, description: "The attack will be used only in this context."), Editable]
+        [Serialize(AttackContext.Any, true, description: "The attack will be used only in this context."), Editable]
         public AttackContext Context { get; private set; }
 
         [Serialize(AttackTarget.Any, true, description: "Does the attack target only specific targets?"), Editable]
         public AttackTarget TargetType { get; private set; }
 
-        [Serialize(LimbType.None, true, description: "If not defined or set to none, the closest limb is used (default)."), Editable]
+        [Serialize(LimbType.None, true, description: "To which limb is the attack aimed at? If not defined or set to none, the closest limb is used (default)."), Editable]
         public LimbType TargetLimbType { get; private set; }
 
         [Serialize(HitDetection.Distance, true, description: "Collision detection is more accurate, but it only affects targets that are in contact with the limb."), Editable]
@@ -87,9 +88,15 @@ namespace Barotrauma
         [Serialize(AIBehaviorAfterAttack.FallBack, true, description: "The preferred AI behavior after the attack."), Editable]
         public AIBehaviorAfterAttack AfterAttack { get; set; }
 
-        [Serialize(false, true, description: "Should the AI try to reverse when aiming with this attack?"), Editable]
+        [Serialize(0f, true, description: "A delay before reacting after performing an attack."), Editable]
+        public float AfterAttackDelay { get; set; }
+
+        [Serialize(false, true, description: "Should the AI try to turn around when aiming with this attack?"), Editable]
         public bool Reverse { get; private set; }
 
+        [Serialize(false, true, description: "Should the AI try to steer away from the target when aiming with this attack? Best combined with PassiveAggressive behavior."), Editable]
+        public bool Retreat { get; private set; }
+
         [Serialize(0.0f, true, description: "The min distance from the attack limb to the target before the AI tries to attack."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 2000.0f)]
         public float Range { get; set; }
 
@@ -147,7 +154,19 @@ namespace Barotrauma
         [Serialize(0.0f, true, description: "Applied to the attacking limb (or limbs defined using ApplyForceOnLimbs). The direction of the force is towards the target that's being attacked."), Editable(MinValueFloat = -1000.0f, MaxValueFloat = 1000.0f)]
         public float Force { get; private set; }
 
-        [Serialize(0.0f, true, description: "Applied to the attacking limb (or limbs defined using ApplyForceOnLimbs)"), Editable(MinValueFloat = -1000.0f, MaxValueFloat = 1000.0f)]
+        [Serialize("0.0, 0.0", true, description: "Applied to the main limb. In world space coordinates(i.e. 0, 1 pushes the character upwards a bit). The attacker's facing direction is taken into account."), Editable]
+        public Vector2 RootForceWorldStart { get; private set; }
+        
+        [Serialize("0.0, 0.0", true, description: "Applied to the main limb. In world space coordinates(i.e. 0, 1 pushes the character upwards a bit). The attacker's facing direction is taken into account."), Editable]
+        public Vector2 RootForceWorldMiddle { get; private set; }
+        
+        [Serialize("0.0, 0.0", true, description: "Applied to the main limb. In world space coordinates(i.e. 0, 1 pushes the character upwards a bit). The attacker's facing direction is taken into account."), Editable]
+        public Vector2 RootForceWorldEnd { get; private set; }
+        
+        [Serialize(TransitionMode.Linear, true, description:""), Editable]
+        public TransitionMode RootTransitionEasing { get; private set; }
+
+        [Serialize(0.0f, true, description: "Applied to the attacking limb (or limbs defined using ApplyForceOnLimbs)"), Editable(MinValueFloat = -10000.0f, MaxValueFloat = 10000.0f)]
         public float Torque { get; private set; }
 
         [Serialize(false, true), Editable]
@@ -156,13 +175,13 @@ namespace Barotrauma
         [Serialize(0.0f, true, description: "Applied to the target the attack hits. The direction of the impulse is from this limb towards the target (use negative values to pull the target closer)."), Editable(MinValueFloat = -1000.0f, MaxValueFloat = 1000.0f)]
         public float TargetImpulse { get; private set; }
 
-        [Serialize("0.0, 0.0", true, description: "Applied to the target, in world space coordinates(i.e. 0, -1 pushes the target downwards)."), Editable]
+        [Serialize("0.0, 0.0", true, description: "Applied to the target, in world space coordinates(i.e. 0, -1 pushes the target downwards). The attacker's facing direction is taken into account."), Editable]
         public Vector2 TargetImpulseWorld { get; private set; }
 
         [Serialize(0.0f, true, description: "Applied to the target the attack hits. The direction of the force is from this limb towards the target (use negative values to pull the target closer)."), Editable(-1000.0f, 1000.0f)]
         public float TargetForce { get; private set; }
 
-        [Serialize("0.0, 0.0", true, description: "Applied to the target, in world space coordinates(i.e. 0, -1 pushes the target downwards)."), Editable]
+        [Serialize("0.0, 0.0", true, description: "Applied to the target, in world space coordinates(i.e. 0, -1 pushes the target downwards). The attacker's facing direction is taken into account."), Editable]
         public Vector2 TargetForceWorld { get; private set; }
 
         [Serialize(0.0f, true, description: "How likely the attack causes target limbs to be severed when the target is dead."), Editable(MinValueFloat = 0.0f, MaxValueFloat = 1.0f)]
@@ -279,7 +298,7 @@ namespace Barotrauma
                         {
                             DebugConsole.ThrowError("Error in Attack (" + parentDebugName + ") - define afflictions using identifiers instead of names.");
                             string afflictionName = subElement.GetAttributeString("name", "").ToLowerInvariant();
-                            afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Name.ToLowerInvariant() == afflictionName);
+                            afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Name.Equals(afflictionName, System.StringComparison.OrdinalIgnoreCase));
                             if (afflictionPrefab == null)
                             {
                                 DebugConsole.ThrowError("Error in Attack (" + parentDebugName + ") - Affliction prefab \"" + afflictionName + "\" not found.");
@@ -289,7 +308,7 @@ namespace Barotrauma
                         else
                         {
                             string afflictionIdentifier = subElement.GetAttributeString("identifier", "").ToLowerInvariant();
-                            afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.ToLowerInvariant() == afflictionIdentifier);
+                            afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.Equals(afflictionIdentifier, System.StringComparison.OrdinalIgnoreCase));
                             if (afflictionPrefab == null)
                             {
                                 DebugConsole.ThrowError("Error in Attack (" + parentDebugName + ") - Affliction prefab \"" + afflictionIdentifier + "\" not found.");
@@ -324,7 +343,7 @@ namespace Barotrauma
                 AfflictionPrefab afflictionPrefab;
                 Affliction affliction;
                 string afflictionIdentifier = subElement.GetAttributeString("identifier", "").ToLowerInvariant();
-                afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.ToLowerInvariant() == afflictionIdentifier);
+                afflictionPrefab = AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.Equals(afflictionIdentifier, System.StringComparison.OrdinalIgnoreCase));
                 if (afflictionPrefab != null)
                 {
                     float afflictionStrength = subElement.GetAttributeFloat(1.0f, "amount", "strength");
@@ -419,7 +438,10 @@ namespace Barotrauma
 
         public AttackResult DoDamageToLimb(Character attacker, Limb targetLimb, Vector2 worldPosition, float deltaTime, bool playSound = true)
         {
-            if (targetLimb == null) return new AttackResult();
+            if (targetLimb == null)
+            {
+                return new AttackResult();
+            }
 
             if (OnlyHumans)
             {
@@ -461,6 +483,7 @@ namespace Barotrauma
 
         public float AttackTimer { get; private set; }
         public float CoolDownTimer { get; set; }
+        public float CurrentRandomCoolDown { get; private set; }
         public float SecondaryCoolDownTimer { get; set; }
         public bool IsRunning { get; private set; }
 
@@ -492,7 +515,8 @@ namespace Barotrauma
         public void SetCoolDown()
         {
             float randomFraction = CoolDown * CoolDownRandomFactor;
-            CoolDownTimer = CoolDown + MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value(Rand.RandSync.Server));
+            CurrentRandomCoolDown = MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value(Rand.RandSync.Server));
+            CoolDownTimer = CoolDown + CurrentRandomCoolDown;
             randomFraction = SecondaryCoolDown * CoolDownRandomFactor;
             SecondaryCoolDownTimer = SecondaryCoolDown + MathHelper.Lerp(-randomFraction, randomFraction, Rand.Value(Rand.RandSync.Server));
         }
@@ -501,11 +525,12 @@ namespace Barotrauma
         {
             CoolDownTimer = 0;
             SecondaryCoolDownTimer = 0;
+            CurrentRandomCoolDown = 0;
         }
 
         partial void DamageParticles(float deltaTime, Vector2 worldPosition);
 
-        public bool IsValidContext(AttackContext context) => Context == context || Context == AttackContext.NotDefined;
+        public bool IsValidContext(AttackContext context) => Context == context || Context == AttackContext.Any || Context == AttackContext.NotDefined;
 
         public bool IsValidContext(IEnumerable<AttackContext> contexts)
         {
@@ -559,5 +584,11 @@ namespace Barotrauma
                     return true;
             }
         }
+
+        public Vector2 CalculateAttackPhase(TransitionMode easing = TransitionMode.Linear)
+        {
+            float t = AttackTimer / Duration;
+            return MathUtils.Bezier(RootForceWorldStart, RootForceWorldMiddle, RootForceWorldEnd, ToolBox.GetEasing(easing, t));
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -57,6 +57,9 @@ namespace Barotrauma
         public Hull CurrentHull = null;
 
         public bool IsRemotePlayer;
+
+        public bool IsPlayer => Controlled == this || IsRemotePlayer;
+
         public readonly Dictionary<string, SerializableProperty> Properties;
         public Dictionary<string, SerializableProperty> SerializableProperties
         {
@@ -122,19 +125,54 @@ namespace Barotrauma
             set => Params.NeedsAir = value;
         }
 
+        public bool NeedsWater
+        {
+            get => Params.NeedsWater;
+            set => Params.NeedsWater = value;
+        }
+
+        public bool NeedsOxygen => NeedsAir || NeedsWater && !AnimController.InWater;
+
         public float Noise
         {
             get => Params.Noise;
             set => Params.Noise = value;
         }
 
+        public float Visibility
+        {
+            get => Params.Visibility;
+            set => Params.Visibility = value;
+        }
+
         public bool IsTraitor;
         public string TraitorCurrentObjective = "";
         public bool IsHuman => SpeciesName.Equals(CharacterPrefab.HumanSpeciesName, StringComparison.OrdinalIgnoreCase);
 
         private float attackCoolDown;
 
-        public Order CurrentOrder { get; private set; }
+        public Order CurrentOrder
+        {
+            get
+            {
+                return Info?.CurrentOrder;
+            }
+            private set
+            {
+                if (Info != null) { Info.CurrentOrder = value; }
+            }
+        }
+        public string CurrentOrderOption
+        {
+            get
+            {
+                return Info?.CurrentOrderOption;
+            }
+            private set
+            {
+                if (Info != null) { Info.CurrentOrderOption = value; }
+            }
+        }
 
         private readonly List<StatusEffect> statusEffects = new List<StatusEffect>();
         private readonly List<float> speedMultipliers = new List<float>();
@@ -160,7 +198,7 @@ namespace Barotrauma
                     if (turret != null)
                     {
                         viewTargetWorldPos = new Vector2(
-                            targetItem.WorldRect.X + turret.TransformedBarrelPos.X, 
+                            targetItem.WorldRect.X + turret.TransformedBarrelPos.X,
                             targetItem.WorldRect.Y - turret.TransformedBarrelPos.Y);
                     }
                 }
@@ -201,7 +239,7 @@ namespace Barotrauma
                 {
                     displayName = TextManager.Get($"Character.{SpeciesName}", returnNull: true);
                 }
-                return displayName ?? Name;
+                return string.IsNullOrWhiteSpace(displayName) ? Name : displayName;
             }
         }
 
@@ -245,7 +283,7 @@ namespace Barotrauma
         //text displayed when the character is highlighted if custom interact is set
         public string customInteractHUDText;
         private Action<Character, Character> onCustomInteract;
-        
+
         private float lockHandsTimer;
         public bool LockHands
         {
@@ -261,22 +299,22 @@ namespace Barotrauma
 
         public bool AllowInput
         {
-            get { return !IsUnconscious && Stun <= 0.0f && !IsDead; }
+            get { return Stun <= 0.0f && !IsDead && !IsIncapacitated; }
         }
 
         public bool CanMove
         {
             get
             {
-                if (!AllowInput) { return false; }
                 if (!AnimController.InWater && !AnimController.CanWalk) { return false; }
+                if (!AllowInput) { return false; }
                 return true;
             }
         }
 
         public bool CanInteract
         {
-            get { return AllowInput && IsHumanoid && !LockHands && !Removed; }
+            get { return AllowInput && IsHumanoid && !LockHands && !Removed && !IsIncapacitated; }
         }
 
         public Vector2 CursorPosition
@@ -362,12 +400,21 @@ namespace Barotrauma
                 pressureProtection = MathHelper.Clamp(value, 0.0f, 100.0f);
             }
         }
-        
+
         private float ragdollingLockTimer;
         public bool IsRagdolled;
         public bool IsForceRagdolled;
         public bool dontFollowCursor;
 
+        public bool IsIncapacitated
+        {
+            get
+            {
+                if (IsUnconscious) { return true; }
+                return CharacterHealth.Afflictions.Any(a => a.Prefab.AfflictionType == "paralysis" && a.Strength >= a.Prefab.MaxStrength);
+            }
+        }
+
         public bool IsUnconscious
         {
             get { return CharacterHealth.IsUnconscious; }
@@ -491,6 +538,8 @@ namespace Barotrauma
 
         public bool IsDead { get; private set; }
 
+        public bool EnableDespawn { get; set; } = true;
+
         public CauseOfDeath CauseOfDeath
         {
             get;
@@ -513,7 +562,7 @@ namespace Barotrauma
             {
                 if (!canBeDragged) { return false; }
                 if (Removed || !AnimController.Draggable) { return false; }
-                return IsDead || Stun > 0.0f || LockHands || IsUnconscious;
+                return IsDead || Stun > 0.0f || LockHands || IsIncapacitated;
             }
             set { canBeDragged = value; }
         }
@@ -531,7 +580,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    return (IsDead || Stun > 0.0f || LockHands || IsUnconscious);
+                    return (IsDead || Stun > 0.0f || LockHands || IsIncapacitated);
                 }
             }
             set { canInventoryBeAccessed = value; }
@@ -758,7 +807,7 @@ namespace Barotrauma
                 var matchingAffliction = AfflictionPrefab.List
                     .Where(p => p.AfflictionType == "huskinfection")
                     .Select(p => p as AfflictionPrefabHusk)
-                    .FirstOrDefault(p => p.TargetSpecies.Any(t => t.Equals(AfflictionHusk.GetNonHuskedSpeciesName(speciesName, p), StringComparison.InvariantCultureIgnoreCase)));
+                    .FirstOrDefault(p => p.TargetSpecies.Any(t => t.Equals(AfflictionHusk.GetNonHuskedSpeciesName(speciesName, p), StringComparison.OrdinalIgnoreCase)));
                 string nonHuskedSpeciesName = string.Empty;
                 if (matchingAffliction == null)
                 {
@@ -770,10 +819,14 @@ namespace Barotrauma
                 {
                     nonHuskedSpeciesName = AfflictionHusk.GetNonHuskedSpeciesName(speciesName, matchingAffliction);
                 }
-                ragdollParams = IsHumanoid ? RagdollParams.GetDefaultRagdollParams<HumanRagdollParams>(nonHuskedSpeciesName) : RagdollParams.GetDefaultRagdollParams<FishRagdollParams>(nonHuskedSpeciesName) as RagdollParams;
-                if (info == null)
+                if (ragdollParams == null)
                 {
-                    info = new CharacterInfo(nonHuskedSpeciesName, ragdollParams.FileName);
+                    string name = Params.UseHuskAppendage ? nonHuskedSpeciesName : speciesName;
+                    ragdollParams = IsHumanoid ? RagdollParams.GetDefaultRagdollParams<HumanRagdollParams>(name) : RagdollParams.GetDefaultRagdollParams<FishRagdollParams>(name) as RagdollParams;
+                }
+                if (Params.HasInfo && info == null)
+                {
+                    info = new CharacterInfo(nonHuskedSpeciesName);
                 }
             }
 
@@ -844,7 +897,7 @@ namespace Barotrauma
             Info.HairElement?.Elements("sprite").ForEach(s => head.OtherWearables.Add(new WearableSprite(s, WearableType.Hair)));
 
 #if CLIENT
-            head.LoadHuskSprite();
+            head.EnableHuskSprite = Params.Husk;
             head.LoadHerpesSprite();
             head.UpdateWearableTypesToHide();
 #endif
@@ -1010,59 +1063,55 @@ namespace Barotrauma
             }
             else
             {
-                if (IsKeyDown(InputType.Left)) targetMovement.X -= 1.0f;
-                if (IsKeyDown(InputType.Right)) targetMovement.X += 1.0f;
-                if (IsKeyDown(InputType.Up)) targetMovement.Y += 1.0f;
-                if (IsKeyDown(InputType.Down)) targetMovement.Y -= 1.0f;
+                if (IsKeyDown(InputType.Left)) { targetMovement.X -= 1.0f; }
+                if (IsKeyDown(InputType.Right)) { targetMovement.X += 1.0f; }
+                if (IsKeyDown(InputType.Up)) { targetMovement.Y += 1.0f; }
+                if (IsKeyDown(InputType.Down)) { targetMovement.Y -= 1.0f; }
             }
+            bool run = false;
+            if ((IsKeyDown(InputType.Run) && AnimController.ForceSelectAnimationType == AnimationType.NotDefined) || ForceRun)
+            {
 
+                run = CanRun;
+            }
+            return ApplyMovementLimits(targetMovement, AnimController.GetCurrentSpeed(run));
+        }
+
+        //can't run if
+        //  - dragging someone
+        //  - crouching
+        //  - moving backwards
+        public bool CanRun => (SelectedCharacter == null || !SelectedCharacter.CanBeDragged) &&
+                    (!(AnimController is HumanoidAnimController) || !((HumanoidAnimController)AnimController).Crouching) &&
+                    !AnimController.IsMovingBackwards;
+
+        public Vector2 ApplyMovementLimits(Vector2 targetMovement, float currentSpeed)
+        {
             //the vertical component is only used for falling through platforms and climbing ladders when not in water,
             //so the movement can't be normalized or the Character would walk slower when pressing down/up
             if (AnimController.InWater)
             {
                 float length = targetMovement.Length();
-                if (length > 0.0f) targetMovement /= length;
+                if (length > 0.0f)
+                {
+                    targetMovement /= length;
+                }
             }
-
-            bool run = false;
-            if ((IsKeyDown(InputType.Run) && AnimController.ForceSelectAnimationType == AnimationType.NotDefined) || ForceRun)
-            {
-                //can't run if
-                //  - dragging someone
-                //  - crouching
-                //  - moving backwards
-                run = (SelectedCharacter == null || !SelectedCharacter.CanBeDragged) &&
-                    (!(AnimController is HumanoidAnimController) || !((HumanoidAnimController)AnimController).Crouching) &&
-                    !AnimController.IsMovingBackwards;
-            }
-
-            float currentSpeed = AnimController.GetCurrentSpeed(run);
             targetMovement *= currentSpeed;
             float maxSpeed = ApplyTemporarySpeedLimits(currentSpeed);
             targetMovement.X = MathHelper.Clamp(targetMovement.X, -maxSpeed, maxSpeed);
             targetMovement.Y = MathHelper.Clamp(targetMovement.Y, -maxSpeed, maxSpeed);
-
-            //apply speed multiplier if 
-            //  a. it's boosting the movement speed and the character is trying to move fast (= running)
-            //  b. it's a debuff that decreases movement speed
-            float speedMultiplier = SpeedMultiplier;
-            if (run || speedMultiplier <= 0.0f) targetMovement *= speedMultiplier;
-
-            ResetSpeedMultiplier(); // Reset, items will set the value before the next update
-
+            SpeedMultiplier = greatestPositiveSpeedMultiplier - (1f - greatestNegativeSpeedMultiplier);
+            targetMovement *= SpeedMultiplier;
+            // Reset, status effects will set the value before the next update
+            ResetSpeedMultiplier();
             return targetMovement;
         }
 
         /// <summary>
         /// Can be used to modify the character's speed via StatusEffects
         /// </summary>
-        public float SpeedMultiplier
-        {
-            get
-            {
-                return greatestPositiveSpeedMultiplier - (1f - greatestNegativeSpeedMultiplier);
-            }
-        }
+        public float SpeedMultiplier { get; private set; }
 
         public void StackSpeedMultiplier(float val)
         {
@@ -2012,8 +2061,8 @@ namespace Barotrauma
             HideFace = false;
 
 
-            UpdateSightRange();
-            UpdateSoundRange();
+            UpdateSightRange(deltaTime);
+            UpdateSoundRange(deltaTime);
 
             if (IsDead) { return; }
 
@@ -2084,12 +2133,17 @@ namespace Barotrauma
             UpdateControlled(deltaTime, cam);
 
             //Health effects
-            if (NeedsAir) { UpdateOxygen(deltaTime); }
+            if (NeedsOxygen)
+            {
+                UpdateOxygen(deltaTime);
+            }
             CharacterHealth.Update(deltaTime);
 
-            if (IsUnconscious)
+            if (IsIncapacitated)
             {
-                UpdateUnconscious();
+                Stun = Math.Max(5.0f, Stun);
+                AnimController.ResetPullJoints();
+                SelectedConstruction = null;
                 return;
             }
 
@@ -2162,33 +2216,44 @@ namespace Barotrauma
 
         partial void UpdateProjSpecific(float deltaTime, Camera cam);
 
+        partial void SetOrderProjSpecific(Order order, string orderOption);
+
         private void UpdateOxygen(float deltaTime)
         {
-            PressureProtection -= deltaTime * 100.0f;
-            float hullAvailableOxygen = 0.0f;
-            if (!AnimController.HeadInWater && AnimController.CurrentHull != null)
+            if (NeedsAir)
             {
-                //don't decrease the amount of oxygen in the hull if the character has more oxygen available than the hull
-                //(i.e. if the character has some external source of oxygen)
-                if (OxygenAvailable * 0.98f < AnimController.CurrentHull.OxygenPercentage)
+                PressureProtection -= deltaTime * 100.0f;
+            }
+            if (NeedsWater)
+            {
+                float waterAvailable = 100;
+                if (!AnimController.InWater && CurrentHull != null)
                 {
-                    AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
+                    waterAvailable = CurrentHull.WaterPercentage;
                 }
-                hullAvailableOxygen = AnimController.CurrentHull.OxygenPercentage;
+                OxygenAvailable += MathHelper.Clamp(waterAvailable - oxygenAvailable, -deltaTime * 50.0f, deltaTime * 50.0f);
+            }
+            else
+            {
+                float hullAvailableOxygen = 0.0f;
+                if (!AnimController.HeadInWater && AnimController.CurrentHull != null)
+                {
+                    //don't decrease the amount of oxygen in the hull if the character has more oxygen available than the hull
+                    //(i.e. if the character has some external source of oxygen)
+                    if (OxygenAvailable * 0.98f < AnimController.CurrentHull.OxygenPercentage)
+                    {
+                        AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
+                    }
+                    hullAvailableOxygen = AnimController.CurrentHull.OxygenPercentage;
+
+                }
+                OxygenAvailable += MathHelper.Clamp(hullAvailableOxygen - oxygenAvailable, -deltaTime * 50.0f, deltaTime * 50.0f);
             }
 
-            OxygenAvailable += MathHelper.Clamp(hullAvailableOxygen - oxygenAvailable, -deltaTime * 50.0f, deltaTime * 50.0f);
         }
+
         partial void UpdateOxygenProjSpecific(float prevOxygen);
 
-        private void UpdateUnconscious()
-        {
-            Stun = Math.Max(5.0f, Stun);
-
-            AnimController.ResetPullJoints();
-            SelectedConstruction = null;
-        }
-
         /// <summary>
         /// How far the character is from the closest human player (including spectators)
         /// </summary>
@@ -2221,23 +2286,29 @@ namespace Barotrauma
         }
 
         private float despawnTimer;
-        private const float DespawnDelay = 5.0f * 60.0f; //5 minutes
         private void UpdateDespawn(float deltaTime)
         {
+            if (!EnableDespawn) { return; }
+
             //clients don't despawn characters unless the server says so
             if (GameMain.NetworkMember != null && !GameMain.NetworkMember.IsServer) { return; }
 
             if (!IsDead) { return; }
 
+            if (Submarine != null && CharacterList.Count(c => c.IsDead && c.Submarine == Submarine) < GameMain.Config.CorpsesPerSubDespawnThreshold)
+            {
+                return;
+            }
+
             float distToClosestPlayer = GetDistanceToClosestPlayer();
             if (distToClosestPlayer > NetConfig.DisableCharacterDist)
             {
-                //despawn in 1 second if very far from all human players
-                despawnTimer = Math.Max(despawnTimer, DespawnDelay - 1.0f);
+                //despawn in 1 minute if very far from all human players
+                despawnTimer = Math.Max(despawnTimer, GameMain.Config.CorpseDespawnDelay - 60.0f);
             }
-
+            
             despawnTimer += deltaTime;
-            if (despawnTimer < DespawnDelay) { return; }
+            if (despawnTimer < GameMain.Config.CorpseDespawnDelay) { return; }
 
             if (IsHuman)
             {
@@ -2264,7 +2335,12 @@ namespace Barotrauma
                     if (itemContainer == null) { return; }
                     foreach (Item inventoryItem in Inventory.Items)
                     {
-                        itemContainer.Inventory.TryPutItem(inventoryItem, user: null);
+                        if (inventoryItem == null) { continue; }
+                        if (!itemContainer.Inventory.TryPutItem(inventoryItem, user: null))
+                        {
+                            //if the item couldn't be put inside the despawn container, just drop it
+                            inventoryItem.Drop(dropper: this);
+                        }
                     }
                 }
             }
@@ -2274,7 +2350,7 @@ namespace Barotrauma
 
         public void DespawnNow()
         {
-            despawnTimer = DespawnDelay;
+            despawnTimer = GameMain.Config.CorpseDespawnDelay;
         }
 
         public static void RemoveByPrefab(CharacterPrefab prefab)
@@ -2290,18 +2366,39 @@ namespace Barotrauma
             }
         }
 
-        private void UpdateSightRange()
+        private readonly float maxAIRange = 10000;
+        private readonly float aiTargetChangeSpeed = 5;
+
+        private void UpdateSightRange(float deltaTime)
         {
             if (aiTarget == null) { return; }
-            float range = (float)Math.Sqrt(Mass) * 250 + AnimController.Collider.LinearVelocity.Length() * 500;
-            aiTarget.SightRange = MathHelper.Clamp(range, 0, 10000);
+            float minRange = Math.Clamp((float)Math.Sqrt(Mass) * Visibility, 250, 1000);
+            float massFactor = (float)Math.Sqrt(Mass / 20);
+            float targetRange = Math.Min(minRange + massFactor * AnimController.Collider.LinearVelocity.Length() * 2 * Visibility, maxAIRange);
+            float newRange = MathHelper.SmoothStep(aiTarget.SightRange, targetRange, deltaTime * aiTargetChangeSpeed);
+            if (!float.IsNaN(newRange))
+            {
+                aiTarget.SightRange = newRange;
+            }
         }
 
-        private void UpdateSoundRange()
+        private void UpdateSoundRange(float deltaTime)
         {
             if (aiTarget == null) { return; }
-            float range = ((float)Math.Sqrt(Mass) / 3) * (AnimController.TargetMovement.Length() * 2) * Noise;
-            aiTarget.SoundRange = MathHelper.Clamp(range, 0, 10000);
+            if (IsDead)
+            {
+                aiTarget.SoundRange = 0;
+            }
+            else
+            {
+                float massFactor = (float)Math.Sqrt(Mass / 10);
+                float targetRange = Math.Min(massFactor * AnimController.Collider.LinearVelocity.Length() * 2 * Noise, maxAIRange);
+                float newRange = MathHelper.SmoothStep(aiTarget.SoundRange, targetRange, deltaTime * aiTargetChangeSpeed);
+                if (!float.IsNaN(newRange))
+                {
+                    aiTarget.SoundRange = newRange;
+                }
+            }
         }
 
         public bool CanHearCharacter(Character speaker)
@@ -2316,24 +2413,17 @@ namespace Barotrauma
 
         public void SetOrder(Order order, string orderOption, Character orderGiver, bool speak = true)
         {
-            if (orderGiver != null)
-            {
-                //set the character order only if the character is close enough to hear the message
-                if (!CanHearCharacter(orderGiver)) { return; }
-            }
+            //set the character order only if the character is close enough to hear the message
+            if (orderGiver != null && !CanHearCharacter(orderGiver)) { return; }
 
             if (AIController is HumanAIController humanAI)
             {
                 humanAI.SetOrder(order, orderOption, orderGiver, speak);
             }
-#if CLIENT
-            else
-            {
-                GameMain.GameSession?.CrewManager?.DisplayCharacterOrder(this, order, orderOption);
-            }
-#endif
 
+            SetOrderProjSpecific(order, orderOption);
             CurrentOrder = order;
+            CurrentOrderOption = orderOption;
         }
 
         private readonly List<AIChatMessage> aiChatMessageQueue = new List<AIChatMessage>();
@@ -2469,13 +2559,17 @@ namespace Barotrauma
                 DamageLimb(worldPosition, targetLimb, attack.Afflictions.Keys, attack.Stun, playSound, attackImpulse, attacker);
 
             if (limbHit == null) { return new AttackResult(); }
-
-            limbHit.body?.ApplyLinearImpulse(attack.TargetImpulseWorld + attack.TargetForceWorld * deltaTime, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+            Vector2 forceWorld = attack.TargetImpulseWorld + attack.TargetForceWorld;
+            if (attacker != null)
+            {
+                forceWorld.X *= attacker.AnimController.Dir;
+            }
+            limbHit.body?.ApplyLinearImpulse(forceWorld * deltaTime, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
             var mainLimb = limbHit.character.AnimController.MainLimb;
             if (limbHit != mainLimb)
             {
                 // Always add force to mainlimb
-                mainLimb.body?.ApplyLinearImpulse(attack.TargetImpulseWorld + attack.TargetForceWorld * deltaTime, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                mainLimb.body?.ApplyLinearImpulse(forceWorld * deltaTime, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
             }
 #if SERVER
             if (attacker is Character attackingCharacter && attackingCharacter.AIController == null)
@@ -2602,6 +2696,7 @@ namespace Barotrauma
                     mainLimb.body.ApplyLinearImpulse(impulse, hitPos, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
                 }
             }
+            bool wasDead = IsDead;
             Vector2 simPos = hitLimb.SimPosition + ConvertUnits.ToSimUnits(dir);
             AttackResult attackResult = hitLimb.AddDamage(simPos, afflictions, playSound);
             CharacterHealth.ApplyDamage(hitLimb, attackResult);
@@ -2609,6 +2704,10 @@ namespace Barotrauma
             {
                 OnAttacked?.Invoke(attacker, attackResult);
                 OnAttackedProjSpecific(attacker, attackResult);
+                if (!wasDead)
+                {
+                    TryAdjustAttackerSkill(attacker, -attackResult.Damage);
+                }
             };
 
             if (attacker != null && attackResult.Damage > 0.0f)
@@ -2621,6 +2720,30 @@ namespace Barotrauma
 
         partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult);
 
+        public void TryAdjustAttackerSkill(Character attacker, float healthChange)
+        {
+            if (attacker == null) { return; }
+            
+            bool isEnemy = AIController is EnemyAIController || TeamID != attacker.TeamID;
+            if (isEnemy)
+            {
+                if (healthChange < 0.0f)
+                {
+                    float attackerSkillLevel = attacker.GetSkillLevel("weapons");
+                    attacker.Info?.IncreaseSkillLevel("weapons",
+                        -healthChange * SkillSettings.Current.SkillIncreasePerHostileDamage / Math.Max(attackerSkillLevel, 1.0f),
+                        attacker.WorldPosition + Vector2.UnitY * 100.0f);
+                }
+            }
+            else if (healthChange > 0.0f)
+            {
+                float attackerSkillLevel = attacker.GetSkillLevel("medical");
+                attacker.Info?.IncreaseSkillLevel("medical",
+                    healthChange * SkillSettings.Current.SkillIncreasePerFriendlyHealed / Math.Max(attackerSkillLevel, 1.0f),
+                    attacker.WorldPosition + Vector2.UnitY * 100.0f);
+            }
+        }
+
         public void SetStun(float newStun, bool allowStunDecrease = false, bool isNetworkMessage = false)
         {
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient && !isNetworkMessage) { return; }
@@ -2702,7 +2825,7 @@ namespace Barotrauma
 
         partial void ImplodeFX();
 
-        public void Kill(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool isNetworkMessage = false)
+        public void Kill(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool isNetworkMessage = false, bool log = true)
         {
             if (IsDead || CharacterHealth.Unkillable) { return; }
 
@@ -2745,9 +2868,9 @@ namespace Barotrauma
 
             SteamAchievementManager.OnCharacterKilled(this, CauseOfDeath);
 
-            KillProjSpecific(causeOfDeath, causeOfDeathAffliction);
+            KillProjSpecific(causeOfDeath, causeOfDeathAffliction, log);
 
-            if (info != null) info.CauseOfDeath = CauseOfDeath;
+            if (info != null) { info.CauseOfDeath = CauseOfDeath; }
             AnimController.movement = Vector2.Zero;
             AnimController.TargetMovement = Vector2.Zero;
 
@@ -2770,7 +2893,7 @@ namespace Barotrauma
                 GameMain.GameSession.KillCharacter(this);
             }
         }
-        partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction);
+        partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log);
 
         public void Revive()
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -293,6 +293,9 @@ namespace Barotrauma
 
         private NPCPersonalityTrait personalityTrait;
 
+        public Order CurrentOrder { get; set;}
+        public string CurrentOrderOption { get; set; }
+
         //unique ID given to character infos in MP
         //used by clients to identify which infos are the same to prevent duplicate characters in round summary
         public ushort ID;
@@ -524,9 +527,11 @@ namespace Barotrauma
             }      
             foreach (XElement subElement in infoElement.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "job") continue;
-                Job = new Job(subElement);
-                break;
+                if (subElement.Name.ToString().Equals("job", StringComparison.OrdinalIgnoreCase))
+                {
+                    Job = new Job(subElement);
+                    break;
+                }
             }
             LoadHeadAttachments();
         }
@@ -661,7 +666,7 @@ namespace Barotrauma
         {
             foreach (XElement limbElement in Ragdoll.MainElement.Elements())
             {
-                if (limbElement.GetAttributeString("type", "").ToLowerInvariant() != "head") { continue; }
+                if (!limbElement.GetAttributeString("type", "").Equals("head", StringComparison.OrdinalIgnoreCase)) { continue; }
 
                 XElement spriteElement = limbElement.Element("sprite");
                 if (spriteElement == null) { continue; }
@@ -677,7 +682,7 @@ namespace Barotrauma
                 //go through the files in the directory to find a matching sprite
                 foreach (string file in Directory.GetFiles(Path.GetDirectoryName(spritePath)))
                 {
-                    if (!file.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
+                    if (!file.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
                     {
                         continue;
                     }
@@ -828,6 +833,11 @@ namespace Barotrauma
         {
             if (Job == null || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) || Character == null) { return; }         
 
+            if (Job.Prefab.Identifier == "assistant")
+            {
+                increase *= SkillSettings.Current.AssistantSkillIncreaseMultiplier;
+            }
+
             float prevLevel = Job.GetSkillLevel(skillIdentifier);
             Job.IncreaseSkillLevel(skillIdentifier, increase);
 
@@ -955,7 +965,7 @@ namespace Barotrauma
                 foreach (XElement childInvElement in itemElement.Elements())
                 {
                     if (itemContainerIndex >= itemContainers.Count) break;
-                    if (childInvElement.Name.ToString().ToLowerInvariant() != "inventory") continue;
+                    if (!childInvElement.Name.ToString().Equals("inventory", StringComparison.OrdinalIgnoreCase)) { continue; }
                     SpawnInventoryItemsRecursive(itemContainers[itemContainerIndex].Inventory, childInvElement);
                     itemContainerIndex++;
                 }

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

@@ -14,8 +14,13 @@ namespace Barotrauma
 
         public Dictionary<string, SerializableProperty> SerializableProperties { get; set; }
 
+        protected float _strength;
         [Serialize(0f, true), Editable]
-        public float Strength { get; set; }
+        public virtual float Strength
+        {
+            get { return _strength; }
+            set { _strength = value; }
+        }
 
         [Serialize("", true), Editable]
         public string Identifier { get; private set; }
@@ -38,7 +43,7 @@ namespace Barotrauma
         public Affliction(AfflictionPrefab prefab, float strength)
         {
             Prefab = prefab;
-            Strength = strength;
+            _strength = strength;
             Identifier = prefab?.Identifier;
         }
 
@@ -173,11 +178,11 @@ namespace Barotrauma
 
             if (currentEffect.StrengthChange < 0) // Reduce diminishing of buffs if boosted
             {
-                Strength += currentEffect.StrengthChange * deltaTime * StrengthDiminishMultiplier;
+                _strength += currentEffect.StrengthChange * deltaTime * StrengthDiminishMultiplier;
             }
             else // Reduce strengthening of afflictions if resistant
             {
-                Strength += currentEffect.StrengthChange * deltaTime * (1f - characterHealth.GetResistance(Prefab.Identifier));
+                _strength += currentEffect.StrengthChange * deltaTime * (1f - characterHealth.GetResistance(Prefab.Identifier));
             }
 
             foreach (StatusEffect statusEffect in currentEffect.StatusEffects)

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using System;
 
 namespace Barotrauma
 {
@@ -9,7 +9,7 @@ namespace Barotrauma
     {
         public enum InfectionState
         {
-            Dormant, Transition, Active
+            Initial, Dormant, Transition, Active, Final
         }
 
         private bool subscribedToDeathEvent;
@@ -17,154 +17,157 @@ namespace Barotrauma
         private InfectionState state;
 
         private List<Limb> huskAppendage;
-        
+
+        private Character character;
+
+        private readonly List<Affliction> huskInfection = new List<Affliction>();
+
+        [Serialize(0f, true), Editable]
+        public override float Strength
+        {
+            get { return _strength; }
+            set
+            {
+                // Don't allow to set the strength too high (from outside) to avoid rapid transformation into husk when taking lots of damage from husks.
+                // If the strength is more than the value, this will effectively reset the current strength to the max. That's why we use two steps.
+                float max = _strength > ActiveThreshold ? ActiveThreshold + 1 : DormantThreshold - 1;
+                _strength = Math.Clamp(value, 0, max);
+            }
+        }
+
         public InfectionState State
         {
             get { return state; }
+            private set
+            {
+                if (state == value) { return; }
+                state = value;
+                if (character != null && character == Character.Controlled)
+                {
+                    UpdateMessages();
+                }
+            }
         }
 
-        public AfflictionHusk(AfflictionPrefab prefab, float strength) : 
-            base(prefab, strength)
-        {
-        }
+        private float DormantThreshold => Prefab.MaxStrength * 0.5f;
+        private float ActiveThreshold => Prefab.MaxStrength * 0.75f;
+
+        public AfflictionHusk(AfflictionPrefab prefab, float strength) : base(prefab, strength) { }
 
         public override void Update(CharacterHealth characterHealth, Limb targetLimb, float deltaTime)
         {
-            float prevStrength = Strength;
             base.Update(characterHealth, targetLimb, deltaTime);
-
+            character = characterHealth.Character;
+            if (character == null) { return; }
             if (!subscribedToDeathEvent)
             {
-                characterHealth.Character.OnDeath += CharacterDead;
+                character.OnDeath += CharacterDead;
                 subscribedToDeathEvent = true;
             }
-
-            if (characterHealth.Character == Character.Controlled) UpdateMessages(prevStrength, characterHealth.Character);
-            if (Strength < Prefab.MaxStrength * 0.5f)
+            if (Strength < DormantThreshold)
             {
-                UpdateDormantState(deltaTime, characterHealth.Character);
+                DeactivateHusk();
+                State = InfectionState.Dormant;
+            }
+            else if (Strength < ActiveThreshold)
+            {
+                DeactivateHusk();
+                character.SpeechImpediment = 100;
+                State = InfectionState.Transition;
             }
             else if (Strength < Prefab.MaxStrength)
             {
-                characterHealth.Character.SpeechImpediment = 100.0f;
-                UpdateTransitionState(deltaTime, characterHealth.Character);
+                if (State != InfectionState.Active)
+                {
+                    character.SetStun(Rand.Range(2, 4, Rand.RandSync.Server));
+                }
+                State = InfectionState.Active;
+                ActivateHusk();
             }
             else
             {
-                characterHealth.Character.SpeechImpediment = 100.0f;
-                UpdateActiveState(deltaTime, characterHealth.Character);
+                State = InfectionState.Final;
+                ActivateHusk();
+                ApplyDamage(deltaTime, applyForce: true);
+                character.SetStun(1);
             }
         }
 
-        partial void UpdateMessages(float prevStrength, Character character);
+        partial void UpdateMessages();
 
-        private void UpdateDormantState(float deltaTime, Character character)
+        private void ApplyDamage(float deltaTime, bool applyForce)
         {
-            if (state != InfectionState.Dormant)
-            {
-                DeactivateHusk(character);
-            }
-            
-            state = InfectionState.Dormant;
-        }
-
-        private void UpdateTransitionState(float deltaTime, Character character)
-        {
-            if (state != InfectionState.Transition)
-            {
-                DeactivateHusk(character);                
-            }
-
-            state = InfectionState.Transition;
-        }
-
-        private void UpdateActiveState(float deltaTime, Character character)
-        {
-            if (state != InfectionState.Active)
-            {
-                ActivateHusk(character);
-                state = InfectionState.Active;
-            }
-
             foreach (Limb limb in character.AnimController.Limbs)
             {
+                float random = Rand.Value(Rand.RandSync.Server);
+                huskInfection.Clear();
+                huskInfection.Add(AfflictionPrefab.InternalDamage.Instantiate(random * deltaTime / character.AnimController.Limbs.Length));
                 character.LastDamageSource = null;
-                character.DamageLimb(
-                    limb.WorldPosition, limb,
-                    new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate(0.5f * deltaTime / character.AnimController.Limbs.Length) },
-                    0.0f, false, 0.0f);
+                float force = applyForce ? random * 0.1f * limb.Mass : 0;
+                character.DamageLimb(limb.WorldPosition, limb, huskInfection, 0, false, force);
             }
         }
 
-        public void ActivateHusk(Character character)
+        public void ActivateHusk()
         {
-            if (huskAppendage == null)
+            if (huskAppendage == null && character.Params.UseHuskAppendage)
             {
                 huskAppendage = AttachHuskAppendage(character, Prefab.Identifier);
-                if (huskAppendage != null)
-                {
-                    character.NeedsAir = false;
-                    character.SetStun(0.5f);
-                }
-#if CLIENT
-                character.AnimController.GetLimb(LimbType.Head).EnableHuskSprite = true;
-#endif
             }
+            character.NeedsAir = false;
+            character.SpeechImpediment = 100;
         }
 
-        private void DeactivateHusk(Character character)
+        private void DeactivateHusk()
         {
             character.NeedsAir = character.Params.MainElement.GetAttributeBool("needsair", false);
             if (huskAppendage != null)
             {
                 huskAppendage.ForEach(l => character.AnimController.RemoveLimb(l));
                 huskAppendage = null;
-#if CLIENT
-                character.AnimController.GetLimb(LimbType.Head).EnableHuskSprite = false;
-#endif
             }
         }
 
-        public void Remove(Character character)
+        public void Remove()
         {
-            DeactivateHusk(character);
-            if (character != null) character.OnDeath -= CharacterDead;
+            if (character == null) { return; }
+            DeactivateHusk();
+            character.OnDeath -= CharacterDead;
             subscribedToDeathEvent = false;
         }
 
         private void CharacterDead(Character character, CauseOfDeath causeOfDeath)
         {
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
-            if (Strength < Prefab.MaxStrength * 0.5f || character.Removed) { return; }
+            if (Strength < ActiveThreshold || character.Removed) { return; }
 
             //don't turn the character into a husk if any of its limbs are severed
             if (character.AnimController?.LimbJoints != null)
             {
                 foreach (var limbJoint in character.AnimController.LimbJoints)
                 {
-                    if (limbJoint.IsSevered) return;
+                    if (limbJoint.IsSevered) { return; }
                 }
             }
 
             //create the AI husk in a coroutine to ensure that we don't modify the character list while enumerating it
-            CoroutineManager.StartCoroutine(CreateAIHusk(character));
+            CoroutineManager.StartCoroutine(CreateAIHusk());
         }
 
-        private IEnumerable<object> CreateAIHusk(Character character)
+        private IEnumerable<object> CreateAIHusk()
         {
             character.Enabled = false;
             Entity.Spawner.AddToRemoveQueue(character);
 
-            string speciesName = GetHuskedSpeciesName(character.SpeciesName, Prefab as AfflictionPrefabHusk);
-            CharacterPrefab prefab = CharacterPrefab.FindBySpeciesName(speciesName);
+            string huskedSpeciesName = GetHuskedSpeciesName(character.SpeciesName, Prefab as AfflictionPrefabHusk);
+            CharacterPrefab prefab = CharacterPrefab.FindBySpeciesName(huskedSpeciesName);
 
             if (prefab == null)
             {
                 DebugConsole.ThrowError("Failed to turn character \"" + character.Name + "\" into a husk - husk config file not found.");
                 yield return CoroutineStatus.Success;
             }
-
-            var husk = Character.Create(speciesName, character.WorldPosition, character.Info.Name, character.Info, isRemotePlayer: false, hasAi: true, ragdoll: character.AnimController.RagdollParams);
+            var husk = Character.Create(huskedSpeciesName, character.WorldPosition, ToolBox.RandomSeed(8), character.Info, isRemotePlayer: false, hasAi: true);
 
             foreach (Limb limb in husk.AnimController.Limbs)
             {
@@ -197,6 +200,11 @@ namespace Barotrauma
                 husk.Inventory.TryPutItem(character.Inventory.Items[i], i, true, false, null);
             }
 
+            husk.SetStun(5);
+            yield return new WaitForSeconds(5, false);
+#if CLIENT
+            husk.PlaySound(CharacterSound.SoundType.Idle);
+#endif
             yield return CoroutineStatus.Success;
         }
 

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

@@ -114,6 +114,10 @@ namespace Barotrauma
         private List<LimbHealth> limbHealths = new List<LimbHealth>();
         //non-limb-specific afflictions
         private List<Affliction> afflictions = new List<Affliction>();
+        /// <summary>
+        /// Note: returns only the non-limb-secific afflictions. Use GetAllAfflictions or some other method for getting also the limb-specific afflictions.
+        /// </summary>
+        public IEnumerable<Affliction> Afflictions => afflictions;
 
         private HashSet<Affliction> irremovableAfflictions = new HashSet<Affliction>();
         private Affliction bloodlossAffliction;
@@ -160,12 +164,12 @@ namespace Barotrauma
         {
             get
             {
-                if (!Character.NeedsAir || Unkillable) return 100.0f;
+                if (!Character.NeedsOxygen || Unkillable) { return 100.0f; }
                 return -oxygenLowAffliction.Strength + 100;
             }
             set
             {
-                if (!Character.NeedsAir || Unkillable) return;
+                if (!Character.NeedsOxygen || Unkillable) { return; }
                 oxygenLowAffliction.Strength = MathHelper.Clamp(-value + 100, 0.0f, 200.0f);
             }
         }
@@ -216,7 +220,7 @@ namespace Barotrauma
             limbHealths.Clear();
             foreach (XElement subElement in element.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "limb") continue;
+                if (!subElement.Name.ToString().Equals("limb", StringComparison.OrdinalIgnoreCase)) { continue; }
                 limbHealths.Add(new LimbHealth(subElement, this));
             }
             if (limbHealths.Count == 0)
@@ -269,30 +273,6 @@ namespace Barotrauma
             }
         }
 
-        public Affliction GetAffliction(string identifier, bool allowLimbAfflictions = true)
-        {
-            foreach (Affliction affliction in afflictions)
-            {
-                if (affliction.Prefab.Identifier == identifier) return affliction;
-            }
-            if (!allowLimbAfflictions) return null;
-
-            foreach (LimbHealth limbHealth in limbHealths)
-            {
-                foreach (Affliction affliction in limbHealth.Afflictions)
-                {
-                    if (affliction.Prefab.Identifier == identifier) return affliction;
-                }
-            }
-
-            return null;
-        }
-
-        public T GetAffliction<T>(string identifier, bool allowLimbAfflictions = true) where T : Affliction
-        {
-            return GetAffliction(identifier, allowLimbAfflictions) as T;
-        }
-
         public IEnumerable<Affliction> GetAfflictionsByType(string afflictionType, Limb limb)
         {
             if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count)
@@ -304,6 +284,37 @@ namespace Barotrauma
             return limbHealths[limb.HealthIndex].Afflictions.Where(a => a.Prefab.AfflictionType == afflictionType);
         }
 
+        public Affliction GetAffliction(string identifier, bool allowLimbAfflictions = true)
+            => GetAffliction(a => a.Prefab.Identifier == identifier, allowLimbAfflictions);
+
+        public Affliction GetAfflictionOfType(string afflictionType, bool allowLimbAfflictions = true) 
+            => GetAffliction(a => a.Prefab.AfflictionType == afflictionType, allowLimbAfflictions);
+
+        private Affliction GetAffliction(Func<Affliction, bool> predicate, bool allowLimbAfflictions = true)
+        {
+            foreach (Affliction affliction in afflictions)
+            {
+                if (predicate(affliction)) { return affliction; }
+            }
+            if (!allowLimbAfflictions)
+            {
+                return null;
+            }
+            foreach (LimbHealth limbHealth in limbHealths)
+            {
+                foreach (Affliction affliction in limbHealth.Afflictions)
+                {
+                    if (predicate(affliction)) { return affliction; }
+                }
+            }
+            return null;
+        }
+
+        public T GetAffliction<T>(string identifier, bool allowLimbAfflictions = true) where T : Affliction
+        {
+            return GetAffliction(identifier, allowLimbAfflictions) as T;
+        }
+
         public Affliction GetAffliction(string identifier, Limb limb)
         {
             if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count)
@@ -408,11 +419,10 @@ namespace Barotrauma
             return resistance;
         }
 
+        private List<Affliction> matchingAfflictions = new List<Affliction>();
         public void ReduceAffliction(Limb targetLimb, string affliction, float amount)
         {
-            affliction = affliction.ToLowerInvariant();
-
-            List<Affliction> matchingAfflictions = new List<Affliction>(afflictions);
+            matchingAfflictions.Clear();
 
             if (targetLimb != null)
             {
@@ -426,8 +436,8 @@ namespace Barotrauma
                 }
             }
             matchingAfflictions.RemoveAll(a => 
-                a.Prefab.Identifier.ToLowerInvariant() != affliction && 
-                a.Prefab.AfflictionType.ToLowerInvariant() != affliction);
+                !a.Prefab.Identifier.Equals(affliction, StringComparison.OrdinalIgnoreCase) && 
+                !a.Prefab.AfflictionType.Equals(affliction, StringComparison.OrdinalIgnoreCase));
 
             if (matchingAfflictions.Count == 0) return;
 
@@ -526,7 +536,7 @@ namespace Barotrauma
         private void AddLimbAffliction(LimbHealth limbHealth, Affliction newAffliction)
         {
             if (!DoesBleed && newAffliction is AfflictionBleeding) return;
-            if (!Character.NeedsAir && newAffliction.Prefab == AfflictionPrefab.OxygenLow) return;
+            if (!Character.NeedsOxygen && newAffliction.Prefab == AfflictionPrefab.OxygenLow) return;
 
             foreach (Affliction affliction in limbHealth.Afflictions)
             {
@@ -559,7 +569,7 @@ namespace Barotrauma
         private void AddAffliction(Affliction newAffliction)
         {
             if (!DoesBleed && newAffliction is AfflictionBleeding) return;
-            if (!Character.NeedsAir && newAffliction.Prefab == AfflictionPrefab.OxygenLow) return;
+            if (!Character.NeedsOxygen && newAffliction.Prefab == AfflictionPrefab.OxygenLow) return;
             if (newAffliction.Prefab.AfflictionType == "huskinfection")
             {
                 var huskPrefab = newAffliction.Prefab as AfflictionPrefabHusk;
@@ -653,7 +663,7 @@ namespace Barotrauma
 
         private void UpdateOxygen(float deltaTime)
         {
-            if (!Character.NeedsAir) return;
+            if (!Character.NeedsOxygen) { return; }
 
             float prevOxygen = OxygenAmount;
             if (IsUnconscious)
@@ -691,13 +701,15 @@ namespace Barotrauma
                 foreach (Affliction affliction in limbHealth.Afflictions)
                 {
                     float vitalityDecrease = affliction.GetVitalityDecrease(this);
-                    if (limbHealth.VitalityMultipliers.ContainsKey(affliction.Prefab.Identifier.ToLowerInvariant()))
+                    string identifier = affliction.Prefab.Identifier.ToLowerInvariant();
+                    string type = affliction.Prefab.AfflictionType.ToLowerInvariant();
+                    if (limbHealth.VitalityMultipliers.ContainsKey(identifier))
                     {
-                        vitalityDecrease *= limbHealth.VitalityMultipliers[affliction.Prefab.Identifier.ToLowerInvariant()];
+                        vitalityDecrease *= limbHealth.VitalityMultipliers[identifier];
                     }
-                    if (limbHealth.VitalityTypeMultipliers.ContainsKey(affliction.Prefab.AfflictionType.ToLowerInvariant()))
+                    if (limbHealth.VitalityTypeMultipliers.ContainsKey(type))
                     {
-                        vitalityDecrease *= limbHealth.VitalityTypeMultipliers[affliction.Prefab.AfflictionType.ToLowerInvariant()];
+                        vitalityDecrease *= limbHealth.VitalityTypeMultipliers[type];
                     }
                     vitalityDecrease *= damageResistanceMultiplier;
                     Vitality -= vitalityDecrease;
@@ -750,6 +762,7 @@ namespace Barotrauma
             return new Pair<CauseOfDeathType, Affliction>(causeOfDeath, strongestAffliction);
         }
 
+        // TODO: this method is called a lot (every half second) -> optimize, don't create new class instances and lists every time!
         private List<Affliction> GetAllAfflictions(bool mergeSameAfflictions)
         {
             List<Affliction> allAfflictions = new List<Affliction>(afflictions);
@@ -791,8 +804,7 @@ namespace Barotrauma
         /// </summary>
         /// <param name="treatmentSuitability">A dictionary where the key is the identifier of the item and the value the suitability</param>
         /// <param name="normalize">If true, the suitability values are normalized between 0 and 1. If not, they're arbitrary values defined in the medical item XML, where negative values are unsuitable, and positive ones suitable.</param>
-        /// <param name="randomization">Amount of randomization to apply to the values (0 = the values are accurate, 1 = the values are completely random)</param>
-        
+        /// <param name="randomization">Amount of randomization to apply to the values (0 = the values are accurate, 1 = the values are completely random)</param>        
         public void GetSuitableTreatments(Dictionary<string, float> treatmentSuitability, bool normalize, float randomization = 0.0f)
         {
             //key = item identifier
@@ -833,10 +845,18 @@ namespace Barotrauma
             }
         }
 
+        private readonly List<Affliction> activeAfflictions = new List<Affliction>();
+        private readonly List<Pair<LimbHealth, Affliction>> limbAfflictions = new List<Pair<LimbHealth, Affliction>>();
         public void ServerWrite(IWriteMessage msg)
         {
-            List<Affliction> activeAfflictions = afflictions.FindAll(a => a.Strength > 0.0f && a.Strength >= a.Prefab.ActivationThreshold);
-
+            activeAfflictions.Clear();
+            foreach (var affliction in afflictions)
+            {
+                if (affliction.Strength > 0.0f && affliction.Strength >= affliction.Prefab.ActivationThreshold)
+                {
+                    activeAfflictions.Add(affliction);
+                }
+            }
             msg.Write((byte)activeAfflictions.Count);
             foreach (Affliction affliction in activeAfflictions)
             {
@@ -846,7 +866,7 @@ namespace Barotrauma
                     0.0f, affliction.Prefab.MaxStrength, 8);
             }
 
-            List<Pair<LimbHealth, Affliction>> limbAfflictions = new List<Pair<LimbHealth, Affliction>>();
+            limbAfflictions.Clear();
             foreach (LimbHealth limbHealth in limbHealths)
             {
                 foreach (Affliction limbAffliction in limbHealth.Afflictions)
@@ -873,5 +893,11 @@ namespace Barotrauma
         }
 
         partial void RemoveProjSpecific();
+
+        /// <summary>
+        /// Automatically filters out buffs.
+        /// </summary>
+        public static IEnumerable<Affliction> SortAfflictionsBySeverity(IEnumerable<Affliction> afflictions) =>
+            afflictions.Where(a => !a.Prefab.IsBuff).OrderByDescending(a => a.DamagePerSecond).ThenByDescending(a => a.Strength);
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Job.cs

@@ -62,7 +62,7 @@ namespace Barotrauma
             skills = new Dictionary<string, Skill>();
             foreach (XElement subElement in element.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "skill") { continue; }
+                if (!subElement.Name.ToString().Equals("skill", System.StringComparison.OrdinalIgnoreCase)) { continue; }
                 string skillIdentifier = subElement.GetAttributeString("identifier", "");
                 if (string.IsNullOrEmpty(skillIdentifier)) { continue; }
                 skills.Add(

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs

@@ -146,6 +146,7 @@ namespace Barotrauma
             private set;
         }
 
+        // TODO: not used
         [Serialize(10.0f, false)]
         public float Commonness
         {
@@ -241,7 +242,7 @@ namespace Barotrauma
         }
         
 
-        public static JobPrefab Random(Rand.RandSync sync = Rand.RandSync.Unsynced) => Prefabs.GetRandom(sync);
+        public static JobPrefab Random(Rand.RandSync sync = Rand.RandSync.Unsynced) => Prefabs.GetRandom(p => p.Identifier != "watchman", sync);
 
         public static void LoadAll(IEnumerable<ContentFile> files)
         {
@@ -262,7 +263,7 @@ namespace Barotrauma
             }
             foreach (XElement element in mainElement.Elements())
             {
-                if (element.Name.ToString().ToLowerInvariant() == "nojob") { continue; }
+                if (element.Name.ToString().Equals("nojob", StringComparison.OrdinalIgnoreCase)) { continue; }
                 if (element.IsOverride())
                 {
                     var job = new JobPrefab(element.FirstElement(), file.Path)

Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs

@@ -17,7 +17,7 @@ namespace Barotrauma
     public enum LimbType
     {
         None, LeftHand, RightHand, LeftArm, RightArm, LeftForearm, RightForearm,
-        LeftLeg, RightLeg, LeftFoot, RightFoot, Head, Torso, Tail, Legs, RightThigh, LeftThigh, Waist
+        LeftLeg, RightLeg, LeftFoot, RightFoot, Head, Torso, Tail, Legs, RightThigh, LeftThigh, Waist, Jaw
     };
     
     partial class LimbJoint : RevoluteJoint
@@ -28,6 +28,8 @@ namespace Barotrauma
         public readonly Ragdoll ragdoll;
         public readonly Limb LimbA, LimbB;
 
+        public float Scale => Params.Scale * ragdoll.RagdollParams.JointScale;
+
         public LimbJoint(Limb limbA, Limb limbB, JointParams jointParams, Ragdoll ragdoll) : this(limbA, limbB, Vector2.One, Vector2.One)
         {
             Params = jointParams;
@@ -59,15 +61,15 @@ namespace Barotrauma
             }
             if (ragdoll.IsFlipped)
             {
-                LocalAnchorA = ConvertUnits.ToSimUnits(new Vector2(-Params.Limb1Anchor.X, Params.Limb1Anchor.Y) * Params.Ragdoll.JointScale);
-                LocalAnchorB = ConvertUnits.ToSimUnits(new Vector2(-Params.Limb2Anchor.X, Params.Limb2Anchor.Y) * Params.Ragdoll.JointScale);
+                LocalAnchorA = ConvertUnits.ToSimUnits(new Vector2(-Params.Limb1Anchor.X, Params.Limb1Anchor.Y) * Scale);
+                LocalAnchorB = ConvertUnits.ToSimUnits(new Vector2(-Params.Limb2Anchor.X, Params.Limb2Anchor.Y) * Scale);
                 UpperLimit = MathHelper.ToRadians(-Params.LowerLimit);
                 LowerLimit = MathHelper.ToRadians(-Params.UpperLimit);
             }
             else
             {
-                LocalAnchorA = ConvertUnits.ToSimUnits(Params.Limb1Anchor * Params.Ragdoll.JointScale);
-                LocalAnchorB = ConvertUnits.ToSimUnits(Params.Limb2Anchor * Params.Ragdoll.JointScale);
+                LocalAnchorA = ConvertUnits.ToSimUnits(Params.Limb1Anchor * Scale);
+                LocalAnchorB = ConvertUnits.ToSimUnits(Params.Limb2Anchor * Scale);
                 UpperLimit = MathHelper.ToRadians(Params.UpperLimit);
                 LowerLimit = MathHelper.ToRadians(Params.LowerLimit);
             }
@@ -125,9 +127,29 @@ namespace Barotrauma
         private Direction dir;
 
         public int HealthIndex => Params.HealthIndex;
-        public float Scale => Params.Ragdoll.LimbScale;
+        public float Scale => Params.Scale * Params.Ragdoll.LimbScale;
         public float AttackPriority => Params.AttackPriority;
-        public bool DoesFlip => Params.Flip;
+        public bool DoesFlip
+        {
+            get
+            {
+                if (character.AnimController.CurrentAnimationParams is GroundedMovementParams)
+                {
+                    switch (type)
+                    {
+                        case LimbType.LeftFoot:
+                        case LimbType.LeftLeg:
+                        case LimbType.LeftThigh:
+                        case LimbType.RightFoot:
+                        case LimbType.RightLeg:
+                        case LimbType.RightThigh:
+                            // Legs always has to flip
+                            return true;
+                    }
+                }
+                return Params.Flip;
+            }
+        }
 
         public float SteerForce => Params.SteerForce;
         
@@ -654,33 +676,37 @@ namespace Barotrauma
             }
 
             Vector2 diff = attackSimPos - SimPosition;
-            bool applyForces = (!attack.ApplyForcesOnlyOnce || !wasRunning) && diff.LengthSquared() > 0.00001f;
+            bool applyForces = !attack.ApplyForcesOnlyOnce || !wasRunning;
             if (applyForces)
             {
-
                 if (attack.ForceOnLimbIndices != null && attack.ForceOnLimbIndices.Count > 0)
                 {
                     foreach (int limbIndex in attack.ForceOnLimbIndices)
                     {
-                        if (limbIndex < 0 || limbIndex >= character.AnimController.Limbs.Length) continue;
-
+                        if (limbIndex < 0 || limbIndex >= character.AnimController.Limbs.Length) { continue; }
                         Limb limb = character.AnimController.Limbs[limbIndex];
-                        limb.body.ApplyTorque(limb.Mass * character.AnimController.Dir * attack.Torque);
+                        diff = attackSimPos - limb.SimPosition;
+                        if (diff == Vector2.Zero) { continue; }
+                        limb.body.ApplyTorque(limb.Mass * character.AnimController.Dir * attack.Torque * limb.Params.AttackForceMultiplier);
                         Vector2 forcePos = limb.pullJoint == null ? limb.body.SimPosition : limb.pullJoint.WorldAnchorA;
-                        limb.body.ApplyLinearImpulse(limb.Mass * attack.Force * Vector2.Normalize(attackSimPos - SimPosition), forcePos,
-                            maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                        limb.body.ApplyLinearImpulse(limb.Mass * attack.Force * limb.Params.AttackForceMultiplier * Vector2.Normalize(diff), forcePos, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
                     }
                 }
-                else
+                else if (diff != Vector2.Zero)
                 {
-                    body.ApplyTorque(Mass * character.AnimController.Dir * attack.Torque);
+                    body.ApplyTorque(Mass * character.AnimController.Dir * attack.Torque * Params.AttackForceMultiplier);
                     Vector2 forcePos = pullJoint == null ? body.SimPosition : pullJoint.WorldAnchorA;
-                    body.ApplyLinearImpulse(
-                        Mass * attack.Force * Vector2.Normalize(attackSimPos - SimPosition), 
-                        forcePos, 
-                        maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+                    body.ApplyLinearImpulse(Mass * attack.Force * Params.AttackForceMultiplier * Vector2.Normalize(diff), forcePos, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
                 }
             }
+            Vector2 forceWorld = attack.CalculateAttackPhase(attack.RootTransitionEasing);
+            forceWorld.X *= character.AnimController.Dir;
+            character.AnimController.MainLimb.body.ApplyLinearImpulse(character.Mass * forceWorld, character.SimPosition, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
+            if (!attack.IsRunning)
+            {
+                // Set the main collider where the body lands after the attack
+                character.AnimController.Collider.SetTransform(character.AnimController.MainLimb.body.SimPosition, rotation: 0);
+            }
             return wasHit;
         }
 

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs

@@ -125,7 +125,7 @@ namespace Barotrauma
         public static string GetFolder(XDocument doc, string filePath)
         {
             var folder = doc.Root?.Element("animations")?.GetAttributeString("folder", string.Empty);
-            if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")
+            if (string.IsNullOrEmpty(folder) || folder.Equals("default", StringComparison.OrdinalIgnoreCase))
             {
                 folder = Path.Combine(Path.GetDirectoryName(filePath), "Animations");
             }
@@ -198,7 +198,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        selectedFile = filteredFiles.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).ToLowerInvariant() == fileName.ToLowerInvariant());
+                        selectedFile = filteredFiles.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).Equals(fileName, StringComparison.OrdinalIgnoreCase));
                         if (selectedFile == null)
                         {
                             DebugConsole.ThrowError($"[AnimationParams] Could not find an animation file that matches the name {fileName} and the animation type {animType}. Using the default animations.");

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

@@ -28,18 +28,30 @@ namespace Barotrauma
         [Serialize(false, true), Editable]
         public bool Humanoid { get; private set; }
 
+        [Serialize(false, true), Editable]
+        public bool HasInfo { get; private set; }
+
         [Serialize(false, true), Editable]
         public bool Husk { get; private set; }
 
+        [Serialize(false, true), Editable]
+        public bool UseHuskAppendage { get; private set; }
+
         [Serialize(false, true), Editable]
         public bool NeedsAir { get; set; }
 
+        [Serialize(false, true, description: "Can the creature live without water or does it die on dry land?"), Editable]
+        public bool NeedsWater { get; set; }
+
         [Serialize(false, true), Editable]
         public bool CanSpeak { get; set; }
 
         [Serialize(100f, true, description: "How much noise the character makes when moving?"), Editable(minValue: 0f, maxValue: 1000f)]
         public float Noise { get; set; }
 
+        [Serialize(100f, true, description: "How visible the character is?"), Editable(minValue: 0f, maxValue: 1000f)]
+        public float Visibility { get; set; }
+
         [Serialize("blood", true), Editable]
         public string BloodDecal { get; private set; }
 
@@ -450,6 +462,12 @@ namespace Barotrauma
             [Serialize(false, true, description: "Does the character try to break inside the sub?"), Editable()]
             public bool AggressiveBoarding { get; private set; }
 
+            [Serialize(true, true, description: "Enforce aggressive behavior if the creature is spawned as a target of a monster mission."), Editable()]
+            public bool EnforceAggressiveBehaviorForMissions { get; private set; }
+
+            [Serialize(false, true, description: "Should the character target or ignore walls when it's inside the submarine. Doesn't have any effect if no target priority for walls is defined."), Editable()]
+            public bool TargetInnerWalls { get; private set; }
+
             // TODO: latchonto, swarming
 
             public IEnumerable<TargetParams> Targets => targets;
@@ -538,6 +556,9 @@ namespace Barotrauma
             [Serialize(0f, true, description: "Generic distance that can be used for different purposes depending on the state. Eg. in Avoid state this defines the distance that the character tries to keep to the target. If the distance is 0, it's not used."), Editable(MinValueFloat = 0, ValueStep = 10, DecimalCount = 0)]
             public float ReactDistance { get; set; }
 
+            [Serialize(0f, true, description: "Used for defining the attack distance for PassiveAggressive and Aggressive states. If the distance is 0, it's not used."), Editable(MinValueFloat = 0, ValueStep = 10, DecimalCount = 0)]
+            public float AttackDistance { get; set; }
+
             public TargetParams(XElement element, CharacterParams character) : base(element, character) { }
 
             public TargetParams(string tag, AIState state, float priority, CharacterParams character) : base(CreateNewElement(tag, state, priority), character) { }

Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs

@@ -94,8 +94,7 @@ namespace Barotrauma
 
         public static string GetFolder(string speciesName, ContentPackage contentPackage = null)
         {
-            CharacterPrefab prefab = CharacterPrefab.Find(p => p.Identifier.ToLowerInvariant()==speciesName.ToLowerInvariant() &&
-                                                          (contentPackage==null || p.ContentPackage == contentPackage));
+            CharacterPrefab prefab = CharacterPrefab.Find(p => p.Identifier.Equals(speciesName, StringComparison.OrdinalIgnoreCase) && (contentPackage == null || p.ContentPackage == contentPackage));
             if (prefab?.XDocument == null)
             {
                 DebugConsole.ThrowError($"Failed to find config file for '{speciesName}' (content package {contentPackage?.Name ?? "null"})");
@@ -107,7 +106,7 @@ namespace Barotrauma
         public static string GetFolder(XDocument doc, string filePath)
         {
             var folder = doc.Root?.Element("ragdolls")?.GetAttributeString("folder", string.Empty);
-            if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")
+            if (string.IsNullOrEmpty(folder) || folder.Equals("default", StringComparison.OrdinalIgnoreCase))
             {
                 folder = Path.Combine(Path.GetDirectoryName(filePath), "Ragdolls") + Path.DirectorySeparatorChar;
             }
@@ -150,7 +149,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        selectedFile = files.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).ToLowerInvariant() == fileName.ToLowerInvariant());
+                        selectedFile = files.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).Equals(fileName, StringComparison.OrdinalIgnoreCase));
                         if (selectedFile == null)
                         {
                             DebugConsole.ThrowError($"[RagdollParams] Could not find a ragdoll file that matches the name {fileName}. Using the default ragdoll.");
@@ -489,6 +488,9 @@ namespace Barotrauma
             [Serialize(0.25f, true), Editable]
             public float Stiffness { get; set; }
 
+            [Serialize(1f, true, description: "CAUTION: Not fully implemented. Only use for limb joints that connect non-animated limbs!"), Editable]
+            public float Scale { get; set; }
+
             public JointParams(XElement element, RagdollParams ragdoll) : base(element, ragdoll) { }
         }
 
@@ -591,6 +593,18 @@ namespace Barotrauma
             [Serialize("", true), Editable]
             public string Notes { get; set; }
 
+            [Serialize(0f, true), Editable]
+            public float ConstantTorque { get; set; }
+
+            [Serialize(0f, true), Editable]
+            public float ConstantAngle { get; set; }
+
+            [Serialize(1f, true), Editable]
+            public float Scale { get; set; }
+
+            [Serialize(1f, true), Editable(DecimalCount = 2, MinValueFloat = 0, MaxValueFloat = 10)]
+            public float AttackForceMultiplier { get; set; }
+
             // Non-editable ->
             [Serialize(0, true)]
             public int HealthIndex { get; set; }

Barotrauma/BarotraumaShared/SharedSource/Characters/SkillSettings.cs

@@ -65,6 +65,37 @@ namespace Barotrauma
             set { skillIncreasePerFabricatorRequiredSkill = value; }
         }
 
+        private float skillIncreasePerHostileDamage;
+        [Serialize(0.01f, true)]
+        public float SkillIncreasePerHostileDamage
+        {
+            get { return skillIncreasePerHostileDamage * GetCurrentSkillGainMultiplier(); }
+            set { skillIncreasePerHostileDamage = value; }
+        }
+
+        private float skillIncreasePerSecondWhenOperatingTurret;
+        [Serialize(0.001f, true)]
+        public float SkillIncreasePerSecondWhenOperatingTurret
+        {
+            get { return skillIncreasePerSecondWhenOperatingTurret * GetCurrentSkillGainMultiplier(); }
+            set { skillIncreasePerSecondWhenOperatingTurret = value; }
+        }
+
+        private float skillIncreasePerFriendlyHealed;
+        [Serialize(0.001f, true)]
+        public float SkillIncreasePerFriendlyHealed
+        {
+            get { return skillIncreasePerFriendlyHealed * GetCurrentSkillGainMultiplier(); }
+            set { skillIncreasePerFriendlyHealed = value; }
+        }
+
+        [Serialize(1.1f, true)]
+        public float AssistantSkillIncreaseMultiplier
+        {
+            get;
+            set;
+        }
+
         private SkillSettings(XElement element)
         {
             SerializableProperties = SerializableProperty.DeserializeProperties(this, element);