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.

Sign up for GitHub

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

Fixed bola effect stacking #34723

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89dbf93
Only 2 legs can be ensnared at once now.
impubbi Jan 28, 2025
f4dac41
To match the visuals, can only be ensnared once
impubbi Jan 28, 2025
4ded7be
Removed unnecessary if statement
impubbi Jan 29, 2025
6fe3132
Allows each leg to be restrained again
impubbi Jan 30, 2025
b82a9fc
Added a MaxEnsnares property for ensnares in general. Set bola's max …
impubbi Feb 4, 2025
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
12 changes: 4 additions & 8 deletions Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,16 +256,12 @@ 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;

if (freeLegs > 0)
//Don't do anything if they are already ensnared
if (ensnareable.IsEnsnared)
return false;

Container.Insert(ensnare, ensnareable.Container);

// Apply stamina damage to target if they weren't ensnared before.
if (ensnareable.IsEnsnared != true)
impubbi marked this conversation as resolved.
Show resolved Hide resolved
{
Expand Down
Loading