Fix Toxins not working with simplified nutrition #35917
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds vitamin `types`, different variations of vitamins that can later be expanded to have different effects. These are dynamically loaded from JSON into 4 types, vitamin, toxin, drug, and counter. Only vitamin, toxin, and counter are used right now. Only the vitamin type has an effect, used with simplified nutrition to make it so that that vitamin has no effect.
|
I think the |
ZhilkinSerg
added
<Bugfix>
|
Well, since this was just merged, I guess I'll do that in a separate PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Implement vitamin types"
Purpose of change
Everything of type
vitaminwas disabled by theNO_VITAMINSexternal option.This meant that non-vitamin things of type
vitaminwere also disabled by this, notably toxins from mutant meat.Describe the solution
Add
vit_typeJSON field to vitamins, andtypeto the vitamin class.Create a
vitamin_typeenum, and load thevit_typestrings in the vitamin JSON into these enum values.Make the
NO_VITAMINSexternal option only zero outvitamintype vitamins.Describe alternatives you've considered
I considered renaming the vitamin class to prevent future confusing, but I judged that to be a fairly large change without too much gain.
Testing
Create a world without simplified nutrition, look at the vitamin values for mutant meat. Notice they match the values defined in JSON.
Create a world with simplified nutrition, look at the vitamins in mutant meat. Notice that it only has
Toxins, because they are the only type of vitamin it has that is not ofvitamintype.Additional context
No documentation because vitamins aren't documented. I'll make a PR for that soon.
