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

Merged
merged 6 commits into from
Dec 16, 2024
Merged

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 S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. 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 S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. labels Nov 11, 2024
thetolbean and others added 2 commits November 11, 2024 12:32
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@thetolbean
Copy link
Contributor Author

@slarticodefast Got your recommendations included and tested

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen 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 S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. and removed S: Needs Review Status: Requires additional reviews before being fully accepted 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

@SlamBamActionman SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024
@SaphireLattice SaphireLattice added T: Bugfix Type: Bugs and/or bugfixes P3: Standard Priority: Default priority for repository items. D2: Medium Difficulty: A good amount of codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted T: Balance Change Type: Balance changes through direct value changes, or changes to mechanics that affect it A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 15, 2024
@TheShuEd TheShuEd merged commit 01c1d8f into space-wizards:master Dec 16, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. D2: Medium Difficulty: A good amount of codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted T: Balance Change Type: Balance changes through direct value changes, or changes to mechanics that affect it T: Bugfix Type: Bugs and/or bugfixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ninjas can teleport with dragged objects
9 participants