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

Added check for being on ground for several cases of falling down #55128

Merged
merged 2 commits into from
Feb 6, 2022
Merged

Added check for being on ground for several cases of falling down #55128

merged 2 commits into from
Feb 6, 2022

Conversation

Night-Pryanik
Copy link
Contributor

Summary

Bugfixes "Added check for being on ground for several cases of falling down."

Purpose of change

Initially I planned only to fix #50689, but I noticed that there are several other cases where character is forced to fall down even when he is already on the ground (e.g. being prone), so I fixed them too.

Describe the solution

Replaced simple check for downed effect with is_on_ground check (or added it where appropriate) for several cases of falling down.

Describe alternatives you've considered

None.

Testing

Got my character awfully drunk. Made it go prone. Waited to be knocked down - not happened.
Stood up. Waited to be knocked down, success.

Additional context

None.

@Night-Pryanik Night-Pryanik added [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Effects / Skills / Stats Effects / Skills / Stats <Bugfix> This is a fix for a bug (or closes open issue) Mechanics: Character / Player Character / Player mechanics labels Feb 5, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 5, 2022
@kevingranade kevingranade merged commit 8fa0f1f into CleverRaven:master Feb 6, 2022
@Night-Pryanik Night-Pryanik deleted the dont-fall-down-if-on-ground branch February 6, 2022 08:55
@chrispikula
Copy link
Contributor

Glory be to our saviour, we will binge-drink of the floor in thy name!

chuga-git pushed a commit to chuga-git/Cataclysm-DDA that referenced this pull request Feb 7, 2022
…everRaven#55128)

* Added check for being on ground for several cases of falling down

* A few more
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` json-styled JSON lint passed, label assigned by github actions Mechanics: Character / Player Character / Player mechanics Mechanics: Effects / Skills / Stats Effects / Skills / Stats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

You can fall to the floor while prone.
3 participants