mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-16 10:49:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses

Browse Source
This commit is contained in:
Yair Morgenstern
2020-08-16 20:43:19 +03:00
parent f2f14b6570
commit 574e588711
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -177,16 +177,19 @@ open class TileInfo {
stats.add(terrainFeatureBase)
}
if(city!=null) for(unique in city.cityConstructions.builtBuildingUniqueMap.getUniques("[] from [] tiles")) {
// City-specific bonuses
if(city!=null) for(unique in city.cityConstructions.builtBuildingUniqueMap.getUniques("[] from [] tiles in this city")) {
val tileType = unique.params[1]
if (baseTerrain == tileType || terrainFeature == tileType || resource == tileType || improvement == tileType
|| (tileType == "Strategic resource" && hasViewableResource(observingCiv) && getTileResource().resourceType == ResourceType.Strategic))
if (baseTerrain == tileType || terrainFeature == tileType
|| resource == tileType || improvement == tileType)
stats.add(Stats.parse(unique.params[0]))
}
// Civ-wide bonuses
if(city!=null) for(unique in city.civInfo.getMatchingUniques("[] from every []")) {
val tileType = unique.params[1]
if (baseTerrain == tileType || terrainFeature == tileType)
if (baseTerrain == tileType || terrainFeature == tileType
|| (tileType == "Strategic resource" && hasViewableResource(observingCiv) && getTileResource().resourceType == ResourceType.Strategic))
stats.add(Stats.parse(unique.params[0]))
}