mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Solved a conccurrency problem in getHappiness

Browse Source
This commit is contained in:
Yair Morgenstern
2018-08-27 12:32:07 +03:00
parent 28f5ef5e4f
commit 94e9098ac0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,11 +101,12 @@ class CityStats {
// -3 happiness per city // -3 happiness per city
fun getCityHappiness(): LinkedHashMap<String, Float> { fun getCityHappiness(): LinkedHashMap<String, Float> {
val civInfo = cityInfo.civInfo val civInfo = cityInfo.civInfo
val newHappinessList = LinkedHashMap<String,Float>()
var unhappinessModifier = civInfo.getDifficulty().unhappinessModifier var unhappinessModifier = civInfo.getDifficulty().unhappinessModifier
if(!civInfo.isPlayerCivilization()) if(!civInfo.isPlayerCivilization())
unhappinessModifier *= civInfo.gameInfo.getPlayerCivilization().getDifficulty().aiUnhappinessModifier unhappinessModifier *= civInfo.gameInfo.getPlayerCivilization().getDifficulty().aiUnhappinessModifier
happinessList["Cities"] = -3f * unhappinessModifier newHappinessList ["Cities"] = -3f * unhappinessModifier
var unhappinessFromCitizens = cityInfo.population.population.toFloat() var unhappinessFromCitizens = cityInfo.population.population.toFloat()
if (civInfo.policies.isAdopted("Democracy")) if (civInfo.policies.isAdopted("Democracy"))
@ -115,7 +116,7 @@ class CityStats {
if (civInfo.policies.isAdopted("Meritocracy")) if (civInfo.policies.isAdopted("Meritocracy"))
unhappinessFromCitizens *= 0.95f unhappinessFromCitizens *= 0.95f
happinessList["Population"] = -unhappinessFromCitizens * unhappinessModifier newHappinessList ["Population"] = -unhappinessFromCitizens * unhappinessModifier
var happinessFromPolicies = 0f var happinessFromPolicies = 0f
if (civInfo.policies.isAdopted("Aristocracy")) if (civInfo.policies.isAdopted("Aristocracy"))
@ -125,12 +126,13 @@ class CityStats {
if (civInfo.policies.isAdopted("Meritocracy") && isConnectedToCapital(RoadStatus.Road)) if (civInfo.policies.isAdopted("Meritocracy") && isConnectedToCapital(RoadStatus.Road))
happinessFromPolicies += 1f happinessFromPolicies += 1f
happinessList["Policies"] = happinessFromPolicies newHappinessList ["Policies"] = happinessFromPolicies
val happinessFromBuildings = cityInfo.cityConstructions.getStats().happiness.toInt().toFloat() val happinessFromBuildings = cityInfo.cityConstructions.getStats().happiness.toInt().toFloat()
happinessList["Buildings"] = happinessFromBuildings newHappinessList ["Buildings"] = happinessFromBuildings
return happinessList happinessList=newHappinessList
return newHappinessList
} }
private fun getStatsFromSpecialists(specialists: Stats, policies: HashSet<String>): Stats { private fun getStatsFromSpecialists(specialists: Stats, policies: HashSet<String>): Stats {