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 text for empire size unhappiness #1206

Merged
merged 1 commit into from
Aug 7, 2022

Conversation

lmoureaux
Copy link
Contributor

@lmoureaux lmoureaux commented Aug 7, 2022

Improve the city dialog tooltip text that explains how many citizens are
unhappy because of the number of cities. Write two paragraphs: the first
describing the rules for the current player, and the second the status of the
city at hand. The total number of citizens that can be made content without
improvements is also shown; see #269.

Example texts

classic, size 14, communism

All cities start with 4 content citizens. Once you have more than 12 cities, a citizen becomes unhappy.

You have 36 cities, resulting in a maximum of 3 content citizens. In this city of size 14, 3 citizens are content.

classic, size 2, communism

All cities start with 4 content citizens. Once you have more than 12 cities, a citizen becomes unhappy.

You have 36 cities, resulting in a maximum of 3 content citizens. In this city of size 2, all citizens are content.

Aviation, size 4, monarchy

All cities start with 4 content citizens. Once you have more than 10 cities, a citizen becomes unhappy. Afterwards, for every 9 additional cities, a content citizen becomes unhappy. If there are no more content citizens, an unhappy citizen becomes angry instead.

You have 11 cities, resulting in a maximum of 3 content citizens. In this city of size 4, 3 citizens are content. With 9 more cities, a content citizen would become unhappy.

Aviation, size 2, monarchy

All cities start with 4 content citizens. Once you have more than 10 cities, a citizen becomes unhappy. Afterwards, for every 9 additional cities, a content citizen becomes unhappy. If there are no more content citizens, an unhappy citizen becomes angry instead.

You have 11 cities, resulting in a maximum of 3 content citizens. In this city of size 2, all citizens are content. With 18 more cities, a content citizen would become unhappy.

@lmoureaux lmoureaux marked this pull request as ready for review August 7, 2022 12:58
client/text.cpp Outdated Show resolved Hide resolved
Improve the city dialog tooltip text that explains how many citizens are
unhappy because of the number of cities. Write two paragraphs: the first
describing the rules for the current player, and the second the status of the
city at hand. The total number of citizens that can be made content without
improvements is also shown; see longturn#269.
client/text.cpp Show resolved Hide resolved
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.

I compiled this to see it in game. It looks great so I am in approval.

@lmoureaux lmoureaux merged commit 021a47e into longturn:master Aug 7, 2022
@lmoureaux lmoureaux deleted the feature/max-happy branch August 7, 2022 22:44
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.

3 participants