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

Forbid drinking liquids underwater for characters with Aqueous Repose and Embrace of the Waters mutations, as it stated in mutations' descriptions #77401

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

Night-Pryanik
Copy link
Contributor

Summary

Bugfixes "Forbid drinking liquids underwater for characters with Aqueous Repose and Embrace of the Waters mutations, as it stated in mutations' descriptions"

Purpose of change

Describe the solution

  • Reworked check for eating/drinking underwater. The logic now is this:
    • If underwater AND [ doesn't have "watersleep" mutations OR ( have "watersleep" mutations, but comestible is a liquid ) ], then forbid consuming.
  • Also, while I'm here, I added the forgotten check for Embrace of the Waters mutation in eff_fun_sleep function.

Describe alternatives you've considered

None.

Testing

Normal characters (no "watersleep" mutations): can eat and drink on the shore. Can't eat or drink underwater.
Characters with "watersleep" mutations: can eat and drink on the shore. Can eat underwater. Can't drink underwater.

Additional context

None.

@Night-Pryanik Night-Pryanik added Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) labels Oct 28, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 28, 2024
@Maleclypse Maleclypse merged commit a88f8f8 into CleverRaven:master Oct 29, 2024
22 of 28 checks passed
@Night-Pryanik Night-Pryanik deleted the repose branch October 29, 2024 14:53
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 Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aqueous Repose mentions not being able to drink underwater, but you can
2 participants