Unstable v0.10.6.0 (October 13th 2020)

This commit is contained in:
Juan Pablo Arce
2020-10-13 12:59:45 -03:00
parent 768f516e7c
commit 6b36bf809d
59 changed files with 1036 additions and 421 deletions
@@ -216,16 +216,18 @@ namespace Barotrauma
get
{
Limb mainLimb = GetLimb(RagdollParams.MainLimb);
if (mainLimb == null)
if (!IsValid(mainLimb))
{
Limb torso = GetLimb(LimbType.Torso);
Limb head = GetLimb(LimbType.Head);
mainLimb = torso ?? head;
if (mainLimb == null)
if (!IsValid(mainLimb))
{
mainLimb = Limbs.FirstOrDefault(l => !l.IsSevered && !l.ignoreCollisions);
mainLimb = Limbs.FirstOrDefault(l => IsValid(l));
}
}
bool IsValid(Limb limb) => limb != null && !limb.IsSevered && !limb.ignoreCollisions;
return mainLimb;
}
}
@@ -753,7 +755,6 @@ namespace Barotrauma
foreach (Limb limb in Limbs)
{
if (connectedLimbs.Contains(limb)) { continue; }
if (!character.IsDead && !limb.CanBeSeveredAlive) { continue; }
limb.IsSevered = true;
if (limb.type == LimbType.RightHand)
{
@@ -765,7 +766,6 @@ namespace Barotrauma
}
}
if (!string.IsNullOrEmpty(character.BloodDecalName))
{
character.CurrentHull?.AddDecal(character.BloodDecalName,