Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bola effect stacking #34723

Merged
merged 5 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ public sealed partial class EnsnareableComponent : Component
/// <summary>
/// How much should this slow down the entities walk?
/// </summary>
[DataField]
[DataField, AutoNetworkedField]
public float WalkSpeed = 1.0f;

/// <summary>
/// How much should this slow down the entities sprint?
/// </summary>
[DataField]
[DataField, AutoNetworkedField]
public float SprintSpeed = 1.0f;

/// <summary>
Expand Down
20 changes: 8 additions & 12 deletions Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,19 @@ public bool TryEnsnare(EntityUid target, EntityUid ensnare, EnsnaringComponent c
if (!TryComp<EnsnareableComponent>(target, out var ensnareable))
return false;

// Need to insert before free legs check.
Container.Insert(ensnare, ensnareable.Container);

var legs = _body.GetBodyChildrenOfType(target, BodyPartType.Leg).Count();
var ensnaredLegs = (2 * ensnareable.Container.ContainedEntities.Count);
var freeLegs = legs - ensnaredLegs;
var ensnaredLegs = ensnareable.Container.ContainedEntities.Count;

if (freeLegs > 0)
//Don't do anything if all legs are ensnared
if (ensnaredLegs >= legs)
return false;

// Apply stamina damage to target if they weren't ensnared before.
if (ensnareable.IsEnsnared != true)
Container.Insert(ensnare, ensnareable.Container);

// Apply stamina damage to target
if (TryComp<StaminaComponent>(target, out var stamina))
{
if (TryComp<StaminaComponent>(target, out var stamina))
{
_stamina.TakeStaminaDamage(target, component.StaminaDamage, with: ensnare, component: stamina);
}
_stamina.TakeStaminaDamage(target, component.StaminaDamage, with: ensnare, component: stamina);
}

component.Ensnared = target;
Expand Down
Loading