(221f9f2a6) Merge branch 'dev' into capitalizationfixes

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

@@ -234,6 +234,7 @@ namespace Barotrauma
             switch (order.AITag.ToLowerInvariant())
             {
                 case "follow":
+                    if (orderGiver == null) { return null; }
                     newObjective = new AIObjectiveGoTo(orderGiver, character, this, repeat: true, priorityModifier: priorityModifier)
                     {
                         CloseEnough = 150,

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

@@ -17,6 +17,12 @@ namespace Barotrauma
     {
         public abstract RagdollParams RagdollParams { get; protected set; }
 
+        const float ImpactDamageMultiplayer = 10.0f;
+        /// <summary>
+        /// Maximum damage per impact (0.1 = 10% of the character's maximum health)
+        /// </summary>
+        const float MaxImpactDamage = 0.1f;
+
         private static List<Ragdoll> list = new List<Ragdoll>();
 
         protected Hull currentHull;
@@ -688,8 +694,10 @@ namespace Barotrauma
                         Vector2 impactPos = ConvertUnits.ToDisplayUnits(points[0]);
                         if (character.Submarine != null) impactPos += character.Submarine.Position;
 
+                        float impactDamage = Math.Min((impact - ImpactTolerance) * ImpactDamageMultiplayer, character.MaxVitality * MaxImpactDamage);
+
                         character.LastDamageSource = null;
-                        character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate((impact - ImpactTolerance) * 10.0f) }, 0.0f, true);
+                        character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate(impactDamage) }, 0.0f, true);
                         strongestImpact = Math.Max(strongestImpact, impact - ImpactTolerance);
                         character.ApplyStatusEffects(ActionType.OnImpact, 1.0f);
                         //briefly disable impact damage
@@ -1303,13 +1311,6 @@ namespace Barotrauma
                         }
                     }
                 }
-                foreach (Limb limb in Limbs)
-                {
-                    limb.body.SetTransform(Collider.SimPosition, 0.0f);
-                    limb.body.ResetDynamics();
-                }
-                SetInitialLimbPositions();
-                return false;
             }
             UpdateProjSpecific(deltaTime);
         }

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

@@ -217,7 +217,16 @@ namespace Barotrauma
                     limb.body.AngularVelocity = matchingLimb.body.AngularVelocity;
                 }
             }
-            for (int i = 0; i < character.Inventory.Items.Length; i++)
+
+            if (character.Inventory.Items.Length != husk.Inventory.Items.Length)
+            {
+                string errorMsg = "Failed to move items from a human's inventory into a humanhusk's inventory (inventory sizes don't match)";
+                DebugConsole.ThrowError(errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce("AfflictionHusk.CreateAIHusk:InventoryMismatch", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                yield return CoroutineStatus.Success;
+            }
+
+            for (int i = 0; i < character.Inventory.Items.Length && i < husk.Inventory.Items.Length; i++)
             {
                 if (character.Inventory.Items[i] == null) continue;
                 husk.Inventory.TryPutItem(character.Inventory.Items[i], i, true, false, null);