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

Spawn triggered bear trap only after creature escapes from it #76312

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

Night-Pryanik
Copy link
Contributor

Summary

Bugfixes "Spawn triggered bear trap only after creature escapes from it"

Purpose of change

Closes #64587.

Describe the solution

Spawn triggered bear trap only after creature escapes from it, not after trap's trigger. This forbids picking up and other means of interacting with triggered trap until you're freed from it.

Describe alternatives you've considered

Convert bear trap into an "armor" which will be forcefully worn on affected limb (like a splint) on trigger, and be very hard to remove, and may even lead to a removal of a limb, as stated in comments:

/* Real bear traps can't be removed without the proper tools or immense strength; eventually this should
allow normal players two options: removal of the limb or removal of the trap from the ground
(at which point the player could later remove it from the leg with the right tools).

This is a preferred solution, but obviously it would require much more work to implement it properly.

Testing

Got caught in a trap. No trap (both as a trap and as as item) on the ground. Tried to free. After escape, triggered bear trap is spawned on character's location.

Additional context

None.

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 9, 2024
@SariusSkelrets
Copy link
Contributor

Does it changes how it behaves for monsters?

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 10, 2024
@Night-Pryanik
Copy link
Contributor Author

No, monster interaction with bear trap remains the same. This PR affects only character-trap interaction.

@Maleclypse Maleclypse merged commit e400e20 into CleverRaven:master Sep 11, 2024
28 checks passed
@Night-Pryanik Night-Pryanik deleted the beartrap branch September 11, 2024 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Triggered bear traps can be set up again, yet still remain attached to your leg.
3 participants