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 military happiness #1213

Merged
merged 1 commit into from
Aug 9, 2022

Conversation

lmoureaux
Copy link
Contributor

Improve the description of martial law by listing the number of units applying
it and the total number of citizens made happier as a result.
Greatly expand the description of military unhappiness by explaining the three
effects that come into play and providing numbers similiar to the above.

Should help with #269.

Example text

Up to 2 military units in the city may impose martial law. Each of them makes 2 unhappy citizens content.

1 military unit in this city imposes the martial law. 1 citizen is made happier as a result.

Military units in the field may cause unhappiness. The unhappiness caused by military units is reduced by 3 with respect to its normal value.

This city supports 3 agressive military units, resulting in 1 additional unhappy citizen.

client/text.cpp Outdated Show resolved Hide resolved
client/text.cpp Outdated Show resolved Hide resolved
@lmoureaux lmoureaux force-pushed the feature/max-happy-military branch from 9ec8341 to 8fc7d6e Compare August 8, 2022 00:13
Improve the description of martial law by listing the number of units applying
it and the total number of citizens made happier as a result.
Greatly expand the description of military unhappiness by explaining the three
effects that come into play and providing numbers similiar to the above.

Should help with longturn#269.
@lmoureaux lmoureaux force-pushed the feature/max-happy-military branch from 8fc7d6e to b7dab14 Compare August 8, 2022 20:50
@lmoureaux lmoureaux marked this pull request as ready for review August 8, 2022 20:50
@lmoureaux lmoureaux requested a review from jwrober August 8, 2022 20:50
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.

Approved

@jwrober jwrober merged commit 7990601 into longturn:master Aug 9, 2022
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