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

Prevent pulling when teleporting #33252

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

thetolbean
Copy link
Contributor

About the PR

If a user attempts to teleport, either through the space ninja's katana or a scram implant, they will drop said item before teleporting

Why / Balance

Fix #33243 and prevent teleports from being extended to pulled objects

Technical details

Adds a check to both OnScramImplant & OnDash that check if the user is pulling an item, and if so, attempt to cancel the pull before the teleport

Media

2024-11-11.00-31-10.mp4

Requirements

Changelog

🆑

  • tweak: Teleporting or dashing now causes you to stop pulling objects.

@K-Dynamic
Copy link
Contributor

I did say the issue was present with scram implants, but I also heard it was funny to scram into space with a secoff that was dragging you earlier, so it might be worth leaving that in considering its unpredictability

@slarticodefast
Copy link
Member

Tested and works as intended, thanks for the PR!

I did say the issue was present with scram implants, but I also heard it was funny to scram into space with a secoff that was dragging you earlier, so it might be worth leaving that in considering its unpredictability

While I agree with you that it would be funnier to keep, this has too many potential edge cases where it could cause bugs with pulling.

@slarticodefast slarticodefast self-assigned this Nov 11, 2024
@slarticodefast slarticodefast added the PR: Approved Indicates that a PR has been approved by a maintainer and it may be merged soon by them. label Nov 11, 2024
@MilenVolf
Copy link
Contributor

MilenVolf commented Nov 11, 2024

Does it also prevent pulling if user or target is being teleported? For example, by bluespace anomaly

@slarticodefast
Copy link
Member

Does it also prevent pulling if user or target is being teleported? For example, by bluespace anomaly

The bluespace anomaly is a separate system, but it likely has the same problem.

@thetolbean
Copy link
Contributor Author

Does it also prevent pulling if user or target is being teleported? For example, by bluespace anomaly

Yes, as Slarti said the bluespace system is separate
With being pulled however, the scram implant already had a check in place to escape from being pulled. The dash does not, so I will be adding that shortly

@NoElkaTheGod
Copy link
Contributor

It was kinda funny though. But removing this is probably for the better.

@slarticodefast slarticodefast added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed PR: Approved Indicates that a PR has been approved by a maintainer and it may be merged soon by them. labels Nov 11, 2024
@thetolbean
Copy link
Contributor Author

@slarticodefast Got your recommendations included and tested

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Nov 11, 2024
@slarticodefast
Copy link
Member

Thanks!

@thetolbean
Copy link
Contributor Author

And I did perform testing on the bluespace scenarios, both the linked lockers and bluespace anom.
Both cancel your pulls if you are dragging something.
The items come along in the locker if they are also closed in, but you are not pulling them when you leave the other locker

@slarticodefast slarticodefast added PR: Approved Indicates that a PR has been approved by a maintainer and it may be merged soon by them. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Nov 11, 2024
@thetolbean
Copy link
Contributor Author

It was kinda funny though. But removing this is probably for the better.

Yeah, I agree. There's nothing like stealing an entire computer (or person) in the blink of an eye
Although it definitely needs to be removed for balancing

@chromiumboy
Copy link
Contributor

My thoughts are that the pulling system should listen for when a puller's transform get updated, and if the displacement is outside a certain tolerance, the pull is canceled. That way all teleport cases would be covered

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approved Indicates that a PR has been approved by a maintainer and it may be merged soon by them.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ninjas can teleport with dragged objects
6 participants