AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

"happiness from garrison" effect was duplicated (#3485)

Browse Source
This commit is contained in:
9kgsofrice 2020-12-30 19:07:24 +00:00 committed by GitHub
parent 42ff90fb65
commit 5b25ec0495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -221,10 +221,6 @@ class CityStats {
happinessFromPolicies += 1f
happinessFromPolicies += getStatsFromUniques(civInfo.policies.policyUniques.getAllUniques()).happiness
if (cityInfo.getCenterTile().militaryUnit != null)
for (unique in civInfo.getMatchingUniques("[] in all cities with a garrison"))
happinessFromPolicies += unique.stats.happiness
newHappinessList["Policies"] = happinessFromPolicies
if (hasExtraAnnexUnhappiness()) newHappinessList["Occupied City"] = -2f //annexed city