Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MORALE_BOOK Bonuses #27508

Merged
merged 6 commits into from
Jan 9, 2019
Merged

Fix MORALE_BOOK Bonuses #27508

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c6ef21
Merge pull request #10 from CleverRaven/master
Inglonias Dec 27, 2018
76c1024
Merge pull request #11 from CleverRaven/master
Inglonias Dec 27, 2018
1862742
Merge pull request #12 from CleverRaven/master
Inglonias Jan 8, 2019
933be07
Update player.cpp
Inglonias Jan 8, 2019
60754ce
Update player.cpp
Inglonias Jan 8, 2019
febe149
Update player.cpp
Inglonias Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9454,7 +9454,7 @@ bool player::read( int inventory_position, const bool continuous )
}
for( player *elem : apply_morale ) {
//Fun bonuses for spritual and To Serve Man are no longer calculated here.
elem->add_morale( MORALE_BOOK, 0, book_fun_for( it, *elem ) * 15, decay_start + 3_minutes,
elem->add_morale( MORALE_BOOK, book_fun_for( it, *elem ) * 5, book_fun_for( it, *elem ) * 15, decay_start + 3_minutes,
decay_start, false, it.type );
}

Expand Down Expand Up @@ -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 ) * 15, 6_minutes, 3_minutes, true,
book.type );
}

Expand Down