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 wonders #1214

Merged
merged 1 commit into from
Aug 12, 2022

Conversation

lmoureaux
Copy link
Contributor

Improve the description by explaining which effects are active and, for two of
them, what contributes to their value (the third one is a simple binary effect,
and that's harder to display properly). Helps #269.

Factor out a function to build such effect descriptions so we don't need to
repeat the same code over and over again.

Granted, I wasn't very inspired when writing the default text.

With this PR, I'm happy to close #269, so:
Closes #269.

@daavko
Copy link
Collaborator

daavko commented Aug 8, 2022

Far too many occurences to list: "citizen in this city" instead of "citizen of this city".

@lmoureaux lmoureaux force-pushed the feature/max-happy-wonders branch from 3da57a3 to dbbc77a Compare August 8, 2022 00:25
@lmoureaux
Copy link
Contributor Author

Far too many occurences to list: "citizen in this city" instead of "citizen of this city".

Done

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
@lmoureaux lmoureaux force-pushed the feature/max-happy-wonders branch from dbbc77a to 5542476 Compare August 8, 2022 00:41
Improve the description by explaining which effects are active and, for two of
them, what contributes to their value (the third one is a simple binary effect,
and that's harder to display properly). Helps longturn#269.

Factor out a function to build such effect descriptions so we don't need to
repeat the same code over and over again.
@lmoureaux lmoureaux force-pushed the feature/max-happy-wonders branch from 5542476 to 115b5a6 Compare August 9, 2022 16:21
@lmoureaux lmoureaux marked this pull request as ready for review August 9, 2022 16:21
@lmoureaux lmoureaux requested review from daavko and jwrober August 9, 2022 16:21
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 to me.

@lmoureaux lmoureaux merged commit d146b8f into longturn:master Aug 12, 2022
@lmoureaux lmoureaux deleted the feature/max-happy-wonders branch August 12, 2022 20:29
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.

The city dialog should display how many citizens can be made content with existing buildings
3 participants