Fix MORALE_BOOK Bonuses #27508
Merged
Fix MORALE_BOOK Bonuses #27508
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
Bring up-to-date
Bring up-to-date
Bring up to date
Fixes a bug that causes book morale bonuses to vanish entirely.
Changed it so that fun values were identical to what they were before my change.
kevingranade
reviewed
Jan 9, 2019
src/player.cpp
Outdated
| @@ -9539,7 +9539,7 @@ void player::do_read( item &book ) | |||
|
|
|||
| if( book_fun_for( book, *learner ) != 0 ) { | |||
| //Fun bonus is no longer calculated here. | |||
| learner->add_morale( MORALE_BOOK, 0, book_fun_for( book, *learner ) * 5, 6_minutes, 3_minutes, true, | |||
| learner->add_morale( MORALE_BOOK, book_fun_for( book, *learner ) * 5, book_fun_for( book, *learner ) * 5, 6_minutes, 3_minutes, true, | |||
There was a problem hiding this comment.
Is it intentional that the max morale is *5 instead of *15?
There was a problem hiding this comment.
Nope. It sure isn't.
Fixed max fun
peperov
pushed a commit
to peperov/Cataclysm-DDA
that referenced
this pull request
Jan 12, 2019
* Update player.cpp Fixes a bug that causes book morale bonuses to vanish entirely.
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 "Fixes morale issues with books"Purpose of change
Fixes #27496
Describe the solution
Changed the fun bonus from books away from zero and back to what it was supposed to be: The fun value of the book times 5.
Describe alternatives you've considered
N/A
Additional context
My bad. This should fix things, though.