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

Mal's branch radiation mutation event #74612

Merged
merged 9 commits into from
Jul 3, 2024
Merged

Mal's branch radiation mutation event #74612

merged 9 commits into from
Jul 3, 2024

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Jun 16, 2024 •
edited
Loading

Summary

Content "Event Bus for Radiation"

Purpose of change

Replacement for #74602. Second half of fix for #70035.

Describe the solution

Adds event bus in radiation mutation to hang an EOC off of.

Describe alternatives you've considered

Testing

Additional context

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` [Markdown] Markdown issues and PRs EOC: Effects On Condition Anything concerning Effects On Condition astyled astyled PR, label is assigned by github actions labels Jun 16, 2024
RenechCDDA
RenechCDDA reviewed Jun 17, 2024
View reviewed changes
src/event.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Jun 17, 2024
@RenechCDDA
Copy link
Member

Looks like there's some error in the json, not sure exactly where.

Also I missed adding an entry to the memorial logger. Will need to do it just like this (I can't send suggestions to a completely new file):
https://github.com/CleverRaven/Cataclysm-DDA/pull/74604/files#diff-b339610bcde7227efd831b0183737c7566f1953ee5cf3f0eee73dd0a76799506R1116

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 2, 2024
Maleclypse
Maleclypse commented Jul 2, 2024
View reviewed changes
src/event.h Outdated Show resolved Hide resolved
src/event.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 3, 2024
@dseguin dseguin merged commit 5c6a4c5 into CleverRaven:master Jul 3, 2024
27 checks passed
@GuardianDll GuardianDll deleted the Mal's-Branch-Radiation-Mutation-Event branch August 12, 2024 16:09
@GuardianDll GuardianDll mentioned this pull request Aug 12, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RenechCDDA RenechCDDA RenechCDDA left review comments

Assignees
No one assigned
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` <Documentation> Design documents, internal info, guides and help. EOC: Effects On Condition Anything concerning Effects On Condition [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Maleclypse @RenechCDDA @dseguin