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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Rope.cs
+35 -2
View File
@@ -181,7 +181,7 @@ namespace Barotrauma.Items.Components
return;
}
Vector2 diff = target.WorldPosition - source.WorldPosition;
Vector2 diff = target.WorldPosition - GetSourcePos(useDrawPosition: false);
float lengthSqr = diff.LengthSquared();
if (lengthSqr > MaxLength * MaxLength)
{
@@ -372,7 +372,40 @@ namespace Barotrauma.Items.Components
}
}
private PhysicsBody GetBodyToPull(ISpatialEntity target)
/// <summary>
/// Get the position the rope starts from (taking into account barrel positions if needed)
/// </summary>
/// <param name="useDrawPosition">Should the interpolated draw position be used? If not, the WorldPosition is used.</param>
private Vector2 GetSourcePos(bool useDrawPosition = false)
{
Vector2 sourcePos = source.WorldPosition;
if (source is Item sourceItem)
{
if (useDrawPosition)
{
sourcePos = sourceItem.DrawPosition;
}
if (!sourceItem.Removed)
{
if (sourceItem.GetComponent<Turret>() is { } turret)
{
sourcePos = new Vector2(sourceItem.WorldRect.X + turret.TransformedBarrelPos.X, sourceItem.WorldRect.Y - turret.TransformedBarrelPos.Y);
}
else if (sourceItem.GetComponent<RangedWeapon>() is { } weapon)
{
sourcePos += ConvertUnits.ToDisplayUnits(weapon.TransformedBarrelPos);
}
}
}
else if (useDrawPosition && source is Limb sourceLimb && sourceLimb.body != null)
{
sourcePos = sourceLimb.body.DrawPosition;
}
return sourcePos;
}
private static PhysicsBody GetBodyToPull(ISpatialEntity target)
{
if (target is Item targetItem)
{