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.

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

TSM fix: now rewarding for Cannibals #11300

Merged
merged 1 commit into from Feb 18, 2015

Conversation

Projects
None yet
3 participants
@Gabriel-SE
Copy link
Contributor

commented Feb 17, 2015

And a few code style changes

} if (has_trait("SPIRITUAL") && book->has_flag("INSPIRATIONAL")) {
fun_bonus = 15;
} else if ( has_trait("SPIRITUAL") && book->has_flag("INSPIRATIONAL") ) {
fun_bonus = 15;

This comment has been minimized.

Copy link
@KA101

KA101 Feb 17, 2015

Contributor

Uh, this is the religious texts; the cannibal cookbook is the next one up. I'm pretty sure To Serve Man isn't considered Inspirational, so I'm at a loss for why the need to else this if.

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Feb 17, 2015

I must've broken this when I fixed religious books.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 17, 2015

That's as may be, but I'm not at all sure how this fixes the problem. TSM isn't INSPIRATIONAL so it shouldn't be triggering the if here.

TSM fix: now rewarding for Cannibals
And a few code style changes

@Gabriel-SE Gabriel-SE force-pushed the Gabriel-SE:tsm-fix branch to 0e85484 Feb 18, 2015

@Gabriel-SE

This comment has been minimized.

Copy link
Contributor Author

commented Feb 18, 2015

If the book is TSM, without else if the first cannibal check will add correct morale bonus but the last else will also be executed because TSM isn't inspirational.
Since the negative morale bonus from else is bigger (tmp->fun * 15), it will end up in negative morale loss.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 18, 2015

OK, that'll do. Thanks.

@KA101 KA101 self-assigned this Feb 18, 2015

@KA101 KA101 merged commit 0e85484 into CleverRaven:master Feb 18, 2015

1 check passed

default
Details

@Gabriel-SE Gabriel-SE deleted the Gabriel-SE:tsm-fix branch Feb 18, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.