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

Fix issues with beartrap #76525

Merged
merged 3 commits into from
Sep 21, 2024
Merged

Conversation

Night-Pryanik
Copy link
Contributor

@Night-Pryanik Night-Pryanik commented Sep 18, 2024

Summary

None

Purpose of change

Closes #76454.

Describe the solution

Spawn deactivated bear trap after monster escapes it or dies on it, and also after triggering it with throwing.

Describe alternatives you've considered

None.

Testing

Set trap. Lured zombie brute into it. Waited for brute to escape from it. Checked that deactivated trap is correctly spawned after escaping.
Set trap. Threw rock at it. Checked that deactivated trap is still here after triggering.

Additional context

None.

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

Set trap. Lured zombie brute into it. Waited for brute to escape from it.

But what will happen when creature dies before escaping from trap?

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 18, 2024
@Night-Pryanik Night-Pryanik marked this pull request as draft September 19, 2024 05:48
@Night-Pryanik Night-Pryanik marked this pull request as ready for review September 19, 2024 08:12
@Night-Pryanik
Copy link
Contributor Author

But what will happen when creature dies before escaping from trap?

Bear trap will be added to monster's inventory.

@Maleclypse Maleclypse merged commit a0609bf into CleverRaven:master Sep 21, 2024
24 of 38 checks passed
@Night-Pryanik Night-Pryanik deleted the beartrap branch September 21, 2024 19:32
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 Monsters Monsters both friendly and unfriendly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bear trap "disappear" after trapped victim is killed.
3 participants