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.

Sign up for GitHub

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

Jump to bottom

Backport #70799 and #72684 #74042

Merged
merged 2 commits into from
May 26, 2024
Merged

Backport #70799 and #72684 #74042

merged 2 commits into from
May 26, 2024

Conversation

Procyonae
Copy link
Contributor

Summary

None

Purpose of change

Together fix a stable blocker

Describe the solution

Backport #70799 and #72684

Describe alternatives you've considered

Testing

Additional context

db48x and others added 2 commits May 24, 2024 12:52
@db48x @github-actions @Procyonae
edit regen in darkness code for readability and correctness (CleverRa…
ae6d2b2 
…ven#70799)

* edit regen in darkness code for readability and correctness

The boolean > 0 check was inside the call to heal(), so it ended up
passing either 1 or 0 rather than the calculated amount of
healing. The clear intent of the check, however, is to only print the
message if the monster actually needed to be healed.

I also gave the calculated amount of healing a name (dHP), so that it
is clear to future readers what the calculation is for; see the
discussion in CleverRaven#67027 for an example of one of the easy ways to misread
the old code.

This patch does not change when or by how much the monster regenerates.

* fix parenthesis style in monster.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@nornagon @Procyonae
Merge pull request CleverRaven#72684 from nornagon/no-regenerate-in-s…
120fde4 
…unlight

no regenerates_in_dark in sunlight
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels May 24, 2024
@kevingranade kevingranade merged commit ed84c16 into CleverRaven:0.H-branch May 26, 2024
15 of 22 checks passed
@Procyonae Procyonae deleted the Backport70799And72684 branch December 1, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is 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` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions Monsters Monsters both friendly and unfriendly.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Procyonae @kevingranade @db48x @nornagon