Fix foods getting negative rot when the date of cataclysm is not zero #33345
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
ZhilkinSerg
added
<Bugfix>
Hirmuolio
changed the title
Hirmuolio
changed the title
|
Maybe a more complete fix would be to make sure that when an item is created its |
|
Ok I did the more complete fix I mentioned above. |
Hirmuolio
changed the title
jbytheway
reviewed
Aug 20, 2019
| time_duration spoil_variation = get_shelf_life() * 0.2f; | ||
| rot += factor * rng( -spoil_variation, spoil_variation ); |
There was a problem hiding this comment.
Was it intentional to remove the multiplication by factor here?
There was a problem hiding this comment.
The factor is only applied to field dressed corpses. AFAIK none of those exist at the beginning of the cataclysm.
And if they do exist I think that shouldn't reduce the range of random variation the item can have.
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
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: Bugfixes "Fix food getting negative rot when start date is set to not zero"Purpose of change
Fixes: #33338
Describe the solution
Items spawned during mapgen had their bday at
calendar::turn_zero(day 0).The cataclysm may occur at some later date (default day 30).
Rot calculation made some bad assumptions about how the last rot check is related to the occurence of the cataclysm.
Result was that the spawned items would get (potentially massive) negative rot when they were processed from
calendar::turn_zerotocalendar::start_of_cataclysm.Items having bday at
calendar::turn_zerois wrong practically always. Items that exist at the start of the game should have bday atcalendar::start_of_cataclysm.Now they have their bday at
calendar::start_of_cataclysm.The whole thing about
calendar::start_of_cataclysmin rot calculations was probably originally meant to fix this issue. This is better solution so it has been removed.Describe alternatives you've considered
Work around the wrong bday in other places:
calendar::start_of_cataclysm. There may be valid uses for bday before that and it would just hide wrong bdays being set somewhere.Additional context
I don't know why
time = std::min( { last_rot_check, last_temp_check } );has curly bracets. It seems to work even without them ( last_rot_check, last_temp_check being different from each other is really rare so it will be really hard to notice if this breaks something ).