wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #2033 - happiness from tiles is always considered correctly in regards to food consumption

Browse source
This commit is contained in:
Yair Morgenstern 2020-03-03 17:25:30 +02:00
parent 78dab67257
commit 9721fb66c0
1 changed files with 1 additions and 3 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

@ -4,7 +4,6 @@ import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.civilization.CityStateType import com.unciv.logic.civilization.CityStateType
import com.unciv.logic.civilization.diplomacy.RelationshipLevel import com.unciv.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.logic.map.BFS
import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.RoadStatus
import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.BaseUnit
@ -222,8 +221,7 @@ class CityStats {
if (civInfo.containsBuildingUnique("+1 happiness in each city")) if (civInfo.containsBuildingUnique("+1 happiness in each city"))
newHappinessList["Wonders"] = 1f newHappinessList["Wonders"] = 1f
if (baseStatList.containsKey("Tile yields")) newHappinessList["Tile yields"] = getStatsFromTiles().happiness
newHappinessList["Tile yields"] = baseStatList["Tile yields"]!!.happiness
// we don't want to modify the existing happiness list because that leads // we don't want to modify the existing happiness list because that leads
// to concurrency problems if we iterate on it while changing // to concurrency problems if we iterate on it while changing