Unhappy Food Ranking Fix #12436
Closed
Unhappy Food Ranking Fix #12436
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@itanasi we want to reduce our growth to 0 before we hit our nullified growth, as -11 happiness also bring combat and production penalties. |
|
I'm not sure if growth bonuses such as WLTKD should be taken into account. I think it's more of a "nice, extra yields" rather than something that makes you reconsider citizen assignement (also, if you want to do it correctly, carried over food such as from aqueducts should be taken into account). |
* Added owned tiles countable * Applied yairm210's suggestions * Added template.properties key
…batantFilter -> mapUnitFilter to match behaviour
* Bump version and create initial changelog entry * Update Traditional_Chinese.properties (yairm210#12438) * Update Traditional_Chinese.properties * Update Traditional_Chinese.properties * Update Catalan.properties (yairm210#12433) * Update Latin translation (yairm210#12432) * Merge a branch * Update translation * Fix translation * Fix translation * Fix translation * Update translation * Update translation * Fix translation --------- Co-authored-by: sls1005 <[email protected]> * Update Portuguese.properties (yairm210#12429) * Update Italian.properties (yairm210#12428) * Fix Ukrainian.properties: Fix apostrophe and delete stress mark (yairm210#12427) * Fix Ukrainian.properties: Delete stress mark - 0x301 * Fix Ukrainian.properties: Replace U+0027 with U+02BC Regexp: ([ЄІ-ЇА-ЩЬЮ-щью-яєіїҐґ])\u0027([ЄІ-ЇА-ЩЬЮ-щью-яєіїҐґ]) * Fix Ukrainian.properties: Replace U+2019 with U+02BC Regexp: ([ЄІ-ЇА-ЩЬЮ-щью-яєіїҐґ])\u2019([ЄІ-ЇА-ЩЬЮ-щью-яєіїҐґ]) * Update French.properties (yairm210#12425) * Update Indonesian.properties (yairm210#12424) * Update Indonesian.properties Corrections and translation. * Update Indonesian.properties * Update Indonesian.properties * Update Russian.properties (yairm210#12421) * Update Russian.properties * Update Russian.properties * Update Brazilian_Portuguese.properties (yairm210#12420) * Update German translation (yairm210#12419) * Update German translation * Update German translation --------- Co-authored-by: yairm210 <[email protected]> Co-authored-by: 羅少希 <[email protected]> Co-authored-by: Joan Josep <[email protected]> Co-authored-by: sls1005 <[email protected]> Co-authored-by: sls1005 <[email protected]> Co-authored-by: murilozinkkkj <[email protected]> Co-authored-by: Giuseppe D'Addio <[email protected]> Co-authored-by: Miroslav Belov <[email protected]> Co-authored-by: Ouaz <[email protected]> Co-authored-by: X2003 <[email protected]> Co-authored-by: dadadnet <[email protected]> Co-authored-by: Vitor Gabriel <[email protected]> Co-authored-by: mape6 <[email protected]>
… resource on the other side should be colored green to mark it as attractive
* Fix 'raze city' * .
… multiple civs
…ages have changes as well Ths is a trade off - on the one hand it means edge images will be drawn *above* improvements, on the other hand - profiling shows this is 11% of tile update time, which affects evey single user click! Possible good solution: saving the edge images on the tile itself, and refreshing this and neighboring tiles every time terrains are changed
…onfusion to new developers
* Update Automation.kt * Update Automation.kt * Update Automation.kt
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
* Bump version and create initial changelog entry * Update Latin translation (yairm210#12462) * Update translation * Update translation --------- Co-authored-by: sls1005 <[email protected]> * Add Spanish translations and fix typos (yairm210#12453) * Update Italian.properties (yairm210#12449) * Update German translation (yairm210#12448) * Update French.properties (yairm210#12447) * Update Brazilian_Portuguese.properties (yairm210#12446) * Update Brazilian_Portuguese.properties * Update Brazilian_Portuguese.properties * Update Russian.properties (yairm210#12443) * Update Russian.properties * Update Russian.properties * Update Indonesian.properties (yairm210#12442) * Update Indonesian.properties Translation and corrections. * Update Indonesian.properties --------- Co-authored-by: yairm210 <[email protected]> Co-authored-by: sls1005 <[email protected]> Co-authored-by: sls1005 <[email protected]> Co-authored-by: Víctor <[email protected]> Co-authored-by: Giuseppe D'Addio <[email protected]> Co-authored-by: mape6 <[email protected]> Co-authored-by: Ouaz <[email protected]> Co-authored-by: Vitor Gabriel <[email protected]> Co-authored-by: dadadnet <[email protected]> Co-authored-by: X2003 <[email protected]>
# Conflicts: # core/src/com/unciv/logic/automation/Automation.kt
|
Conflicts have been resolved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Aligns the code to automatically take into account the Unhappiness penalty to Growth.
Currently also puts back in Growth for Non-Default/Non-Food Focus. But waiting on Discord Poll results.
Confirmed that we do have the Growth Penalty when Unhappy. It's being set in the Global Uniques
Screenshot when 5 Growth
And when <-10 Unhappiness, no growth!
Therefore we should rank the tiles appropriately
Polynesia - 10unhappy.txt
Autosave-Polynesia-69.txt
@EmperorPinguin since they are also messing with rank weights