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

[MoM] Add new u_cancel_activity to unlocking new power/wakeful rest #78292

Merged
merged 2 commits into from
Dec 2, 2024

Conversation

Standing-Storm
Copy link
Contributor

@Standing-Storm Standing-Storm commented Dec 2, 2024

Summary

Mods "[MoM] Add new u_cancel_activity to unlocking new power/wakeful rest"

Purpose of change

MoM has had some weirdness requiring a popup to interrupt your activity so you can stop it at the right time because there was no u_cancel_activity. But now there is.

Fixes #75984

Describe the solution

Add u_cancel_activity to the Wakeful Rest EoC and all the new power learning EoCs. Remove the popup from Wakeful Rest.

Describe alternatives you've considered

Testing

Wakeful Rest now ends when appropriate with a simple message.

Activity properly ends when learning a new power no matter what you pick on the popup (Yes, No, or Ignore). This fixes the bug with infinite activity.

Additional context

@Standing-Storm Standing-Storm marked this pull request as draft December 2, 2024 05:42
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding EOC: Effects On Condition Anything concerning Effects On Condition Mods: Mind Over Matter astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 2, 2024
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Dec 2, 2024
@Standing-Storm Standing-Storm marked this pull request as ready for review December 2, 2024 14:32
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 2, 2024
@Maleclypse Maleclypse merged commit 2a0db1d into CleverRaven:master Dec 2, 2024
27 of 40 checks passed
@Standing-Storm Standing-Storm deleted the wakeful-rest-cancels branch December 2, 2024 21:43
Comment on lines +175 to +176
"u_cancel_activity",
"u_cancel_activity"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double cancel_activity is intended?

Comment on lines +182 to +183
"u_cancel_activity",
"u_cancel_activity"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like those were manually added before I replaced all instances. I'll check if it causes a problem in game and, if not, clean it up at some point.

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) 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 Mods: Mind Over Matter Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[MOM] Wakeful rest spell causes softlock if you try to continue meditating after fully rested.
3 participants