Fixes player::suffer() for the time change #31430
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
src/player.cpp
Outdated
| @@ -5226,7 +5226,7 @@ void player::suffer() | |||
| } | |||
| } | |||
|
|
|||
| if( has_trait( trait_SHARKTEETH ) && one_in( 14400 ) ) { | |||
| if( has_trait( trait_SHARKTEETH ) && one_in( to_turns<int>( 24_hours ) ) ) { //originaly 14400 | |||
There was a problem hiding this comment.
This comment seems unnecessary.
There was a problem hiding this comment.
It is unnecessary, I had those around so I could see what the original values were. I must have missed one.
ZhilkinSerg
added
<Bugfix>
|
Would it be cleaner to have a |
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 "Fixes player::suffer() for time change"fixes #31315
almost all one_in() calls now contain a to_turns() call. This makes the code far more readable and fixes the frequency issues after the time change.
Describe alternatives you've considered
Continuing using magic numbers in the code, but multiplying them by 6.
I also considered adding a modifier in player::suffer() that would scale all of those numbers.
Additional context
none