diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index a87ca75a3a..75c11b9196 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -159,8 +159,8 @@ { "name": "Organized Religion", "effect": "+1 happiness for each monument, temple and monastery", - "uniques": ["[+1 happiness] from every [Monument]","[+1 happiness] from every [Temple]", - "[+1 happiness] from every [Monastery]"] + "uniques": ["[+1 Happiness] from every [Monument]","[+1 Happiness] from every [Temple]", + "[+1 Happiness] from every [Monastery]"] "row": 1, "column": 2 }, diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 05450de771..83b650494e 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -172,14 +172,6 @@ open class TileInfo { fun getTileStats(city: CityInfo?, observingCiv: CivilizationInfo): Stats { var stats = getBaseTerrain().clone() - if(city!=null) for(unique in city.getBuildingUniques()) { - if (unique.equalsPlaceholderText("[] from [] tiles")) { - val placeholderParams = unique.getPlaceholderParameters() - val tileType = placeholderParams[1] - if (baseTerrain == tileType || terrainFeature == tileType || resource == tileType || improvement == tileType) - stats.add(Stats.parse(placeholderParams[0])) - } - } if (terrainFeature != null) { val terrainFeatureBase = getTerrainFeature() @@ -189,6 +181,15 @@ open class TileInfo { stats.add(terrainFeatureBase) } + if(city!=null) for(unique in city.getBuildingUniques()) { + if (unique.equalsPlaceholderText("[] from [] tiles")) { + val placeholderParams = unique.getPlaceholderParameters() + val tileType = placeholderParams[1] + if (baseTerrain == tileType || terrainFeature == tileType || resource == tileType || improvement == tileType) + stats.add(Stats.parse(placeholderParams[0])) + } + } + if (naturalWonder != null) { val wonder = getNaturalWonder() stats.add(wonder)