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

[MIRROR] Fix "Overweight" trait unintended interaction #2535

Merged
merged 2 commits into from
Mar 25, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1364

About The Pull Request

The hunger hud update changed how TRAIT_FAT trait is handled, making it so that the "Overweight" quirk can no longer apply that trait without causing a lot of issues with the new hunger hud and how nutrition states are being tracked. This PR was partially solved upstream via NovaSector/NovaSector#1576. Only thing this PR does is fix the quirk to use that newly added trait. (Fixes #1322)

How This Contributes To The Nova Sector Roleplay Experience

Fixes the overweight quirk so you're no longer irrevocably slowed and locked out of using the nutrition system properly.

Proof of Testing

Screenshots/Videos Most of the videos I recorded are too large to be uploaded, but this is one of the issues that's solved via the changes. Mobs are no longer in the perma-fat state even though they shouldn't be. Can probably figure out how to get the rest of the videos uploaded somewhere if needed.
Issue2.mp4

Changelog

🆑 Varoxus
fix: Overweight trait no longer interferes with the nutrition system
/:cl:

* Fix "Overweight" trait unintended interaction

The hunger hud update changed how the Overweight trait is handled, making it give any character using it the speed malus that the trait already gives, but also giving them an extra speed malus as if they were overfed at all times. Currently there's no way to get rid of the permanently overfed state without manually removing the "Overweight" trait directly from the mob that has it, this PR removes that permanent overfed state.

* I think this is right?

proper removal documentation, sans module since uh... dunno if it needs to be modularized

* New Solution

much easier to just make a new trait define, and then apply that new trait to where the old, conflicting one was being applied.

* add new trait to _globalvars

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Bloop <[email protected]>

* upstream fix integration

trait now adds the trait that was added upstream `TRAIT_OFF_BALANCE_TACKLER`. Which handles the only effect that we need to handle independently of `TRAIT_FAT` now.

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 18b6e63 into master Mar 25, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1364 branch March 25, 2024 20:39
AnywayFarus added a commit that referenced this pull request Mar 25, 2024
Iajret pushed a commit that referenced this pull request May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants