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

Expand the city dialog text for luxury spendings #1208

Merged
merged 1 commit into from
Aug 7, 2022

Conversation

lmoureaux
Copy link
Contributor

Same as (and on top of) #1206 for luxury. The rules are much simpler and so the code also is.

Improve the city dialog tooltip text that explains how many citizens are
made happier by luxury. This provides a lot more information than the previous
"Luxury: %d total", which will hopefully help towards #269.

Example texts

Sad, sad city

For each 2 luxury produced in a city, a citizen becomes happier. This city generates no luxury.

Normal sad city

For each 2 luxury produced in a city, a citizen becomes happier. This city generates a total of 1 luxury, not enough to have an effect.

Getting happier

For each 2 luxury produced in a city, a citizen becomes happier. This city generates a total of 5 luxury.

2 citizens are made happier using 4 luxury. 1 luxury is not used.

Happiest

For each 2 luxury produced in a city, a citizen becomes happier. This city generates a total of 8 luxury.

All available luxury is used to make 3 citizens happier.

client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
@lmoureaux lmoureaux force-pushed the feature/max-happy-luxury branch 2 times, most recently from d52938c to 48d1a5a Compare August 7, 2022 22:45
@lmoureaux lmoureaux marked this pull request as ready for review August 7, 2022 22:45
Improve the city dialog tooltip text that explains how many citizens are
made happier by luxury. This provides a lot more information than the previous
"Luxury: %d total", which will hopefully help towards longturn#269.
@lmoureaux lmoureaux force-pushed the feature/max-happy-luxury branch from 48d1a5a to a1f7b0f Compare August 7, 2022 22:46
@lmoureaux lmoureaux requested a review from jwrober August 7, 2022 22:46
Copy link
Collaborator

@jwrober jwrober left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in the client.

@lmoureaux lmoureaux enabled auto-merge (rebase) August 7, 2022 22:51
@lmoureaux lmoureaux merged commit cfb6139 into longturn:master Aug 7, 2022
@lmoureaux lmoureaux deleted the feature/max-happy-luxury branch August 7, 2022 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants