vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v1.6.17.0 (Unto the Breach update)

Browse Source
This commit is contained in:
Regalis11
2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs
+58 -35
View File
@@ -91,7 +91,7 @@ namespace Barotrauma
private bool simplePhysicsEnabled;
public Character Character => character;
protected Character character;
protected readonly Character character;
protected float strongestImpact;
@@ -385,15 +385,16 @@ namespace Barotrauma
if (ragdollParams != null)
{
RagdollParams = ragdollParams;
if (!character.VariantOf.IsEmpty)
{
RagdollParams.TryApplyVariantScale(character.Params.VariantFile);
}
}
else
{
// Only re-equip items if the ragdoll doesn't change, because re-equiping items might throw exceptions if the limbs have changed.
items = limbs?.ToDictionary(l => l.Params, l => l.WearingItems);
}
if (character.Params.VariantFile is XDocument variantFile)
{
RagdollParams.TryApplyVariantScale(variantFile);
}
foreach (var limbParams in RagdollParams.Limbs)
{
if (!PhysicsBody.IsValidShape(limbParams.Radius, limbParams.Height, limbParams.Width))
@@ -430,18 +431,13 @@ namespace Barotrauma
if (character.IsHusk && character.Params.UseHuskAppendage)
{
bool inEditor = false;
#if CLIENT
inEditor = Screen.Selected == GameMain.CharacterEditorScreen;
#endif
var characterPrefab = CharacterPrefab.FindByFilePath(character.ConfigPath);
if (characterPrefab?.ConfigElement != null)
{
var mainElement = characterPrefab.ConfigElement;
foreach (var huskAppendage in mainElement.GetChildElements("huskappendage"))
{
if (!inEditor && huskAppendage.GetAttributeBool("onlyfromafflictions", false)) { continue; }
if (huskAppendage.GetAttributeBool("onlyfromafflictions", false)) { continue; }
Identifier afflictionIdentifier = huskAppendage.GetAttributeIdentifier("affliction", Identifier.Empty);
if (!AfflictionPrefab.Prefabs.TryGet(afflictionIdentifier, out AfflictionPrefab affliction) ||
@@ -452,7 +448,7 @@ namespace Barotrauma
}
else
{
AfflictionHusk.AttachHuskAppendage(character, matchingAffliction, huskAppendage, ragdoll: this);
AfflictionHusk.AttachHuskAppendage(character, matchingAffliction, huskedSpeciesName: character.SpeciesName, huskAppendage, ragdoll: this);
}
}
}
@@ -478,7 +474,7 @@ namespace Barotrauma
DebugConsole.ThrowError("Invalid collider dimensions: " + cParams.Name);
break; ;
}
var body = new PhysicsBody(cParams);
var body = new PhysicsBody(cParams, findNewContacts: false);
collider.Add(body);
body.UserData = character;
body.FarseerBody.OnCollision += OnLimbCollision;
@@ -520,7 +516,7 @@ namespace Barotrauma
{
if (joint == null) { continue; }
float angle = (joint.LowerLimit + joint.UpperLimit) / 2.0f;
joint.LimbB?.body?.SetTransform(
joint.LimbB?.body?.SetTransformIgnoreContacts(
(joint.WorldAnchorA - MathUtils.RotatePointAroundTarget(joint.LocalAnchorB, Vector2.Zero, joint.BodyA.Rotation + angle, true)),
joint.BodyA.Rotation + angle);
}
@@ -529,10 +525,11 @@ namespace Barotrauma
protected void CreateLimbs()
{
limbs?.ForEach(l => l.Remove());
Mass = 0;
DebugConsole.Log($"Creating limbs from {RagdollParams.Name}.");
limbDictionary = new Dictionary<LimbType, Limb>();
limbs = new Limb[RagdollParams.Limbs.Count];
RagdollParams.Limbs.ForEach(l => AddLimb(l));
RagdollParams.Limbs.ForEach(AddLimb);
if (limbs.Contains(null)) { return; }
SetupDrawOrder();
}
@@ -549,11 +546,11 @@ namespace Barotrauma
/// <summary>
/// Resets the serializable data to the currently selected ragdoll params.
/// Force reloading always loads the xml stored on the disk.
/// Always loads the xml stored on the disk.
/// </summary>
public void ResetRagdoll(bool forceReload = false)
public void ResetRagdoll()
{
RagdollParams.Reset(forceReload);
RagdollParams.Reset(forceReload: true);
ResetJoints();
ResetLimbs();
}
@@ -577,7 +574,7 @@ namespace Barotrauma
public void AddJoint(JointParams jointParams)
{
if (!checkLimbIndex(jointParams.Limb2, "Limb1") || !checkLimbIndex(jointParams.Limb2, "Limb2"))
if (!checkLimbIndex(jointParams.Limb1, "Limb1") || !checkLimbIndex(jointParams.Limb2, "Limb2"))
{
return;
}
@@ -683,8 +680,7 @@ namespace Barotrauma
}
LimbJoints = newJoints;
}
SubtractMass(limb);
limb.Remove();
foreach (LimbJoint limbJoint in attachedJoints)
{
@@ -1400,7 +1396,12 @@ namespace Barotrauma
limb.Update(deltaTime);
}
if (!inWater && character.AllowInput && levitatingCollider)
bool isAttachedToController =
character.SelectedItem?.GetComponent<Items.Components.Controller>() is { } controller &&
controller.User == character &&
controller.IsAttachedUser(controller.User);
if (!inWater && character.AllowInput && levitatingCollider && !isAttachedToController)
{
if (onGround && Collider.LinearVelocity.Y > -ImpactTolerance)
{
@@ -1910,7 +1911,7 @@ namespace Barotrauma
}
else
{
Collider.SetTransform(simPosition, Collider.Rotation);
Collider.SetTransformIgnoreContacts(simPosition, Collider.Rotation);
}
if (!MathUtils.NearlyEqual(limbMoveAmount, Vector2.Zero))
@@ -2009,7 +2010,7 @@ namespace Barotrauma
}
else
{
limb.body.SetTransform(movePos, rotation);
limb.body.SetTransformIgnoreContacts(movePos, rotation);
limb.PullJointWorldAnchorB = limb.PullJointWorldAnchorA;
limb.PullJointEnabled = false;
}
@@ -2113,26 +2114,48 @@ namespace Barotrauma
/// <summary>
/// Note that if there are multiple limbs of the same type, only the first (valid) limb is returned.
/// </summary>
public Limb GetLimb(LimbType limbType, bool excludeSevered = true)
/// <param name="limbType"></param>
/// <param name="excludeSevered">Should we filter out severed limbs?</param>
/// <param name="useSecondaryType">Should we target limbs with secondary type instead of (primary) type?</param>
/// <param name="excludeLimbsWithSecondaryType">Should we filter out all limbs with a secondary type something else than "None"?</param>
/// <returns></returns>
public Limb GetLimb(LimbType limbType, bool excludeSevered = true, bool excludeLimbsWithSecondaryType = false, bool useSecondaryType = false)
{
if (limbDictionary.TryGetValue(limbType, out Limb limb))
Limb limb = null;
if (!HasMultipleLimbsOfSameType && !useSecondaryType && !excludeLimbsWithSecondaryType)
{
if (excludeSevered && limb.IsSevered)
// Faster method, but doesn't work when there's multiple limbs of the same type or if we want to seek/exclude limbs with different conditions.
if (limbDictionary.TryGetValue(limbType, out limb))
{
limb = null;
}
if (limb.Removed)
{
limb = null;
}
if (excludeSevered && limb is { IsSevered: true } )
{
limb = null;
}
}
}
if (limb == null && HasMultipleLimbsOfSameType)
if (limb == null)
{
// Didn't find a (valid) limb of the matching type. If there's multiple limbs of the same type, check the other limbs.
// Didn't seek or find a (valid) limb of the matching type. If there's multiple limbs of the same type, check the other limbs.
foreach (var l in limbs)
{
if (l.type != limbType) { continue; }
if (!excludeSevered || !l.IsSevered)
if (l.Removed) { continue; }
if (useSecondaryType)
{
limb = l;
break;
if (l.Params.SecondaryType != limbType) { continue; }
}
else if (l.type != limbType)
{
continue;
}
if (excludeSevered && l.IsSevered) { continue; }
if (excludeLimbsWithSecondaryType && l.Params.SecondaryType != LimbType.None) { continue; }
// Found a valid and match
limb = l;
break;
}
}
return limb;