Hide plastic babies in slices of king cake#58
Draft
entrez wants to merge 1 commit intocopperwater:masterfrom
Draft
Hide plastic babies in slices of king cake#58entrez wants to merge 1 commit intocopperwater:masterfrom
entrez wants to merge 1 commit intocopperwater:masterfrom
Conversation
b45a3bb to
99e49b1
Compare
copperwater
reviewed
Feb 4, 2022
Owner
copperwater
left a comment
There was a problem hiding this comment.
I think this should probably add a function/macro or two to specifically account for holiday fruits rather than encoding a bunch of assumptions about the sign of fid and spe. Such as is_holiday_fruit(otmp) meaning otmp->otyp == SLIME_MOLD && otmp->spe < 0.
a8228c8 to
2943859
Compare
5352e03 to
0abcae9
Compare
Sometimes the hero will find a plastic baby inside a piece of king cake, just like in real life. In order to make this apply to 'real' king cake created during Mardi Gras, and not to user-defined fruit with an identical name, change holiday fruits to use a negative fruit ID as their spe. To enable this, add a new macro, fruit_id() -- which provides the absolute value of fruit->spe -- and use it in most cases the fruit ID needs to be accessed. Negative fruit IDs are already used when saving bones, to mark fruits which don't exist on the current level and therefore don't need to be included in the bones file, but those are negative fids in the g.ffruit linked list, not negative spe on individual items. These changes shouldn't interfere with that process as long as the possible negative spe is taken into consideration when saving and loading bones, which it now should be.
This file contains hidden or 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
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.
Sometimes the hero will find a plastic baby inside a piece of king cake,
just like in real life.
In order to make this apply to 'real' king cake created during Mardi
Gras, and not to user-defined fruit with an identical name, change
holiday fruits to use a negative fruit ID as their spe. To enable this,
add a new macro, fruit_id() -- which provides the absolute value of
fruit->spe -- and use it in most cases the fruit ID needs to be
accessed.
Negative fruit IDs are already used when saving bones, to mark fruits
which don't exist on the current level and therefore don't need to be
included in the bones file, but those are negative fids in the g.ffruit
linked list, not negative spe on individual items. These changes
shouldn't interfere with that process as long as the possible negative
spe is taken into consideration when saving and loading bones, which it
now should be.