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

The Melberting #400

Merged
merged 9 commits into from
Aug 4, 2023
Merged

The Melberting #400

merged 9 commits into from
Aug 4, 2023

Conversation

Kapu1178
Copy link
Member

About The Pull Request

Ports more of @MrMelbert 's status effect PRs, this time mostly simple stuff. Hallucinations is going to be absolute agony.

Changelog

🆑 MrMelbert
fix: Items getting knocked off (glasses and cigars), bad omens, and spaghetti falling from pockets should trigger on most knockdowns again like they used to.
code: Cleaned up the knockoff component a bit. Also unit tests it.
fix: Frozen stuff is now properly actually recognized as frozen and won't re-freeze.
fix: Tonic Water heals dizziness instead of causing it
fix: Fixes stuttered words with anxiety being capitalized
/:cl:

MrMelbert and others added 7 commits June 26, 2023 19:25
… others) trigger when they should again. Also cleans up the knockoff component and unit tests it. (#67720)

At some point, someone did a find and replace over this file, and completely screwed up the signal for Knockdown().

This caused components that relied on it, like the Knockoff component, to work way less often.

This PR fixes that.
It also goes through and cleans up the Knockoff component. More consistent style guide stuff, minor improvements, better documentation.

It also unit tests it.
* Fixes the frozen trait never being applied

* Don't apply if we already have the trait

* Check the target obj
Fixes tonic water causing dizziness
Fixes social anxiety having auto-capitalization
@Kapu1178 Kapu1178 merged commit b06aac0 into DaedalusDock:master Aug 4, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants